kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (after_gc_sweep, garbage_collect_body): do major GC (full GC)

Browse source 
before extending heaps.
  TODO: do major GC when there are many old (promoted) objects.
* gc.c (after_gc_sweep): remove TODO comments.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-05-24 06:52:38 +00:00
parent 717c5f94aa
commit b84f7fda07
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri May 24 15:48:18 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (after_gc_sweep, garbage_collect_body): do major GC (full GC)
before extending heaps.
TODO: do major GC when there are many old (promoted) objects.
* gc.c (after_gc_sweep): remove TODO comments.
Fri May 24 11:04:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 24 11:04:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBRUBY_RPATHFLAGS): do not append -L option with * configure.in (LIBRUBY_RPATHFLAGS): do not append -L option with

32
gc.c
View file

@ -352,6 +352,11 @@ typedef struct rb_objspace {
struct { struct {
int during_minor_gc; int during_minor_gc;
int parent_object_is_promoted; int parent_object_is_promoted;
/* need_major_gc is setting at:
* * free_num < free_min @ after_gc_sweep()
*/
int need_major_gc;
int done_major_gc;
/* for check mode */ /* for check mode */
VALUE parent_object; VALUE parent_object;
@ -2247,8 +2252,14 @@ after_gc_sweep(rb_objspace_t *objspace)
objspace->heap.free_num, objspace->heap.free_min); objspace->heap.free_num, objspace->heap.free_min);
if (objspace->heap.free_num < objspace->heap.free_min) { if (objspace->heap.free_num < objspace->heap.free_min) {
set_heaps_increment(objspace); if (has_free_object && objspace->rgengc.done_major_gc == FALSE) {
heaps_increment(objspace); objspace->rgengc.need_major_gc = TRUE;
}
else {
objspace->rgengc.done_major_gc = FALSE;
set_heaps_increment(objspace);
heaps_increment(objspace);
}
} }
inc = ATOMIC_SIZE_EXCHANGE(malloc_increase, 0); inc = ATOMIC_SIZE_EXCHANGE(malloc_increase, 0);
@ -2315,10 +2326,9 @@ gc_sweep(rb_objspace_t *objspace, int immediate_sweep)
} }
if (!has_free_object) { if (!has_free_object) {
/* there is no freespace after slot_sweep() */ /* there is no free after slot_sweep() */
/* TODO: [RGENGC] Should do major GC before adding hepas */
set_heaps_increment(objspace); set_heaps_increment(objspace);
if (!heaps_increment(objspace)) { if (!heaps_increment(objspace)) { /* can't allocate additional free objects */
during_gc = 0; during_gc = 0;
rb_memerror(); rb_memerror();
} }
@ -3689,7 +3699,7 @@ garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep
int minor_gc; int minor_gc;
if (ruby_gc_stress && !ruby_disable_gc_stress) { if (ruby_gc_stress && !ruby_disable_gc_stress) {
minor_gc = TRUE; minor_gc = FALSE;
immediate_sweep = TRUE; immediate_sweep = TRUE;
} }
else { else {
@ -3697,8 +3707,14 @@ garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep
minor_gc = FALSE; minor_gc = FALSE;
} }
else { else {
/* TODO: count old object size and so on */ if (objspace->rgengc.need_major_gc) {
minor_gc = TRUE; objspace->rgengc.done_major_gc = TRUE;
objspace->rgengc.need_major_gc = FALSE;
minor_gc = FALSE;
}
else {
minor_gc = TRUE;
}
} }
} }