Changeset 00c2de63 in mainline for uspace/lib/posix/sys/wait.c

Timestamp:

2011-07-29T14:50:22Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b6759f4

Parents:

6c69d19 (diff), 7ae249d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix.

File:

• uspace/lib/posix/sys/wait.c (modified) (3 diffs)

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;
+}
+
 /**
  * 
@@ -46 +73 @@
 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;
 }
 
@@ -59 +87 @@
 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;
 }