[ruby-dev:11223] interrupt while flock() and wait()

なかだです。

  File#flock や Process.waitpid なんかが割り込みを受け付けてな
いのはなんででしょうか。それと Process.waitpid2 が再帰してます。


Index: file.c
===================================================================
RCS file: /home/cvs/ruby/file.c,v
retrieving revision 1.39
diff -u -2 -p -r1.39 file.c
--- file.c	2000/10/13 09:01:54	1.39
+++ file.c	2000/10/14 16:49:17
@@ -1531,4 +1531,5 @@ rb_file_flock(obj, operation)
 #ifndef __CHECKER__
     OpenFile *fptr;
+    int ret;
 
     rb_secure(2);
@@ -1538,5 +1539,8 @@ rb_file_flock(obj, operation)
 	fflush(GetWriteFile(fptr));
     }
-    if (flock(fileno(fptr->f), NUM2INT(operation)) < 0) {
+    TRAP_BEG;
+    ret = flock(fileno(fptr->f), NUM2INT(operation));
+    TRAP_END;
+    if (ret < 0) {
 #ifdef EWOULDBLOCK
 	if (errno == EWOULDBLOCK) {
Index: process.c
===================================================================
RCS file: /home/cvs/ruby/process.c,v
retrieving revision 1.19
diff -u -2 -p -r1.19 process.c
--- process.c	2000/10/10 07:03:21	1.19
+++ process.c	2000/10/14 16:49:18
@@ -87,4 +87,5 @@ rb_waitpid(pid, flags, st)
 
   retry:
+    TRAP_BEG;
 #ifdef HAVE_WAITPID
     result = waitpid(pid, st, flags);
@@ -92,4 +93,5 @@ rb_waitpid(pid, flags, st)
     result = wait4(pid, st, flags, NULL);
 #endif
+    TRAP_END;
     if (result < 0) {
 	if (errno == EINTR) {
@@ -117,5 +119,7 @@ rb_waitpid(pid, flags, st)
 
     for (;;) {
+	TRAP_BEG;
 	result = wait(st);
+	TRAP_END;
 	if (result < 0) {
 	    if (errno == EINTR) {
@@ -171,5 +175,9 @@ proc_wait()
     }
 
-    while ((pid = wait(&state)) < 0) {
+    while (1) {
+	TRAP_BEG;
+	pid = wait(&state);
+	TRA_END;
+	if (pid >= 0) break;
         if (errno == EINTR) {
             rb_thread_schedule();
@@ -219,5 +227,5 @@ proc_waitpid2(argc, argv)
     VALUE *argv;
 {
-    VALUE pid = proc_waitpid2(argc, argv);
+    VALUE pid = proc_waitpid(argc, argv);
     return rb_assoc_new(pid, rb_last_status);
 }


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