Changes in uspace/lib/posix/sys/wait.c [4cf8ca6:2a53f71] in mainline

File:

• uspace/lib/posix/sys/wait.c (modified) (1 diff)

uspace/lib/posix/sys/wait.c

@@ -39 +39 @@
 #include "wait.h"
 
+#include "../libc/task.h"
+#include "../assert.h"
+#include "../errno.h"
+#include "../limits.h"
+#include "../signal.h"
+
+int __posix_wifexited(int status) {
+        return status != INT_MIN;
+}
+
+int __posix_wexitstatus(int status) {
+        assert(__posix_wifexited(status));
+        return status;
+}
+
+int __posix_wifsignaled(int status) {
+        return status == INT_MIN;
+}
+
+int __posix_wtermsig(int status) {
+        assert(__posix_wifsignaled(status));
+        /* There is no way to distinguish reason
+         * for unexpected termination at the moment.
+         */
+        return SIGABRT;
+}
+
 /**
+ * Wait for any child process to stop or terminate.
  * 
- * @param stat_ptr
- * @return
+ * @param stat_ptr Location of the final status code of the child process.
+ * @return ID of the child process for which status is reported,
+ *     -1 on signal interrupt, (pid_t)-1 otherwise.
  */
 posix_pid_t posix_wait(int *stat_ptr)
 {
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
+        /* HelenOS does not support this. */
+        errno = ENOSYS;
+        return (posix_pid_t) -1;
 }
 
 /**
+ * Wait for a child process to stop or terminate.
  * 
- * @param pid
- * @param stat_ptr
- * @param options
- * @return
+ * @param pid What child process shall the caller wait for. See POSIX manual
+ *     for details.
+ * @param stat_ptr Location of the final status code of the child process.
+ * @param options Constraints of the waiting. See POSIX manual for details.
+ * @return ID of the child process for which status is reported,
+ *     -1 on signal interrupt, 0 if non-blocking wait is requested but there is
+ *     no child process whose status can be reported, (pid_t)-1 otherwise.
  */
 posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options)
 {
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
+        assert(stat_ptr != NULL);
+        assert(options == 0 /* None of the options are supported. */);
+        
+        task_exit_t texit;
+        int retval;
+        
+        int rc = task_wait((task_id_t) pid, &texit, &retval);
+        
+        if (rc < 0) {
+                /* Unable to retrieve status. */
+                errno = -rc;
+                return (posix_pid_t) -1;
+        }
+        
+        if (texit == TASK_EXIT_NORMAL) {
+                // FIXME: relies on application not returning this value
+                assert(retval != INT_MIN);
+                *stat_ptr = retval;
+        } else {
+                /* Reserve the lowest value for unexpected termination. */
+                *stat_ptr = INT_MIN;
+        }
+        
+        return pid;
 }