Changeset eb1edb0 in mainline

Timestamp:

2011-07-26T22:16:54Z (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:

1e591c8

Parents:

d542aad

Message:

Partial <wait.h> implementation.

Location:

uspace/lib/posix/sys

Files:

• wait.c (modified) (3 diffs)
• wait.h (modified) (2 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;
 }
 

uspace/lib/posix/sys/wait.h

@@ -38 +38 @@
 #include "types.h"
 
+#undef WIFEXITED
+#undef WEXITSTATUS
+#undef WIFSIGNALED
+#undef WTERMSIG
+#define WIFEXITED(status) __posix_wifexited(status)
+#define WEXITSTATUS(status) __posix_wexitstatus(status)
+#define WIFSIGNALED(status) __posix_wifsignaled(status)
+#define WTERMSIG(status) __posix_wtermsig(status)
+
+extern int __posix_wifexited(int status);
+extern int __posix_wexitstatus(int status);
+extern int __posix_wifsignaled(int status);
+extern int __posix_wtermsig(int status);
+
 extern posix_pid_t posix_wait(int *stat_ptr);
 extern posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options);
@@ -43 +57 @@
 #ifndef LIBPOSIX_INTERNAL
         #define wait posix_wait
-        #define waitpid posix_waitpid
+        #define waitpid posix_waitpid
 #endif