diff options
| author | tmm1 <tmm1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-16 02:50:45 +0000 |
|---|---|---|
| committer | tmm1 <tmm1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-16 02:50:45 +0000 |
| commit | 99df7a1b5b34af3d059c0c2b10756fe64c6ead68 (patch) | |
| tree | d8d3a388fc6cf178c3c63f2bb95a40bf58300357 /gc.c | |
| parent | 0e52301c4be18a61208aadd67e19144ca8a12c1d (diff) | |
gc.c: fix build with RGENGC_ESTIMATE_OLDMALLOC=0
* gc.c (gc_info_decode): Fix build errors wheb compiled with
RGENGC_ESTIMATE_OLDMALLOC=0
* gc.c (objspace_malloc_increase): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
| -rw-r--r-- | gc.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -5175,7 +5175,10 @@ static VALUE gc_info_decode(int flags, VALUE hash_or_key) { static VALUE sym_major_by = Qnil, sym_gc_by, sym_immediate_sweep, sym_have_finalizer; - static VALUE sym_nofree, sym_oldgen, sym_shady, sym_rescan, sym_stress, sym_oldmalloc; + static VALUE sym_nofree, sym_oldgen, sym_shady, sym_rescan, sym_stress; +#if RGENGC_ESTIMATE_OLDMALLOC + static VALUE sym_oldmalloc; +#endif static VALUE sym_newobj, sym_malloc, sym_method, sym_capi; VALUE hash = Qnil, key = Qnil; VALUE major_by; @@ -5198,7 +5201,9 @@ gc_info_decode(int flags, VALUE hash_or_key) S(shady); S(rescan); S(stress); +#if RGENGC_ESTIMATE_OLDMALLOC S(oldmalloc); +#endif S(newobj); S(malloc); S(method); @@ -5898,11 +5903,15 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si { if (new_size > old_size) { ATOMIC_SIZE_ADD(malloc_increase, new_size - old_size); +#if RGENGC_ESTIMATE_OLDMALLOC ATOMIC_SIZE_ADD(objspace->rgengc.oldmalloc_increase, new_size - old_size); +#endif } else { atomic_sub_nounderflow(&malloc_increase, old_size - new_size); +#if RGENGC_ESTIMATE_OLDMALLOC atomic_sub_nounderflow(&objspace->rgengc.oldmalloc_increase, old_size - new_size); +#endif } if (type == MEMOP_TYPE_MALLOC) { |