Changeset 1619 for trunk/src

Timestamp:

Nov 7, 2004, 3:53:53 PM (21 years ago)

Author:

bird

Message:

Debugging signals.

Location:

trunk/src/emx/src/lib/sys

Files:

• b_threadInit.c (modified) (1 diff, 1 prop)
• sharedpm.c (modified) (1 diff, 1 prop)
• signals.c (modified) (3 diffs, 1 prop)

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

@@ -51 +51 @@
      * Copy signal stuff.
      */
-    pThrd->SigSetBlocked    = pParentThrd->SigSetBlocked;
-    /** @todo Inheriting fSigSetBlockedOld doesn't make sense! */
-    if (pParentThrd->fSigSetBlockedOld)
+    if (pParentThrd)
     {
-        pThrd->SigSetBlockedOld     = pParentThrd->SigSetBlockedOld;
-        pThrd->fSigSetBlockedOld    = pParentThrd->fSigSetBlockedOld;
+        pThrd->SigSetBlocked    = pParentThrd->SigSetBlocked;
+        if (pParentThrd->fSigSetBlockedOld)
+        {
+            pThrd->SigSetBlockedOld     = pParentThrd->SigSetBlockedOld;
+            pThrd->fSigSetBlockedOld    = pParentThrd->fSigSetBlockedOld;
+        }
     }
 

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

@@ -260 +260 @@
     __LIBC_PSPMINHERIT      pRet = NULL;
     __LIBC_SPMXCPTREGREC    RegRec;
+    errno = 0;                          /* init thread outside the sem. */
     if (!spmRequestMutexErrno(&RegRec))
     {

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

@@ -1628 +1628 @@
          */
         siginfo_t SigInfo;
-        if (iSignalNo && __SIGSET_ISSET(&pThrd->SigSetPending, iSignalNo))
-            iSignalNo = __libc_back_signalAccept(pThrd, iSignalNo, &SigDeliver, &SigInfo);
-        LIBC_ASSERTM(__SIGSET_SIG_VALID(iSignalNo), "iSignalNo=%d\n", iSignalNo);
+        iSignalNo = __libc_back_signalAccept(pThrd, iSignalNo, &SigDeliver, &SigInfo);
+        if (!__SIGSET_SIG_VALID(iSignalNo))
+        {
+            LIBC_ASSERTM_FAILED("iSignalNo=%d\n", iSignalNo);
+            break;
+        }
         struct sigaction SigAction = gaSignalActions[iSignalNo];
 
@@ -1742 +1745 @@
             if (gafSignalProperties[iSignalNo] & SPP_NOBLOCK)
                 __SIGSET_CLEAR(&SigAction.sa_mask, iSignalNo);
-            sigset_t SigSetOld = !pThrd->fSigSetBlockedOld ? pThrd->SigSetBlocked : pThrd->SigSetBlockedOld;
+            sigset_t SigSetOld = pThrd->SigSetBlocked;
+            if (pThrd->fSigSetBlockedOld)
+            {
+                SigSetOld = pThrd->SigSetBlockedOld;
+                pThrd->fSigSetBlockedOld = 0;
+            }
             __SIGSET_OR(&pThrd->SigSetBlocked, &pThrd->SigSetBlocked, &SigAction.sa_mask);
 
@@ -2622 +2630 @@
                             {
                                 for (iSignalNo = 1; iSignalNo < SIGRTMIN; iSignalNo++)
-                                    if (__SIGSET_ISEMPTY(pSigSet))
+                                    if (__SIGSET_ISSET(pSigSet, iSignalNo))
                                         break;
                             }