Changeset 1633

Timestamp:

Nov 15, 2004, 9:21:54 AM (21 years ago)

Author:

bird

Message:

Bugfixing.

Location:

trunk/src/emx

Files:

• include/signal.h (modified) (2 diffs, 1 prop)
• src/lib/process/sigtimedwait.c (modified) (1 diff, 1 prop)
• src/lib/process/sigwait.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_signalSuspend.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_signalWait.c (modified) (3 diffs, 1 prop)
• src/lib/sys/sharedpm.c (modified) (6 diffs, 1 prop)
• src/lib/sys/signals.c (modified) (9 diffs, 1 prop)

trunk/src/emx/include/signal.h

@@ -3 +3 @@
  * @changed bird:   Added sighold(), sigignore(), sigrelse(). Added wrapper
  *                  between the two sigpause() APIs.
+ * @changed bird:   include sys/timespec.h.
  */
 
@@ -47 +48 @@
 #include <sys/_types.h>
 #include <sys/signal.h>
+#include <sys/timespec.h>               /* bird: Need full timespec declaration. */
 
 #if __BSD_VISIBLE

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

@@ -65 +65 @@
     siginfo_t SigInfo;
     int rc = __libc_Back_signalWait(pSigSet, &SigInfo, pTimeout);
-    if (!rc)
+    if (rc >= 0)
     {
         if (pSigInfo)

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

@@ -60 +60 @@
     if (piSignalNo)
         *piSignalNo = SigInfo.si_signo;
+    if (rc > 0)
+        rc = 0;
 
     LIBCLOG_RETURN_MSG(rc, "ret rc (*piSignalNo=%d)\n", SigInfo.si_signo);

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

@@ -76 +76 @@
      */
     rc = __libc_back_signalWait(pThrd, &SigSuspend.fDone, NULL);
-    if (rc != EAGAIN)
-        __libc_back_signalSemRelease();
+    __libc_back_signalSemRelease();
     LIBCLOG_RETURN_INT(rc);
 }

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

@@ -100 +100 @@
         sigset_t    SigSetPending;
         __SIGSET_OR(&SigSetPending, &pThrd->SigSetPending, &__libc_gSignalPending);
-        __SIGSET_AND(&SigSetPending, &pThrd->SigSetPending, &SigSet);
+        __SIGSET_AND(&SigSetPending, &SigSetPending, &SigSet);
         if (!__SIGSET_ISEMPTY(&SigSetPending))
         {
@@ -133 +133 @@
      * Wait till state changes back and then return according to the wait result.
      *
-     * The result is a bit tricky. EAGAIN means time out and no semaphore. While
-     * EINTR means that we've been interrupted by the delivery of a signal, which
-     * might mean that we got what we waited for or that some other signal was
-     * delivered to this thread. Very simple. :-)
+     * EAGAIN means time out. While EINTR means that we've been interrupted by
+     * the delivery of a signal, which might mean that we got what we waited
+     * for or that some other signal was delivered to this thread. Very simple. :-)
      */
     rc = __libc_back_signalWait(pThrd, &SigWait.fDone, pTimeout ? &Timeout : NULL);
-    if (rc != -EAGAIN)
-        __libc_back_signalSemRelease();
+    pThrd->enmStatus = enmLIBCThreadStatus_unknown;
+    __libc_back_signalSemRelease();
     if (rc == -EINTR)
     {
@@ -151 +150 @@
     }
 
+
     LIBCLOG_RETURN_MSG(rc, "ret %d SigWait.SigInfo={si_signo=%d, si_errno=%d, si_code=%#x, si_timestamp=%#x, si_flags=%#x, si_pid=%d, si_tid=%d, si_uid=%d, si_status=%d, si_addr=%p, si_value=%#08x, si_band=%ld}\n",
                        rc, SigWait.SigInfo.si_signo, SigWait.SigInfo.si_errno, SigWait.SigInfo.si_code, SigWait.SigInfo.si_timestamp,

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

@@ -804 +804 @@
      */
     int rc = spmRequestMutex(&RegRec);
-    if (!rc)
+    if (rc)
         LIBCLOG_RETURN_INT(rc);
 
@@ -851 +851 @@
      */
     int rc = spmRequestMutex(&RegRec);
-    if (!rc)
+    if (rc)
         LIBCLOG_RETURN_INT(rc);
 
@@ -895 +895 @@
      */
     int rc = spmRequestMutex(&RegRec);
-    if (!rc)
+    if (rc)
         LIBCLOG_RETURN_INT(rc);
 
@@ -943 +943 @@
      */
     int rc = spmRequestMutex(&RegRec);
-    if (!rc)
+    if (rc)
         LIBCLOG_RETURN_INT(rc);
 
@@ -1007 +1007 @@
     if (!rc)
         LIBCLOG_RETURN_INT(0);
-    errno = rc;
+    errno = -rc;
     LIBCLOG_RETURN_INT(-1);
 }
@@ -1413 +1413 @@
     for (; pProcess; pProcess = pProcess->pNext)
     {
-        if (    pProcess->pgrp != pgrp
-            && !pProcess->fExeInited)
+        if (    pProcess->pgrp == pgrp
+            &&  pProcess->fExeInited)
         {
             /* try queue the signal */

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

@@ -1761 +1761 @@
                  )
         {
-            pThrd->u.pSigSuspend->fDone = 1;
-            pThrd->u.pSigSuspend = NULL;
-            pThrd->enmStatus = enmLIBCThreadStatus_sigsuspend;
+            if (pThrd->u.pSigSuspend)
+            {
+                pThrd->u.pSigSuspend->fDone = 1;
+                pThrd->u.pSigSuspend = NULL;
+            }
+            pThrd->enmStatus = enmLIBCThreadStatus_unknown;
         }
 
@@ -1941 +1944 @@
             /*
              * Re-take the signal semaphore and restore the signal mask.
+             * We'll have to reschedule signals here unless the two masks are 100% equal
              */
             if (__libc_back_signalSemRequest())
                 break;
             pThrd->SigSetBlocked = SigSetOld;
+            signalScheduleSPM(pThrd);
+            signalScheduleProcess(pThrd);
         }
 
@@ -2134 +2140 @@
      * Wait for interruption (outside semaphores of course).
      */
+    DosSleep(0);                        /** @todo rewrite to call the signalWait worker and change the thread state while here! */
     __libc_back_signalSemRelease();
-    DosWaitEventSem(__libc_back_ghevWait, SEM_INDEFINITE_WAIT);
+    int rc;
+    do rc = DosWaitEventSem(__libc_back_ghevWait, 24*3600*1000); while (rc == ERROR_SEM_TIMEOUT || rc == ERROR_TIMEOUT);
     return __libc_back_signalSemRequest();
 }
@@ -2222 +2230 @@
         /*
          * Check that the process exists first.
-         */
+         * Only root users are allowed to do this. (Mainly to fix some testcases :-)
+         */
+        if (__libc_spmGetId(__LIBC_SPMID_EUID))
+            LIBCLOG_RETURN_MSG(-EPERM, "%d (Only root can signal OS/2 processes.) euid=%d\n", -EPERM, __libc_spmGetId(__LIBC_SPMID_EUID));
         FS_SAVE_LOAD();
         rc = DosVerifyPidTid(pid, 1);
@@ -2373 +2384 @@
     if (SigInfo.si_pid)
         SigInfo.si_pid      = _sys_pid;
-    __LIBC_PTHREAD pThrd    = __libc_threadCurrentNoAuto();
+    __LIBC_PTHREAD pThrd    = __libc_threadCurrent();
     if (pThrd)
         SigInfo.si_tid      = pThrd->tid;
@@ -2392 +2403 @@
      */
     rc = __libc_spmSigQueuePGrp(iSignalNo, &SigInfo, pgrp, SigInfo.si_flags & __LIBC_SI_QUEUED, signalSendPGrpCallback, NULL);
+
+    /*
+     * Just in case the signal were for our selves too, we'll do the
+     * schedule & deliver stuff.
+     */
+    signalScheduleSPM(pThrd);
+    signalScheduleProcess(pThrd);
+    signalDeliver(pThrd, 0, NULL);
 
     __libc_back_signalSemRelease();
@@ -2947 +2966 @@
                 bzero(pSigInfo, sizeof(*pSigInfo));
                 pSigInfo->si_signo = iSignalNo;
+                pSigInfo->si_code = SI_USER;
             }
         }
@@ -2973 +2993 @@
      * Calc wait period.
      */
-    ULONG cMillies = SEM_INDEFINITE_WAIT;
+    ULONG cMillies = 30*1000;
     if (pTimeout)
     {
-        cMillies = pTimeout->tv_nsec * 1000 + pTimeout->tv_sec / 1000;
-        if (!cMillies && pTimeout->tv_sec)
+        if (pTimeout->tv_nsec >= 100000000 || pTimeout->tv_nsec < 0)
+        {
+            LIBC_ASSERTM_FAILED("Invalid tv_nsec! tv_sec=%d tv_nsec=%ld\n", pTimeout->tv_sec, pTimeout->tv_nsec);
+            LIBCLOG_RETURN_INT(-EINVAL);
+        }
+        if (    pTimeout->tv_sec < 0
+            ||  pTimeout->tv_sec >= 4294967)
+        {
+            LIBC_ASSERTM_FAILED("Invalid tv_sec! tv_sec=%d (max=4294967) tv_nsec=%ld\n", pTimeout->tv_sec, pTimeout->tv_nsec);
+            LIBCLOG_RETURN_INT(-EINVAL);
+        }
+
+        cMillies = pTimeout->tv_sec * 1000 + pTimeout->tv_nsec / 1000000;
+        if (!cMillies && pTimeout->tv_nsec)
             cMillies = 1;
     }
 
     /*
-     * Wait for interruption (outside semaphores of course).
-     */
+     * Wait for interruption.
+     */
+    int rc = 0;
     FS_VAR();
     FS_SAVE_LOAD();
     ULONG ulStart = 0;
     DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &ulStart, sizeof(ulStart));
-    __libc_back_signalSemRelease();
     for (;;)
     {
-        int rc = DosWaitEventSem(__libc_back_ghevWait, cMillies);
+        /*
+         * Release the semaphore and recheck exit condition before
+         * engaging in waiting again.
+         */
+        DosSleep(0);                    /** @todo need better methods for waiting! */
+        __libc_back_signalSemRelease();
+        if (*pfDone)
+        {
+            rc = -EINTR;
+            break;
+        }
+        rc = DosWaitEventSem(__libc_back_ghevWait, cMillies);
 
         /*
          * We returned from the wait, but did we do so for the right reason?
          */
-        if (rc == ERROR_TIMEOUT || rc == ERROR_SEM_TIMEOUT)
-        {
-            FS_RESTORE();
-            LIBCLOG_RETURN_INT(-EAGAIN);
-        }
-        rc = __libc_back_signalSemRequest();
-        if (*pfDone)
-        {
-            FS_RESTORE();
-            LIBCLOG_RETURN_INT(-EINTR);
-        }
+        if (__libc_back_signalSemRequest())
+            rc = -EDEADLK;
+        else if (*pfDone)
+            rc = -EINTR;
+        else if (pTimeout && (rc == ERROR_TIMEOUT || rc == ERROR_SEM_TIMEOUT))
+            rc = -EAGAIN;
+        if (rc < 0)
+            break;
 
         /*
          * Resume waiting.
          */
-        if (cMillies != SEM_INDEFINITE_WAIT)
+        if (pTimeout)
         {
             ULONG ulEnd = 0;
@@ -3023 +3063 @@
         }
     } /* for ever */
+
+    FS_RESTORE();
+    LIBCLOG_RETURN_INT(rc);
 }