Changeset 2308

Timestamp:

Aug 27, 2005, 6:56:52 PM (20 years ago)

Author:

bird

Message:

Fixed two incorrect unlocks after deliver.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• src/lib/sys/b_signalMask.c (modified) (3 diffs, 1 prop)
• src/lib/sys/signals.c (modified) (10 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -2 +2 @@
 
 TODO: open replace on RAMFS fails with error 32!
+
+2005-08-27: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        o Fixed two cases where the signal semaphore was incorrectly unlocked
+          after signalDeliver().
 
 2005-08-24: knut st. osmundsen <bird-gccos2-spam@anduin.net>

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

@@ -97 +97 @@
      * Gain exclusive access to the signal stuff.
      */
+    int fRelease = 1;
     int rc = __libc_back_signalSemRequest();
     if (rc)
@@ -134 +135 @@
         __SIGSET_AND(&SigSetPending, &SigSetPending, &SigSetNotBlocked);
         if (!__SIGSET_ISEMPTY(&SigSetPending))
+        {
             __libc_back_signalReschedule(pThrd);
+            fRelease = 0;
+        }
     }
 
@@ -140 +144 @@
      * Release semaphore.
      */
-    __libc_back_signalSemRelease();
+    if (fRelease)
+        __libc_back_signalSemRelease();
 
     /*

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

@@ -724 +724 @@
  * Typically called after a block mask have been updated.
  *
+ * The caller must own the signal semaphore, this function will release the ownership!
+ *
  * @returns On success a flag mask out of the __LIBC_BSRR_* #defines is returned.
  * @returns On failure a negative error code (errno.h) is returned.
@@ -1841 +1843 @@
                 && !(gafSignalProperties[iSignalNo] & SPP_NORESET))
             {
+                LIBCLOG_MSG("Performing SA_RESETHAND on %d.\n", iSignalNo);
                 gaSignalActions[iSignalNo].__sigaction_u.__sa_handler = SIG_DFL;
                 gaSignalActions[iSignalNo].sa_flags &= ~SA_SIGINFO;
@@ -1859 +1862 @@
             __SIGSET_OR(&pThrd->SigSetBlocked, &pThrd->SigSetBlocked, &SigAction.sa_mask);
 
+            /*
+             * Setup ucontext.
+             */
             void *pvCtx = NULL;
             if (SigAction.sa_flags & SA_SIGINFO)
@@ -1873 +1879 @@
                 ||  !pThrd->cbSigStack)
             {
+                LIBCLOG_MSG("Calling %p(%d, %p:{.si_signo=%d, .si_errno=%d, .si_code=%#x, .si_timestamp=%#x, .si_flags=%#x .si_pid=%#x, .si_pgrp=%#x, .si_tid=%#x, .si_uid=%d, .si_status=%d, .si_addr=%p, .si_value=%p, .si_band=%ld, .si_fd=%d}, %p)\n",
+                            (void *)SigAction.__sigaction_u.__sa_sigaction, iSignalNo, (void *)&SigInfo, SigInfo.si_signo, SigInfo.si_errno,
+                            SigInfo.si_code, SigInfo.si_timestamp, SigInfo.si_flags, SigInfo.si_pid, SigInfo.si_pgrp, SigInfo.si_tid,
+                            SigInfo.si_uid, SigInfo.si_status, SigInfo.si_addr, SigInfo.si_value.sigval_ptr, SigInfo.si_band, SigInfo.si_fd, pvCtx);
                 __libc_back_signalSemRelease();
                 SigAction.__sigaction_u.__sa_sigaction(iSignalNo, &SigInfo, pvCtx);
@@ -1902 +1912 @@
                 pTib->tib_pstack      = pThrd->pvSigStack;
                 pTib->tib_pstacklimit = (char *)pThrd->pvSigStack + pThrd->cbSigStack;
+
+                LIBCLOG_MSG("Calling %p(%d, %p:{.si_signo=%d, .si_errno=%d, .si_code=%#x, .si_timestamp=%#x, .si_flags=%#x .si_pid=%#x, .si_pgrp=%#x, .si_tid=%#x, .si_uid=%d, .si_status=%d, .si_addr=%p, .si_value=%p, .si_band=%ld, .si_fd=%d}, %p) on stack %p-%p (old stack %p-%p)\n",
+                            (void *)SigAction.__sigaction_u.__sa_sigaction, iSignalNo, (void *)&SigInfo, SigInfo.si_signo, SigInfo.si_errno,
+                            SigInfo.si_code, SigInfo.si_timestamp, SigInfo.si_flags, SigInfo.si_pid, SigInfo.si_pgrp, SigInfo.si_tid,
+                            SigInfo.si_uid, SigInfo.si_status, SigInfo.si_addr, SigInfo.si_value.sigval_ptr, SigInfo.si_band, SigInfo.si_fd,
+                            pvCtx, pTib->tib_pstack, pTib->tib_pstacklimit, pvOldStack, pvOldStackLimit);
 
                 /* release, switch and call. */
@@ -1946 +1962 @@
             /*
              * Re-take the signal semaphore and restore the signal mask.
-             * We'll have to reschedule signals here unless the two masks are 100% equal
+             * We'll have to reschedule signals here unless the two masks are 100% equal.
              */
             if (__libc_back_signalSemRequest())
-                break;
+                LIBCLOG_ERROR_RETURN_INT(rcRet);
             pThrd->SigSetBlocked = SigSetOld;
             signalScheduleSPM(pThrd);
@@ -2308 +2324 @@
     signalDeliver(pThrd, 0, NULL);
 
-    __libc_back_signalSemRelease();
     if (!rc)
         LIBCLOG_RETURN_INT(rc);
@@ -2441 +2456 @@
 
     /*
-     * Deliver signals.
+     * Deliver signals and release the semaphore.
      */
     signalDeliver(pThrd, 0, NULL);
@@ -2499 +2514 @@
             {
                 /*
-                 * Clear the indicator and deliver signals.
+                 * Clear the indicator and deliver signals (releaseing the semaphore).
                  */
                 __atomic_xchg(&pThrd->fSigBeingPoked, 0);
@@ -2515 +2530 @@
     }
     else
-        LIBC_ASSERTM_FAILED("No thread structure! This is really impossible!\n");
+        LIBC_ASSERTM_FAILED("No thread structure! This is really quite impossible!\n");
 
     return -EINVAL;