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

gc.c: fixnum GC stress

Browse Source 
* gc.c (garbage_collect_body): name magic numbers.

* gc.c (gc_stress_set): GC.stress accepts not only boolean but
  also Fixnum.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-04-21 00:39:43 +00:00
parent dce4bdf141
commit 6f3bd427e7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gc.c
View File

@ -5017,17 +5017,23 @@ rb_global_variable(VALUE *var)
#define GC_NOTIFY 0 #define GC_NOTIFY 0
enum {
gc_stress_no_major,
gc_stress_no_immediate_sweep,
gc_stress_max
};
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)
{ {
if (ruby_gc_stress && !ruby_disable_gc_stress) { if (ruby_gc_stress && !ruby_disable_gc_stress) {
int flag = FIXNUM_P(ruby_gc_stress) ? FIX2INT(ruby_gc_stress) : 0; int flag = FIXNUM_P(ruby_gc_stress) ? FIX2INT(ruby_gc_stress) : 0;
if (flag & 0x01) if (flag & (1<<gc_stress_no_major))
reason &= ~GPR_FLAG_MAJOR_MASK; reason &= ~GPR_FLAG_MAJOR_MASK;
else else
reason |= GPR_FLAG_MAJOR_BY_STRESS; reason |= GPR_FLAG_MAJOR_BY_STRESS;
immediate_sweep = !(flag & 0x02); immediate_sweep = !(flag & (1<<gc_stress_no_immediate_sweep));
} }
else { else {
if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_lazy_sweep) { if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_lazy_sweep) {
@ -5635,7 +5641,7 @@ gc_stress_get(VALUE self)
/* /*
* call-seq: * call-seq:
* GC.stress = bool -> bool * GC.stress = flag -> flag
* *
* Updates the GC stress mode. * Updates the GC stress mode.
* *
@ -5643,6 +5649,10 @@ gc_stress_get(VALUE self)
* all memory and object allocations. * all memory and object allocations.
* *
* Enabling stress mode will degrade performance, it is only for debugging. * Enabling stress mode will degrade performance, it is only for debugging.
*
* flag can be true, false, or a fixnum bit-ORed following flags.
* 0x01:: no major GC
* 0x02:: no immediate sweep
*/ */
static VALUE static VALUE