Errno::ECHILD thrown from Process.waitpid, some Process methods

lib-topaz/bootstrap.rb

@@ -11,6 +11,7 @@
 load_bootstrap.call("comparable.rb")
 load_bootstrap.call("enumerable.rb")
 load_bootstrap.call("enumerator.rb")
+load_bootstrap.call("errno.rb")
 load_bootstrap.call("file.rb")
 load_bootstrap.call("fixnum.rb")
 load_bootstrap.call("hash.rb")

lib-topaz/errno.rb

@@ -0,0 +1,4 @@
+module Errno
+  class ECHILD < SystemCallError
+  end
+end

lib-topaz/process.rb

@@ -8,8 +8,15 @@ def self.waitpid2(pid = -1)
     return [pid, $?]
   end
 
+  def self.wait2(pid = -1)
+    waitpid2(pid)
+  end
+
   def self.waitall
-    raise NotImplementedError.new("Process.waitall")
+    result = []
+    result << wait2 while true
+  rescue Errno::ECHILD
+    result
   end
 
   class Status

spec/tags/core/process/wait_tags.txt

@@ -1,4 +1,3 @@
-fails:Process.wait raises a Errno::ECHILD if there are no child processes
 fails:Process.wait waits for any child process if no pid is given
 fails:Process.wait waits for a specific child if a pid is given
 fails:Process.wait coerces the pid to an Integer

spec/tags/core/process/waitall_tags.txt

@@ -1,3 +1 @@
-fails:Process.waitall returns an empty array when there are no children
 fails:Process.waitall waits for all children
-fails:Process.waitall returns an array of pid/status pairs

topaz.mspec

@@ -63,7 +63,6 @@ class MSpecScript
           "^#{Rubyspec}/core/process/status/signaled_spec.rb",
           "^#{Rubyspec}/core/process/status/success_spec.rb",
           "^#{Rubyspec}/core/process/status/termsig_spec.rb",
-          "^#{Rubyspec}/core/process/wait_spec.rb",
           "^#{Rubyspec}/core/file/ctime_spec.rb"
   ]
 

topaz/error.py

@@ -1,4 +1,5 @@
 import os
+import errno
 
 
 class RubyError(Exception):
@@ -31,3 +32,17 @@ def error_for_oserror(space, exc):
         os.strerror(exc.errno),
         [space.newint(exc.errno)]
     )
+
+_errno_for_oserror_map = {
+    errno.ECHILD: "ECHILD",
+}
+
+def errno_for_oserror(callee, space, exc):
+    try:
+        name = _errno_for_oserror_map[exc.errno]
+    except KeyError:
+        raise NotImplementedError("no such errno: %s" % exc.errno)
+    return space.error(
+        space.find_const(space.find_const(callee, "Errno"), name),
+        os.strerror(exc.errno)
+    )

topaz/modules/process.py

@@ -4,6 +4,7 @@
 
 from topaz.module import ModuleDef
 from topaz.system import IS_WINDOWS
+from topaz.error import errno_for_oserror
 
 
 if IS_WINDOWS:
@@ -35,7 +36,10 @@ def method_pid(self, space):
 
     @moduledef.function("waitpid", pid="int")
     def method_waitpid(self, space, pid=-1):
-        pid, status = os.waitpid(pid, 0)
+        try:
+            pid, status = os.waitpid(pid, 0)
+        except OSError as e:
+            raise errno_for_oserror(self, space, e)
         status = WEXITSTATUS(status)
         w_status = space.send(
             space.find_const(self, "Status"),