Changeset 1618 for trunk/src/emx/include/InnoTekLIBC

Timestamp:

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

Author:

bird

Message:

More signal debugging and cleanup.

Location:

trunk/src/emx/include/InnoTekLIBC

Files:

• backend.h (modified) (4 diffs, 1 prop)
• libc.h (modified) (2 diffs, 1 prop)
• thread.h (modified) (6 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -560 +560 @@
  *
  * @returns 0 on success.
- * @returns -Negative errno on failure.
+ * @returns Negative error code (errno) on failure.
  * @param   iSignalNo   Signal number.
  * @param   pSigAct     Pointer to new signal action.
@@ -570 +570 @@
 
 /**
+ * Change interrupt/restart system call properties for a signal.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno) on failure.
+ * @param   iSignalNo   Signal number to change interrupt/restart
+ *                      properties for.
+ * @param   fFlag       If set Then clear the SA_RESTART from the handler action.
+ *                      If clear Then set the SA_RESTART from the handler action.
+ * @remark  The SA_RESTART flag is inherited when using signal().
+ */
+int __libc_Back_signalInterrupt(int iSignalNo, int fFlag);
+
+/**
  * Changes and/or queries the alternative signal stack settings of a thread.
  *
@@ -584 +597 @@
  *
  * @returns 0 on success.
- * @returns -1 and errno set to EINVAL on failure.
+ * @returns Negative error code (errno) on failure.
  * @param   pThrd       Thread to apply this to.
  * @param   iHow        Describes the action taken if pSigSetNew not NULL. Recognized
@@ -604 +617 @@
 int __libc_Back_signalMask(__LIBC_PTHREAD pThrd, int iHow, const sigset_t * __restrict pSigSetNew, sigset_t * __restrict pSigSetOld);
 
+/**
+ * Wait for one or more signals and remove and return the first of them
+ * to occur.
+ *
+ * Will return immediately if one of the signals is already pending. If more than
+ * one signal is pending the signal with highest priority will be returned.
+ *
+ * @returns Signal number on success.
+ * @returns Negative error code (errno) on failure.
+ * @param   pSigSet     Signals to wait for.
+ * @param   pSigInfo    Where to store the signal info for the signal
+ *                      that we accepted.
+ * @param   pTimeout    Timeout specification. If NULL wait for ever.
+ */
+int __libc_Back_signalWait(const sigset_t *pSigSet, siginfo_t *pSigInfo, const struct timespec *pTimeout);
+
+/**
+ * Suspends the current thread till a signal have been handled.
+ * The signal semaphore is owned.
+ *
+ * @returns Negative error code (errno) on failure. (allways fails)
+ * @param   pSigSet     Temporary signal mask for the thread.
+ */
+int __libc_Back_signalSuspend(const sigset_t *pSigSet);
+
+/**
+ * Gets the set of signals which are blocked by the current thread and are
+ * pending on the process or the calling thread.
+ *
+ * @returns 0 indicating success.
+ * @returns Negative error code (errno) on failure.
+ * @param   pSigSet     Pointer to signal set where the result is to be stored.
+ */
+int __libc_Back_signalPending(sigset_t *pSigSet);
+
 /** @} */
 

trunk/src/emx/include/InnoTekLIBC/libc.h

@@ -29 +29 @@
 
 #include <sys/cdefs.h>
+#include <sys/signal.h>
 
 __BEGIN_DECLS
@@ -41 +42 @@
 extern int __libc_gfNoUnix;
 
+/** Signal set of the signals which will interrupt system call execution.
+ * By default all signals will interrupt syscall execution, since OS/2 can't really
+ * restart system calls easily.
+ * Update is protected by the signal semaphore, however read access isn't.
+ */
+extern sigset_t __libc_gSignalRestartMask;
+
 __END_DECLS
 

trunk/src/emx/include/InnoTekLIBC/thread.h

@@ -50 +50 @@
 *******************************************************************************/
 struct _uheap;
+
+/**
+ * sigwait,sigwaitinfo, sigtimedwait data.
+ */
+typedef volatile struct __libc_thread_sigwait
+{
+    /** Done waitin' indicator.*/
+    volatile int    fDone;
+    /** The signals we're waiting for. */
+    sigset_t        SigSetWait;
+    /** The where to return signal info. */
+    siginfo_t       SigInfo;
+} __LIBC_THREAD_SIGWAIT, *__LIBC_PTHREAD_SIGWAIT;
+
+
+/**
+ * sigsuspend data.
+ */
+typedef volatile struct __libc_thread_sigsuspend
+{
+    /** Done waitin' indicator.*/
+    volatile int    fDone;
+} __LIBC_THREAD_SIGSUSPEND, *__LIBC_PTHREAD_SIGSUSPEND;
+
 
 /**
@@ -150 +174 @@
 
     /** Thread status, chiefly used for the u member of the thread structure. */
-    enum enmLIBCThreadStatus
+    volatile enum enmLIBCThreadStatus
     {
         /** The thread status must be queried from the OS. */
@@ -158 +182 @@
         /** The thread is in a sigwait(), sigwaitinfo(), or sigtimedwait() call. */
         enmLIBCThreadStatus_sigwait,
+        /** The thread is in a sigsuspend() call. */
+        enmLIBCThreadStatus_sigsuspend,
     }               enmStatus;
 
@@ -166 +192 @@
     {
         /** enmLIBCThreadStatus_startup:    Begin Thread Arguments. */
-        struct __libc_thread_startup
+        struct __libc_thread_u_startup
         {
             /** Thread argument. */
@@ -175 +201 @@
 
         /** enmLIBCThreadStatus_sigwait:    Thread blocked in sigwait(), sigwaitinfo() or sigtimedwait(). */
-        struct __libc_thread_sigwait
-        {
-            /** The signals we're waiting for. */
-            sigset_t    SigSetWait;
-            /** The where to return signal info. */
-            siginfo_t  *pSigInfo;
-        } SigWait;
+        __LIBC_PTHREAD_SIGWAIT      pSigWait;
+        /** enmLIBCThreadStatus_sigsuspend: Thread blocked in sigsuspend(). */
+        __LIBC_PTHREAD_SIGSUSPEND   pSigSuspend;
     } u;
 
@@ -211 +233 @@
 } __LIBC_THREAD;
 
+
 #ifndef __LIBC_THREAD_DECLARED
 #define __LIBC_THREAD_DECLARED