[ruby-dev:28173] Re: thread based generator.rb

なかだです。

At Thu, 29 Dec 2005 18:55:09 +0900,
Tanaka Akira wrote in [ruby-dev:28172]:
> 考えたのですが、thread 内の ensure で後始末をしたいと考える
> と、mark されなかったスレッドは改めて mark した上で aborting
> 状態に遷移させるべきかも。

うーん、こんなところかな。

> さらに面倒?

ですねぇ。


* 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]


Index: eval.c
===================================================================
RCS file: /src/ruby/eval.c,v
retrieving revision 1.859
diff -U2 -p -r1.859 eval.c
--- eval.c	27 Dec 2005 16:35:57 -0000	1.859
+++ eval.c	29 Dec 2005 10:30:32 -0000
@@ -9985,4 +9985,11 @@ static struct {
 } 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)
@@ -9994,5 +10001,16 @@ rb_gc_mark_threads(void)
 
     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);
@@ -10002,4 +10020,19 @@ rb_gc_mark_threads(void)
 	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);
 }
 
Index: gc.c
===================================================================
RCS file: /src/ruby/gc.c,v
retrieving revision 1.224
diff -U2 -p -r1.224 gc.c
--- gc.c	27 Dec 2005 05:40:04 -0000	1.224
+++ gc.c	29 Dec 2005 10:30:32 -0000
@@ -1016,4 +1016,6 @@ gc_sweep(void)
     }
 
+    rb_gc_abort_threads();
+
     freelist = 0;
     final_list = deferred_final_list;


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦