diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gc.c | 14 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Sun Jun 23 00:09:12 2013 Masaya Tarui <tarui@ruby-lang.org> + + * gc.c: Fixup around GC by MALLOC. + Add allocate size to malloc_increase before GC + for updating limit in after_gc_sweep. + Reset malloc_increase into garbage_collect() + for preventing GC again soon. + Sun Jun 23 00:03:18 2013 Charlie Somerville <charliesome@ruby-lang.org> * ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead @@ -209,6 +209,7 @@ typedef struct rb_objspace { struct { size_t limit; size_t increase; + size_t increase2; #if CALC_EXACT_MALLOC_SIZE size_t allocated_size; size_t allocations; @@ -271,6 +272,7 @@ int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress; #endif #define malloc_limit objspace->malloc_params.limit #define malloc_increase objspace->malloc_params.increase +#define malloc_increase2 objspace->malloc_params.increase2 #define heaps objspace->heap.ptr #define heaps_length objspace->heap.length #define heaps_used objspace->heap.used @@ -1976,6 +1978,8 @@ before_gc_sweep(rb_objspace_t *objspace) objspace->heap.free_num = 0; objspace->heap.free_slots = NULL; + malloc_increase2 += ATOMIC_SIZE_EXCHANGE(malloc_increase,0); + /* sweep unlinked method entries */ if (GET_VM()->unlinked_method_entry_list) { rb_sweep_method_entry(GET_VM()); @@ -1994,6 +1998,9 @@ after_gc_sweep(rb_objspace_t *objspace) } inc = ATOMIC_SIZE_EXCHANGE(malloc_increase, 0); + inc += malloc_increase2; + malloc_increase2 = 0; + if (inc > malloc_limit) { malloc_limit += (size_t)((inc - malloc_limit) * (double)objspace->heap.marked_num / (heaps_used * HEAP_OBJ_LIMIT)); @@ -3479,8 +3486,9 @@ vm_malloc_prepare(rb_objspace_t *objspace, size_t size) size += sizeof(size_t); #endif + ATOMIC_SIZE_ADD(malloc_increase, size); if ((ruby_gc_stress && !ruby_disable_gc_stress) || - (malloc_increase+size) > malloc_limit) { + malloc_increase > malloc_limit) { garbage_collect_with_gvl(objspace); } @@ -3490,8 +3498,6 @@ vm_malloc_prepare(rb_objspace_t *objspace, size_t size) static inline void * vm_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size) { - ATOMIC_SIZE_ADD(malloc_increase, size); - #if CALC_EXACT_MALLOC_SIZE ATOMIC_SIZE_ADD(objspace->malloc_params.allocated_size, size); ATOMIC_SIZE_INC(objspace->malloc_params.allocations); @@ -4077,7 +4083,7 @@ gc_prof_set_malloc_info(rb_objspace_t *objspace) if (objspace->profile.run) { gc_profile_record *record = &objspace->profile.record[objspace->profile.count]; if (record) { - record->allocate_increase = malloc_increase; + record->allocate_increase = malloc_increase + malloc_increase2; record->allocate_limit = malloc_limit; } } @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-23" -#define RUBY_PATCHLEVEL 237 +#define RUBY_PATCHLEVEL 238 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 |