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: change full GC timing to keep lower memory usage.

Browse source 
Extend heap only at
  (1) after major GC
  or
  (2) after several (two times, at current) minor GC
  Details in https://bugs.ruby-lang.org/issues/9607#note-9
  [Bug #9607]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-06-09 11:43:23 +00:00
parent 029fd365df
commit 5b2a745810
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Mon Jun 9 20:40:48 2014 Koichi Sasada <ko1@atdot.net>
* gc.c: change full GC timing to keep lower memory usage.
Extend heap only at
(1) after major GC
or
(2) after several (two times, at current) minor GC
Details in https://bugs.ruby-lang.org/issues/9607#note-9
[Bug #9607]
Mon Jun 9 16:01:41 2014 Masahiro Ide <imasahiro9@gmail.com>
* gc.c (gcdebug_sentinel): fix typo, "sentinel" not "sential".

18
gc.c
View file

@ -531,6 +531,9 @@ typedef struct rb_objspace {
int parent_object_is_old;
int need_major_gc;
size_t last_major_gc;
size_t remembered_shady_object_count;
size_t remembered_shady_object_limit;
size_t old_object_count;
@ -3035,15 +3038,13 @@ gc_after_sweep(rb_objspace_t *objspace)
(int)heap->total_slots, (int)heap_pages_swept_slots, (int)heap_pages_min_free_slots);
if (heap_pages_swept_slots < heap_pages_min_free_slots) {
heap_set_increment(objspace, heap_extend_pages(objspace));
heap_increment(objspace, heap);
#if USE_RGENGC
if (objspace->rgengc.remembered_shady_object_count + objspace->rgengc.old_object_count > (heap_pages_length * HEAP_OBJ_LIMIT) / 2) {
/* if [old]+[remembered shady] > [all object count]/2, then do major GC */
objspace->rgengc.need_major_gc = GPR_FLAG_MAJOR_BY_RESCAN;
if (objspace->rgengc.during_minor_gc && objspace->profile.count - objspace->rgengc.last_major_gc > 2 /* magic number */) {
objspace->rgengc.need_major_gc = GPR_FLAG_MAJOR_BY_NOFREE;
}
else {
heap_set_increment(objspace, heap_extend_pages(objspace));
heap_increment(objspace, heap);
}
#endif
}
gc_prof_set_heap_info(objspace);
@ -4256,6 +4257,7 @@ gc_marks_body(rb_objspace_t *objspace, int full_mark)
objspace->profile.major_gc_count++;
objspace->rgengc.remembered_shady_object_count = 0;
objspace->rgengc.old_object_count = 0;
objspace->rgengc.last_major_gc = objspace->profile.count;
rgengc_mark_and_rememberset_clear(objspace, heap_eden);
}
#endif