[ruby-dev:12728] Re: Process.waitall (Re: [BUG] Process::Status)

まつもと ゆきひろです

In message "[ruby-dev:12727] Re: Process.waitall (Re:  [BUG] Process::Status)"
    on 01/04/02, Yukihiro Matsumoto <[e-mail]> writes:

||> また、以前、提案したように waktall がブロックを持てるように
||> してみました．(そうしなかった理由がありました？)
|
|なんかブロックを持つのは気持ち悪い気がします。全部(all)待つ
|と、個別(each)に待つとは違うような気がするからです。

ちゅーわけで、私の作ったパッチは以下のようなものです。

--- process.c	2001/03/28 08:43:25	1.33
+++ process.c	2001/04/02 07:59:40
@@ -316,8 +316,2 @@
 
-struct waitall_data {
-    int pid;
-    int status;
-    VALUE ary;
-};
-
 static int
@@ -325,14 +319,6 @@
     int key, value;
-    struct waitall_data *data;
+    VALUE data;
 {
-    VALUE pid_status_member;
-
-    if (data->status != -1) return ST_STOP;
-
-    data->pid = key;
-    data->status = value;
-    pid_status_member = rb_ary_new2(2);
-    rb_ary_push(pid_status_member, INT2NUM(key));
-    rb_ary_push(pid_status_member, INT2NUM(value));
-    rb_ary_push(data->ary, pid_status_member);
+    last_status_set(value);
+    rb_ary_push(data, rb_assoc_new(INT2NUM(key), rb_last_status));
     return ST_DELETE;
@@ -348,7 +334,9 @@
 
-    data.status = -1;
-    st_foreach(pid_tbl, wait_each, &data);
-    if (data.status != -1) {
-	last_status_set(data.status);
-	return INT2FIX(data.pid);
+    if (pid_tbl) {
+	data.status = -1;
+	st_foreach(pid_tbl, wait_each, &data);
+	if (data.status != -1) {
+	    last_status_set(data.status);
+	    return INT2FIX(data.pid);
+	}
     }
@@ -418,13 +406,9 @@
 {
-    VALUE pid_status_ary, pid_status_member;
+    VALUE result;
     int pid, status;
-#ifdef NO_WAITPID
-    struct waitall_data data;
 
-    data.ary = pid_status_ary = rb_ary_new();
-    data.status = -1;
-    st_foreach(pid_tbl, waitall_each, &data);
-    if (data.status != -1) {
-	last_status_set(data.status);
-	return pid_status_ary;
+    result = rb_ary_new();
+#ifdef NO_WAITPID
+    if (pid_tbl) {
+	st_foreach(pid_tbl, waitall_each, result);
     }
@@ -442,11 +426,7 @@
 	}
-	pid_status_member = rb_ary_new2(2);
-	rb_ary_push(pid_status_member, INT2NUM(pid));
-	rb_ary_push(pid_status_member, INT2NUM(status));
-	rb_ary_push(pid_status_ary, pid_status_member);
-    }
-    if (RARRAY(pid_status_ary)->len != 0)
 	last_status_set(status);
+	rb_ary_push(result, rb_assoc_new(INT2NUM(pid), rb_last_status));
+    }
 #else
-    pid_status_ary = rb_ary_new();
+    rb_last_status = Qnil;
     for (pid = -1;;) {
@@ -458,9 +438,6 @@
 	}
-	pid_status_member = rb_ary_new2(2);
-	rb_ary_push(pid_status_member, INT2NUM(pid));
-	rb_ary_push(pid_status_member, INT2NUM(status));
-	rb_ary_push(pid_status_ary, pid_status_member);
+	rb_ary_push(result, rb_assoc_new(INT2NUM(pid), rb_last_status));
     }
 #endif
-    return pid_status_ary;
+    return result;
 }