1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* gc.c (typedef enum): Introdule flags of major gc reason.

Browse Source 
* gc.c (garbage_collect_body): Ditto.
	* gc.c (gc_profile_flags): Ditto.
	* gc.c (gc_profile_dump_on): Ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tarui 2013-06-21 12:31:13 +00:00
parent 79d3385e9d
commit 913e65448d
2 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Jun 21 21:29:49 2013 Masaya Tarui <tarui@ruby-lang.org>
* gc.c (typedef enum): Introdule flags of major gc reason.
* gc.c (garbage_collect_body): Ditto.
* gc.c (gc_profile_flags): Ditto.
* gc.c (gc_profile_dump_on): Ditto.
Fri Jun 21 21:11:53 2013 Koichi Sasada <ko1@atdot.net> Fri Jun 21 21:11:53 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (allocate_sorted_heaps): remove unused variable `add'. * gc.c (allocate_sorted_heaps): remove unused variable `add'.

83
gc.c
View File

@ -155,16 +155,26 @@ void rb_gcdebug_print_obj_condition(VALUE obj);
#endif #endif
typedef enum { typedef enum {
GPR_FLAG_NONE = 0x00, GPR_FLAG_NONE = 0x000,
GPR_FLAG_MINOR = 0x01, /* not major gc */ /* major reason */
GPR_FLAG_HAVE_FINALIZE = 0x02, GPR_FLAG_MAJOR_BY_NOFREE = 0x001,
GPR_FLAG_MAJOR_BY_OLDGEN = 0x002,
GPR_FLAG_MAJOR_BY_SHADY = 0x004,
GPR_FLAG_MAJOR_BY_RESCAN = 0x008,
GPR_FLAG_MAJOR_BY_STRESS = 0x010,
GPR_FLAG_MAJOR_MASK = 0x01f,
/* gc reason */
GPR_FLAG_NEWOBJ = 0x020,
GPR_FLAG_MALLOC = 0x040,
GPR_FLAG_METHOD = 0x080,
GPR_FLAG_CAPI = 0x100,
GPR_FLAG_STRESS = 0x200,
/* others */
GPR_FLAG_IMMEDIATE_SWEEP = 0x400,
GPR_FLAG_HAVE_FINALIZE = 0x800
/* reason */
GPR_FLAG_NEWOBJ = 0x04,
GPR_FLAG_MALLOC = 0x08,
GPR_FLAG_METHOD = 0x10,
GPR_FLAG_CAPI = 0x20,
GPR_FLAG_STRESS = 0x40
} gc_profile_record_flag; } gc_profile_record_flag;
typedef struct gc_profile_record { typedef struct gc_profile_record {
@ -3927,54 +3937,49 @@ rb_gc_unregister_address(VALUE *addr)
static int static int
garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep, int reason) garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep, int reason)
{ {
int minor_gc = FALSE;
if (ruby_gc_stress && !ruby_disable_gc_stress) { if (ruby_gc_stress && !ruby_disable_gc_stress) {
minor_gc = FALSE; int flag = FIXNUM_P(ruby_gc_stress) ? FIX2INT(ruby_gc_stress) : 0;
immediate_sweep = TRUE;
if (FIXNUM_P(ruby_gc_stress)) { if (flag & 0x01)
int flag = FIX2INT(ruby_gc_stress); reason &= ~GPR_FLAG_MAJOR_MASK;
else
if (flag & 0x01) minor_gc = TRUE; reason |= GPR_FLAG_MAJOR_BY_STRESS;
if (flag & 0x02) immediate_sweep = FALSE; immediate_sweep = !(flag & 0x02);
}
} }
#if USE_RGENGC #if USE_RGENGC
else { else {
if (full_mark) { if (full_mark)
minor_gc = FALSE; reason |= GPR_FLAG_MAJOR_BY_NOFREE;
if (objspace->rgengc.need_major_gc) {
objspace->rgengc.need_major_gc = FALSE;
reason |= GPR_FLAG_MAJOR_BY_RESCAN;
} }
else { if (objspace->rgengc.remembered_shady_object_count > objspace->rgengc.remembered_shady_object_limit)
if (objspace->rgengc.need_major_gc || reason |= GPR_FLAG_MAJOR_BY_SHADY;
objspace->rgengc.remembered_shady_object_count > objspace->rgengc.remembered_shady_object_limit || if (objspace->rgengc.oldgen_object_count > objspace->rgengc.oldgen_object_limit)
objspace->rgengc.oldgen_object_count > objspace->rgengc.oldgen_object_limit) { reason |= GPR_FLAG_MAJOR_BY_OLDGEN;
objspace->rgengc.need_major_gc = FALSE; if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_lazy_sweep) {
minor_gc = FALSE; immediate_sweep = TRUE;
}
else {
minor_gc = TRUE;
}
} }
} }
#endif #endif
if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_lazy_sweep) { if(immediate_sweep)
immediate_sweep = TRUE; reason |= GPR_FLAG_IMMEDIATE_SWEEP;
}
if (GC_NOTIFY) fprintf(stderr, "start garbage_collect(%d, %d, %d)\n", full_mark, immediate_sweep, reason); if (GC_NOTIFY) fprintf(stderr, "start garbage_collect(%d, %d, %d)\n", full_mark, immediate_sweep, reason);
objspace->count++; objspace->count++;
objspace->profile.total_allocated_object_num_at_gc_start = objspace->total_allocated_object_num; objspace->profile.total_allocated_object_num_at_gc_start = objspace->total_allocated_object_num;
objspace->profile.heaps_used_at_gc_start = heaps_used; objspace->profile.heaps_used_at_gc_start = heaps_used;
gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_START, 0 /* TODO: pass minor/immediate flag? */); gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_START, 0 /* TODO: pass minor/immediate flag? */);
gc_prof_timer_start(objspace, reason | (minor_gc ? GPR_FLAG_MINOR : 0)); gc_prof_timer_start(objspace, reason);
{ {
assert(during_gc > 0); assert(during_gc > 0);
gc_marks(objspace, minor_gc); gc_marks(objspace, (reason & GPR_FLAG_MAJOR_MASK) ? FALSE : TRUE);
gc_sweep(objspace, immediate_sweep); gc_sweep(objspace, immediate_sweep);
during_gc = 0; during_gc = 0;
} }
@ -5162,7 +5167,7 @@ static VALUE
gc_profile_flags(int flags) gc_profile_flags(int flags)
{ {
VALUE result = rb_ary_new(); VALUE result = rb_ary_new();
rb_ary_push(result, ID2SYM(rb_intern(flags & GPR_FLAG_MINOR ? "minor_gc" : "major_gc"))); rb_ary_push(result, ID2SYM(rb_intern(flags & GPR_FLAG_MAJOR_MASK ? "major_gc" : "minor_gc")));
if (flags & GPR_FLAG_HAVE_FINALIZE) rb_ary_push(result, ID2SYM(rb_intern("HAVE_FINALIZE"))); if (flags & GPR_FLAG_HAVE_FINALIZE) rb_ary_push(result, ID2SYM(rb_intern("HAVE_FINALIZE")));
if (flags & GPR_FLAG_NEWOBJ) rb_ary_push(result, ID2SYM(rb_intern("CAUSED_BY_NEWOBJ"))); if (flags & GPR_FLAG_NEWOBJ) rb_ary_push(result, ID2SYM(rb_intern("CAUSED_BY_NEWOBJ")));
if (flags & GPR_FLAG_MALLOC) rb_ary_push(result, ID2SYM(rb_intern("CAUSED_BY_MALLOC"))); if (flags & GPR_FLAG_MALLOC) rb_ary_push(result, ID2SYM(rb_intern("CAUSED_BY_MALLOC")));
@ -5314,7 +5319,7 @@ gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
#endif #endif
"\n", "\n",
i+1, i+1,
(record->flags & GPR_FLAG_MINOR) ? '-' : '+', "-+O3S567R9abcdef!"[record->flags & GPR_FLAG_MAJOR_MASK], /* Stress,Rescan,Shady,Oldgen,NoFree */
(record->flags & GPR_FLAG_HAVE_FINALIZE) ? 'F' : '.', (record->flags & GPR_FLAG_HAVE_FINALIZE) ? 'F' : '.',
(record->flags & GPR_FLAG_NEWOBJ) ? "NEWOBJ" : (record->flags & GPR_FLAG_NEWOBJ) ? "NEWOBJ" :
(record->flags & GPR_FLAG_MALLOC) ? "MALLOC" : (record->flags & GPR_FLAG_MALLOC) ? "MALLOC" :