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

* vm.c (ruby_vm_destruct): run vm exit hooks after all objects are

Browse Source 
destructed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-02-24 13:51:59 +00:00
parent d3b2d870bf
commit 4acc61313f
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 24 22:51:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (ruby_vm_destruct): run vm exit hooks after all objects are
destructed.
Thu Feb 24 14:40:33 2011 Shota Fukumori <sorah@tubusu.net> Thu Feb 24 14:40:33 2011 Shota Fukumori <sorah@tubusu.net>
* ChangeLog (vim): Modeline for vim * ChangeLog (vim): Modeline for vim

10
eval.c
View File

@ -129,9 +129,6 @@ ruby_cleanup(volatile int ex)
int nerr; int nerr;
void rb_threadptr_interrupt(rb_thread_t *th); void rb_threadptr_interrupt(rb_thread_t *th);
void rb_threadptr_check_signal(rb_thread_t *mth); void rb_threadptr_check_signal(rb_thread_t *mth);
long i;
rb_vm_t *vm = GET_VM();
VALUE ary = (VALUE)&vm->at_exit;
rb_threadptr_interrupt(th); rb_threadptr_interrupt(th);
rb_threadptr_check_signal(th); rb_threadptr_check_signal(th);
@ -165,13 +162,6 @@ ruby_cleanup(volatile int ex)
POP_TAG(); POP_TAG();
rb_thread_stop_timer_thread(); rb_thread_stop_timer_thread();
/* at_exit functions called here; any other place more apropriate
* for this purpose? let me know if any. */
for (i=RARRAY_LEN(ary) - 1; i>=0; i--) {
((void(*)(rb_vm_t*))RARRAY_PTR(ary)[i])(vm);
}
rb_ary_free(ary);
#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1 #if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
switch (ex) { switch (ex) {
#if EXIT_SUCCESS != 0 #if EXIT_SUCCESS != 0

14
vm.c
View File

@ -181,6 +181,19 @@ ruby_vm_at_exit(void (*func)(rb_vm_t *))
rb_ary_push((VALUE)&GET_VM()->at_exit, (VALUE)func); rb_ary_push((VALUE)&GET_VM()->at_exit, (VALUE)func);
} }
static void
ruby_vm_run_at_exit_hooks(rb_vm_t *vm)
{
VALUE hook = (VALUE)&vm->at_exit;
while (RARRAY_LEN(hook) > 0) {
typedef void rb_vm_at_exit_func(rb_vm_t*);
rb_vm_at_exit_func *func = (rb_vm_at_exit_func*)rb_ary_pop(hook);
(*func)(vm);
}
rb_ary_free(hook);
}
/* Env */ /* Env */
/* /*
@ -1550,6 +1563,7 @@ ruby_vm_destruct(rb_vm_t *vm)
rb_objspace_free(objspace); rb_objspace_free(objspace);
} }
#endif #endif
ruby_vm_run_at_exit_hooks(vm);
rb_vm_gvl_destroy(vm); rb_vm_gvl_destroy(vm);
ruby_xfree(vm); ruby_xfree(vm);
ruby_current_vm = 0; ruby_current_vm = 0;