Changeset 1621

Timestamp:

Nov 7, 2004, 5:07:49 PM (21 years ago)

Author:

bird

Message:

Debugging signals.

Location:

trunk/src/emx/src/lib/sys

Files:

• b_signalMask.c (modified) (2 diffs, 1 prop)
• signals.c (modified) (1 diff, 1 prop)
• signals.h (modified) (1 diff, 1 prop)

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

@@ -74 +74 @@
     sigset_t        SigSetNew;
     sigset_t        SigSetOld;
-    sigset_t        SigSet;
 
     /*
@@ -130 +129 @@
 
         /*
-         * Check if we've unblocked anything and thus made it possible for
-         * pending signals to be delivered.
+         * Check if there are any pending signals with the new mask.
          */
-        SigSetNew = pThrd->SigSetBlocked;
-        __SIGSET_AND(&SigSet, &SigSetOld, &SigSetNew);
-        if (!__SIGSET_ISEMPTY(&SigSetNew))
-        {
-            sigset_t    SigSetPending;
-            __SIGSET_OR(&SigSetPending, &pThrd->SigSetPending, &__libc_gSignalPending);
-            __SIGSET_AND(&SigSetPending, &SigSetPending, &SigSetNew);
-            if (!__SIGSET_ISEMPTY(&SigSetPending))
-                __libc_back_signalPokeThread(pThrd);
-        }
+        sigset_t    SigSetNotBlocked = pThrd->SigSetBlocked;
+        __SIGSET_NOT(&SigSetNotBlocked);
+        sigset_t    SigSetPending;
+        __SIGSET_OR(&SigSetPending, &pThrd->SigSetPending, &__libc_gSignalPending);
+        __SIGSET_AND(&SigSetPending, &SigSetPending, &SigSetNotBlocked);
+        if (!__SIGSET_ISEMPTY(&SigSetPending))
+            __libc_back_signalReschedule(pThrd);
     }
 

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

@@ -830 +830 @@
 
 /**
+ * Reschedule signals.
+ * Typically called after a block mask have been updated.
+ *
+ * @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.
+ * @param   pThrd       Current thread.
+ */
+int __libc_back_signalReschedule(__LIBC_PTHREAD pThrd)
+{
+    LIBC_ASSERT(__libc_back_signalSemIsOwner());
+    signalScheduleSPM(pThrd);
+    signalScheduleProcess(pThrd);
+    return signalDeliver(pThrd, 0, NULL);
+}
+
+
+/**
  * Raises a signal in the current process.
  *

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

@@ -48 +48 @@
 void        __libc_back_signalPokeThread(__LIBC_PTHREAD pThrd);
 void        __libc_back_signalPokeProcess(void);
+int         __libc_back_signalReschedule(__LIBC_PTHREAD pThrd);
 int         __libc_back_signalSuspend(void);
 int         __libc_back_signalAccept(__LIBC_PTHREAD pThrd, int iSignalNo, sigset_t *pSigSet, siginfo_t *pSigInfo);