diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-29 14:59:55 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-29 14:59:55 +0000 |
commit | fe3cba8e6fdb00b2cb50fcabe14c45463df5943f (patch) | |
tree | 4f3885dd73d3e53aff0c01d75bb0056dc328c347 /eval.c | |
parent | 6779556b23018b057236668d8a9f6cb2c0bb64e0 (diff) | |
download | ruby-fe3cba8e6fdb00b2cb50fcabe14c45463df5943f.tar.gz |
* eval.c (rb_gc_mark_threads): keep unmarked threads which won't wake
up alone, and mark threads in the loading table. [ruby-dev:28154]
* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
threads. [ruby-dev:28172]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 33 |
1 files changed, 33 insertions, 0 deletions
@@ -9987,6 +9987,13 @@ static struct { VALUE proc, arg; } new_thread; +static int +mark_loading_thread(ID key, VALUE value, int lev) +{ + rb_gc_mark(((rb_thread_t)value)->thread); + return ST_CONTINUE; +} + void rb_gc_mark_threads(void) { @@ -9996,7 +10003,18 @@ rb_gc_mark_threads(void) rb_gc_mark((VALUE)ruby_cref); if (!curr_thread) return; + rb_gc_mark(main_thread->thread); + rb_gc_mark(curr_thread->thread); FOREACH_THREAD_FROM(main_thread, th) { + switch (th->status) { + case THREAD_TO_KILL: + case THREAD_RUNNABLE: + break; + case THREAD_STOPPED: + if (th->wait_for) break; + default: + continue; + } rb_gc_mark(th->thread); } END_FOREACH_FROM(main_thread, th); if (new_thread.thread) { @@ -10004,6 +10022,21 @@ rb_gc_mark_threads(void) rb_gc_mark(new_thread.proc); rb_gc_mark(new_thread.arg); } + if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0); +} + +void +rb_gc_abort_threads(void) +{ + rb_thread_t th; + + FOREACH_THREAD_FROM(main_thread, th) { + if (FL_TEST(th->thread, FL_MARK)) continue; + if (th->status == THREAD_STOPPED) { + th->status = THREAD_TO_KILL; + rb_gc_mark(th->thread); + } + } END_FOREACH_FROM(main_thread, th); } static void |