Re: [BUG] thread failure after trap

>>>>> "n" == nobu nokada <[e-mail]> writes:

n> Sure.  But I wonder if other values should be preserved.

 If I've well understood, a signal is always run in the main thread.

 After the signal, ruby must give the control to the current thread (the
 thread which has received the signal) because this thread need to test if
 some others signals are pending and it must restore the old value for the
 main thread.

pigeon% diff -u eval.c.old eval.c
--- eval.c.old  Thu May 16 06:58:11 2002
+++ eval.c      Thu May 16 06:59:08 2002
@@ -7422,6 +7422,8 @@
 static int   th_sig;
 static char *th_signm;
 
+static rb_thread_t th_thread;
+
 #define RESTORE_NORMAL         1
 #define RESTORE_FATAL          2
 #define RESTORE_INTERRUPT      3
@@ -7477,6 +7479,8 @@
     th->line = ruby_sourceline;
 }
 
+static void rb_thread_restore_context _((rb_thread_t,int));
+
 static int
 thread_switch(n)
     int n;
@@ -7493,6 +7497,10 @@
       case RESTORE_TRAP:
        rb_trap_eval(th_cmd, th_sig);
        errno = EINTR;
+       if (th_thread) {
+           curr_thread = th_thread;
+           rb_thread_restore_context(curr_thread, RESTORE_NORMAL);
+       }
        break;
       case RESTORE_RAISE:
        ruby_frame->last_func = 0;
@@ -7513,8 +7521,6 @@
 #define THREAD_SAVE_CONTEXT(th) \
     (rb_thread_save_context(th),thread_switch(setjmp((th)->context)))
 
-static void rb_thread_restore_context _((rb_thread_t,int));
-
 static void
 stack_extend(th, exit)
     rb_thread_t th;
@@ -8839,6 +8845,8 @@
     VALUE cmd;
     int sig;
 {
+    volatile int status;
+    volatile int wait_for;
 #if 0
     rb_thread_critical = 0;
     if (!rb_thread_dead(curr_thread)) {
@@ -8856,8 +8864,14 @@
     rb_thread_restore_context(curr_thread, RESTORE_TRAP);
 #else
     rb_thread_critical = 0;
+    th_thread = 0;
     if (!rb_thread_dead(curr_thread)) {
+       th_thread = curr_thread;
+       status = main_thread->status;
+       wait_for = main_thread->wait_for;
        if (THREAD_SAVE_CONTEXT(curr_thread)) {
+           main_thread->status = status;
+           main_thread->wait_for = wait_for;
            return;
        }
     }
pigeon% 



Guy Decoux