diff --git a/ChangeLog b/ChangeLog index 9d0ba4eee9..ef88299a53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Sep 9 13:05:50 2014 Koichi Sasada + + * gc.c: remvoe ruby_disable_gc_stress and add ruby_disable_gc + to speed-up newobj_of(). + + * gc.c (ready_to_gc): check ruby_disable_gc. + + * signal.c: use ruby_disable_gc. + Tue Sep 9 12:11:41 2014 Koichi Sasada * gc.c: rename gc_stat entries and check stat transition. diff --git a/gc.c b/gc.c index 0836a71894..f5c184cab1 100644 --- a/gc.c +++ b/gc.c @@ -728,7 +728,7 @@ struct RZombie { int ruby_gc_debug_indent = 0; VALUE rb_mGC; -int ruby_disable_gc_stress = 0; +int ruby_disable_gc = 0; void rb_gcdebug_print_obj_condition(VALUE obj); @@ -1599,7 +1599,7 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3) rb_bug("object allocation during garbage collection phase"); } - if (UNLIKELY(ruby_gc_stress && !ruby_disable_gc_stress)) { + if (UNLIKELY(ruby_gc_stress)) { if (!garbage_collect(objspace, FALSE, FALSE, FALSE, GPR_FLAG_NEWOBJ)) { rb_memerror(); } @@ -5666,25 +5666,27 @@ enum { #define gc_stress_full_mark_after_malloc_p() \ (FIXNUM_P(ruby_gc_stress) && (FIX2LONG(ruby_gc_stress) & (1<freelist && !heap->free_pages) { - if (!heap_increment(objspace, heap)) { - heap_set_increment(objspace, 1); - heap_increment(objspace, heap); - } + if (!heap->freelist && !heap->free_pages) { + if (!heap_increment(objspace, heap)) { + heap_set_increment(objspace, 1); + heap_increment(objspace, heap); } - return FALSE; } - return TRUE; } static int ready_to_gc(rb_objspace_t *objspace) { - return heap_ready_to_gc(objspace, heap_eden); + if (dont_gc || during_gc || ruby_disable_gc) { + heap_ready_to_gc(objspace, heap_eden); + return FALSE; + } + else { + return TRUE; + } } static void @@ -5792,7 +5794,7 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark, gc_enter(objspace, "gc_start"); - if (ruby_gc_stress && !ruby_disable_gc_stress) { + if (ruby_gc_stress) { int flag = FIXNUM_P(ruby_gc_stress) ? FIX2INT(ruby_gc_stress) : 0; if ((flag & (1<flags = reason | ((ruby_gc_stress && !ruby_disable_gc_stress) ? GPR_FLAG_STRESS : 0); + record->flags = reason | (ruby_gc_stress ? GPR_FLAG_STRESS : 0); #if MALLOC_ALLOCATED_SIZE record->allocated_size = malloc_allocated_size; #endif diff --git a/signal.c b/signal.c index 3faa267978..075738576b 100644 --- a/signal.c +++ b/signal.c @@ -817,7 +817,7 @@ ruby_abort(void) } static int segv_received = 0; -extern int ruby_disable_gc_stress; +extern int ruby_disable_gc; static RETSIGTYPE sigsegv(int sig SIGINFO_ARG) @@ -833,7 +833,7 @@ sigsegv(int sig SIGINFO_ARG) CHECK_STACK_OVERFLOW(); segv_received = 1; - ruby_disable_gc_stress = 1; + ruby_disable_gc = 1; rb_bug_context(SIGINFO_CTX, "Segmentation fault" MESSAGE_FAULT_ADDRESS); } #endif