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

* vm.c (ruby_vm_destruct): do not use ruby_xfree() after freeing

Browse Source 
objspace.
* gc.c (ruby_mimfree): added. It is similar to ruby_mimmalloc().
* internal.h: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-11-22 01:38:08 +00:00
parent d553c518d5
commit a6ca9f9fce
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Fri Nov 22 10:35:57 2013 Koichi Sasada <ko1@atdot.net>
* vm.c (ruby_vm_destruct): do not use ruby_xfree() after freeing
objspace.
* gc.c (ruby_mimfree): added. It is similar to ruby_mimmalloc().
* internal.h: ditto.
Fri Nov 22 09:42:35 2013 Zachary Scott <e@zzak.io> Fri Nov 22 09:42:35 2013 Zachary Scott <e@zzak.io>
* test/digest/test_digest.rb: Reverse order of assert_equal * test/digest/test_digest.rb: Reverse order of assert_equal

10
gc.c
View File

@ -5715,6 +5715,16 @@ ruby_mimmalloc(size_t size)
return mem; return mem;
} }
void
ruby_mimfree(void *ptr)
{
size_t *mem = (size_t *)ptr;
#if CALC_EXACT_MALLOC_SIZE
mem = mem - 1;
#endif
free(mem);
}
#if CALC_EXACT_MALLOC_SIZE #if CALC_EXACT_MALLOC_SIZE
/* /*
* call-seq: * call-seq:

1
internal.h
View File

@ -428,6 +428,7 @@ NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path)
/* gc.c */ /* gc.c */
void Init_heap(void); void Init_heap(void);
void *ruby_mimmalloc(size_t size); void *ruby_mimmalloc(size_t size);
void ruby_mimfree(void *ptr);
void rb_objspace_set_event_hook(const rb_event_flag_t event); void rb_objspace_set_event_hook(const rb_event_flag_t event);
void rb_gc_writebarrier_remember_promoted(VALUE obj); void rb_gc_writebarrier_remember_promoted(VALUE obj);

7
vm.c
View File

@ -1654,14 +1654,15 @@ ruby_vm_destruct(rb_vm_t *vm)
st_free_table(vm->living_threads); st_free_table(vm->living_threads);
vm->living_threads = 0; vm->living_threads = 0;
} }
ruby_vm_run_at_exit_hooks(vm);
rb_vm_gvl_destroy(vm);
#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE #if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
if (objspace) { if (objspace) {
rb_objspace_free(objspace); rb_objspace_free(objspace);
} }
#endif #endif
ruby_vm_run_at_exit_hooks(vm); /* after freeing objspace, you *can't* use ruby_xfree() */
rb_vm_gvl_destroy(vm); ruby_mimfree(vm);
ruby_xfree(vm);
ruby_current_vm = 0; ruby_current_vm = 0;
} }
RUBY_FREE_LEAVE("vm"); RUBY_FREE_LEAVE("vm");