Changeset 1723 for trunk

Timestamp:

Dec 9, 2004, 9:19:34 AM (21 years ago)

Author:

bird

Message:

Fixed wait*() WNOHANG bug and cleanedup some errorcode stuff. Switched wait4 and waitpid - wait4 is the master now.

Location:

trunk/src/emx/src/lib

Files:

• process/wait.c (modified) (1 diff, 1 prop)
• process/wait4.c (modified) (2 diffs, 1 prop)
• process/waitid.c (modified) (1 diff, 1 prop)
• process/waitpid.c (modified) (1 diff, 1 prop)
• sys/b_processWait.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/process/wait.c

@@ -50 +50 @@
      * Just pass it along to waitpid.
      */
-    pid_t pid = waitpid(-1, piStatus, 0);
+    pid_t pid = wait);
     if (pid > 0)
         LIBCLOG_RETURN_MSG(pid, "ret %d (%#x) iStatus=%#x\n", pid, pid, piStatus ? *piStatus : -1);

trunk/src/emx/src/lib/process/wait4.c

@@ -2 +2 @@
 /** @file
  *
- * LIBC - wait3().
+ * LIBC - wait().
  *
  * Copyright (c) 2004 knut st. osmundsen <[email protected]>
@@ -62 +62 @@
     {
         LIBC_ASSERTM_FAILED("pRUsage=%p - not implemented\n", (void *)pRUsage);
-        errno = ENOSYS;
+        /* errno = ENOSYS;
+        LIBCLOG_RETURN_INT(-1); */
+    }
+    if (fOptions & ~(WEXITED | WUNTRACED | WSTOPPED | WCONTINUED | WNOHANG | WNOWAIT))
+    {
+        LIBC_ASSERTM_FAILED("Unknown options %#x. (fOptions=%#x)\n",
+                            fOptions & ~(WEXITED | WUNTRACED | WSTOPPED | WCONTINUED | WNOHANG | WNOWAIT), fOptions);
+        errno = EINVAL;
         LIBCLOG_RETURN_INT(-1);
     }
 
     /*
-     * Let waitpid do the job.
+     * .
      */
-    pid = waitpid(pid, piStatus, fOptions);
+    /* convert pid to enmIdType and Id. */
+    id_t     Id;
+    idtype_t enmIdType;
     if (pid > 0)
-        LIBCLOG_RETURN_MSG(pid, "ret %d (%#x) iStatus=%#x\n", pid, pid, piStatus ? *piStatus : -1);
-    LIBCLOG_RETURN_INT(pid);
+    {
+        enmIdType = P_PID;
+        Id = pid;
+    }
+    else if (pid == 0)
+    {
+        enmIdType = P_PGID;
+        Id = 0;
+    }
+    else if (pid == -1)
+    {
+        enmIdType = P_ALL;
+        Id = 0;
+    }
+    else
+    {
+        Id = -pid;
+        enmIdType = P_PGID;
+    }
+
+    /* do the call */
+    siginfo_t SigInfo = {0};
+    int rc = __libc_Back_processWait(enmIdType, Id, &SigInfo, fOptions | WEXITED, pRUsage);
+    if (!rc)
+    {
+        /*
+         * Convert signal info to status code.
+         */
+        int iStatus;
+        switch (SigInfo.si_code)
+        {
+            default:
+                LIBC_ASSERTM_FAILED("Invalid si_code=%d\n", SigInfo.si_code);
+            case CLD_EXITED:    iStatus = W_EXITCODE(SigInfo.si_status, 0); break;
+            case CLD_KILLED:    iStatus = W_EXITCODE(0, SigInfo.si_status); break;
+            case CLD_DUMPED:    iStatus = W_EXITCODE(0, SigInfo.si_status) | WCOREFLAG; break;
+            case CLD_TRAPPED:   iStatus = W_STOPCODE(SigInfo.si_status); break;
+            case CLD_STOPPED:   iStatus = W_STOPCODE(SigInfo.si_status); break;
+            case CLD_CONTINUED: iStatus = W_STOPCODE(SigInfo.si_status); break;
+
+        }
+        if (piStatus)
+            *piStatus = iStatus;
+        LIBCLOG_RETURN_MSG(SigInfo.si_pid, "ret %d (%#x) iStatus=%#x\n",
+                           SigInfo.si_pid, SigInfo.si_pid, iStatus);
+    }
+
+    /*
+     * wait4() doesn't return EINVAL for anything but invalid fOptions
+     * and since we've already validated those, they cannot be the cause
+     * of EINVAL.
+     */
+    if (rc == -EINVAL)
+        rc = -ECHILD;
+    errno = -rc;
+    LIBCLOG_RETURN_INT((pid_t)-1);
 }
 

trunk/src/emx/src/lib/process/waitid.c

@@ -42 +42 @@
  * @returns 0 on success, pSigInfo containing status info.
  * @returns -1 and errno on failure.
+
+
+
  * @param   enmIdType   What kind of process specification Id contains.
  * @param   Id          Process specification of the enmIdType sort.

trunk/src/emx/src/lib/process/waitpid.c

@@ -54 +54 @@
 {
     LIBCLOG_ENTER("pid=%#x (%d) piStatus=%p fOptions=%#x\n", pid, pid, (void *)piStatus, fOptions);
-
     /*
-     * Call waitid to do the actual waiting.
+     * .
      */
-    /* convert pid to enmIdType and Id. */
-    id_t     Id;
-    idtype_t enmIdType;
+    pid = wait4(pid, piStatus, fOptions, NULL);
     if (pid > 0)
-    {
-        enmIdType = P_PID;
-        Id = pid;
-    }
-    else if (pid == 0)
-    {
-        enmIdType = P_PGID;
-        Id = 0;
-    }
-    else if (pid == -1)
-    {
-        enmIdType = P_ALL;
-        Id = 0;
-    }
-    else
-    {
-        Id = -pid;
-        enmIdType = P_PGID;
-    }
-
-    /* do the call */
-    siginfo_t SigInfo = {0};
-    int rc = waitid(P_ALL, 0, &SigInfo, fOptions | WEXITED);
-    if (!rc)
-    {
-        /*
-         * Convert signal info to status code.
-         */
-        int iStatus;
-        switch (SigInfo.si_code)
-        {
-            default:
-                LIBC_ASSERTM_FAILED("Invalid si_code=%d\n", SigInfo.si_code);
-            case CLD_EXITED:    iStatus = W_EXITCODE(SigInfo.si_status, 0); break;
-            case CLD_KILLED:    iStatus = W_EXITCODE(0, SigInfo.si_status); break;
-            case CLD_DUMPED:    iStatus = W_EXITCODE(0, SigInfo.si_status) | WCOREFLAG; break;
-            case CLD_TRAPPED:   iStatus = W_STOPCODE(SigInfo.si_status); break;
-            case CLD_STOPPED:   iStatus = W_STOPCODE(SigInfo.si_status); break;
-            case CLD_CONTINUED: iStatus = W_STOPCODE(SigInfo.si_status); break;
-
-        }
-        if (piStatus)
-            *piStatus = iStatus;
-        LIBCLOG_RETURN_MSG(SigInfo.si_pid, "ret %d (%#x) iStatus=%#x\n",
-                           SigInfo.si_pid, SigInfo.si_pid, iStatus);
-    }
-    LIBCLOG_RETURN_INT(rc);
+        LIBCLOG_RETURN_MSG(pid, "ret %d (%#x) iStatus=%#x\n", pid, pid, piStatus ? *piStatus : -1);
+    LIBCLOG_RETURN_INT(-1);
 }
 

trunk/src/emx/src/lib/sys/b_processWait.c

@@ -736 +736 @@
     {
         case P_ALL:
+
         case P_PID:
+
+
+
+
+
+
         case P_PGID:
+
+
+
+
+
             break;
         default:
@@ -803 +815 @@
             if (fFlag && (fFlag & fOptions))
             {
-                if (    enmIdType == P_ALL
-                    ||  (enmIdType == P_PID  && pInfo->pid  == pid)
-                    ||  (enmIdType == P_PGID && pInfo->pgrp == pid))
+                if (enmIdType == P_ALL)
+                    break;
+                else if (enmIdType == P_PID)
+                {
+                    if (pInfo->pid == pid)
+                        break;
+                }
+                else if (enmIdType == P_PGID && pInfo->pgrp == pid)
                     break;
             }
@@ -885 +902 @@
                  * Should call DosVerifyPidTid and DosGetPPid(). */
                 waitSemRelease();
-                rc = -ECHILD;           /* this ain't correct! */
+                rc = -ECHILD;  */
                 break;
             }
@@ -894 +911 @@
             if (rc)
             {
+
                 waitSemRelease();
-                rc = -ECHILD;
+                rc = -ECHILD;
                 break;
             }
         }
         waitSemRelease();
+
+
+
+
+
+
+
+
+
 
         /*