diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 10:30:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 10:30:04 +0000 |
commit | b5d2750bbc5b9300a7694489d5eadc6dae12fe24 (patch) | |
tree | 40464f5febb16337fba28441c8b258ff60865b39 | |
parent | 10af217ff3475e060a4238c3505f095a834ec0bc (diff) | |
download | ruby-b5d2750bbc5b9300a7694489d5eadc6dae12fe24.tar.gz |
* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): DRY.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | thread.c | 45 |
2 files changed, 25 insertions, 24 deletions
@@ -1,3 +1,7 @@ +Sat Dec 27 19:30:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): DRY. + Sat Dec 27 18:25:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * vm_eval.c (rb_f_loop): return enumerator if no block given. @@ -2438,14 +2438,29 @@ clear_coverage(void) } } +static void +rb_thread_atfork_internal(int (*atfork)(st_data_t, st_data_t, st_data_t)) +{ + rb_thread_t *th = GET_THREAD(); + rb_vm_t *vm = th->vm; + VALUE thval = th->self; + vm->main_thread = th; + + st_foreach(vm->living_threads, atfork, (st_data_t)th); + st_clear(vm->living_threads); + st_insert(vm->living_threads, thval, (st_data_t)th->thread_id); + vm->sleeper = 0; + clear_coverage(); +} + static int -terminate_atfork_i(st_data_t key, st_data_t val, rb_thread_t *current_th) +terminate_atfork_i(st_data_t key, st_data_t val, st_data_t current_th) { VALUE thval = key; rb_thread_t *th; GetThreadPtr(thval, th); - if (th != current_th) { + if (th != (rb_thread_t *)current_th) { thread_cleanup_func(th); } return ST_CONTINUE; @@ -2454,27 +2469,18 @@ terminate_atfork_i(st_data_t key, st_data_t val, rb_thread_t *current_th) void rb_thread_atfork(void) { - rb_thread_t *th = GET_THREAD(); - rb_vm_t *vm = th->vm; - VALUE thval = th->self; - vm->main_thread = th; - - st_foreach(vm->living_threads, terminate_atfork_i, (st_data_t)th); - st_clear(vm->living_threads); - st_insert(vm->living_threads, thval, (st_data_t) th->thread_id); - vm->sleeper = 0; - clear_coverage(); + rb_thread_atfork_internal(terminate_atfork_i); rb_reset_random_seed(); } static int -terminate_atfork_before_exec_i(st_data_t key, st_data_t val, rb_thread_t *current_th) +terminate_atfork_before_exec_i(st_data_t key, st_data_t val, st_data_t current_th) { VALUE thval = key; rb_thread_t *th; GetThreadPtr(thval, th); - if (th != current_th) { + if (th != (rb_thread_t *)current_th) { thread_cleanup_func_before_exec(th); } return ST_CONTINUE; @@ -2483,16 +2489,7 @@ terminate_atfork_before_exec_i(st_data_t key, st_data_t val, rb_thread_t *curren void rb_thread_atfork_before_exec(void) { - rb_thread_t *th = GET_THREAD(); - rb_vm_t *vm = th->vm; - VALUE thval = th->self; - vm->main_thread = th; - - st_foreach(vm->living_threads, terminate_atfork_before_exec_i, (st_data_t)th); - st_clear(vm->living_threads); - st_insert(vm->living_threads, thval, (st_data_t) th->thread_id); - vm->sleeper = 0; - clear_coverage(); + rb_thread_atfork_internal(terminate_atfork_before_exec_i); } struct thgroup { |