Changeset 1615 for trunk/src/emx/include

Timestamp:

Nov 6, 2004, 9:35:32 AM (21 years ago)

Author:

bird

Message:

signals are finally getting somewhere...

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/sharedpm.h (modified) (4 diffs, 1 prop)
• InnoTekLIBC/signals.h (modified) (3 diffs, 1 prop)
• sys/signal.h (modified) (3 diffs, 1 prop)

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

@@ -109 +109 @@
 
 
+/** The maximum number of signals a process can have pending on other processes concurrently. */
+#define __LIBC_SPM_SIGNALS_MAX_SENT 48
+
 /**
  * Signal (queued).
@@ -118 +121 @@
     /** Pointer to the next signal. */
     struct __libc_SPMSignal    *pNext;
+    /** Sender process.
+     * This is used to decrement the cSigsSent count of the sender. */
+    pid_t                       pidSender;
+
     /** Signal info. */
     siginfo_t                   Info;
@@ -277 +284 @@
      * For signals which aren't queable only one signal can be queued.
      */
-    __LIBC_PSPMSIGNAL           pSigHead;
-    /** Number of queued signals.
-     * After it passes 48 signals, only SIGCHLD will be queued.
-     * This means siqueue() won't work 100% according to spec. */
-    unsigned                    cSigsQueued;
+    volatile __LIBC_PSPMSIGNAL  pSigHead;
+    /** Number of signals send.
+     * After __LIBC_SPM_SIGNALS_MAX_SENT signals only SIGCHLD will be allowed sent.
+     */
+    volatile unsigned           cSigsSent;
 
     /** Reserved pool pointer field with default value 0. */
@@ -653 +660 @@
 
 /**
- * De-queues one or more pending signals.
+ * Get the signal set of pending signals.
+ *
+ * @returns Number of pending signals on success.
+ * @returns 0 if no signals are pending.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pSigSet     Where to create the set of pending signals.
+ */
+int     __libc_spmSigPending(sigset_t *pSigSet);
+
+/**
+ * De-queues one or more pending signals of a specific type.
+ *
  * @returns Number of de-queued signals on success.
  * @returns Negative error code (errno.h) on failure.
+ * @param   iSignalNo   Signal type to dequeue.
  * @param   paSignals   Where to store the signals.
  * @param   cSignals    Size of the signal array.
  * @param   cbSignal    Size of one signal entry.
  */
-int     __libc_spmSigDequeue(siginfo_t *paSignals, unsigned cSignals, size_t cbSignal);
+int     __libc_spmSigDequeue(int iSignalNo, siginfo_t *paSignals, unsigned cSignals, size_t cbSignal);
 
 

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

@@ -32 +32 @@
 *******************************************************************************/
 /** @defgroup __libc_back_signalRaise_return    __libc_back_signalRaise() returns.
+ * These are only valid for positive return values.
  * @{ */
 /** Try restart any interrupted system call. */
@@ -44 +45 @@
 /** If set the passed in SIGQUEUED structure was used. */
 #define __LIBC_BSRR_USED_QUEUED 0x40
-/** Failure. */
-#define __LIBC_BSRR_ERROR       0xffffff22
 /** @} */
 
@@ -94 +93 @@
 int         __libc_back_signalSuspend(void);
 int         __libc_back_signalWait(const struct timespec *pTimeout);
-int         __libc_back_signalVerifyPid(pid_t pid);
-int         __libc_back_signalVerifyPGrp(pid_t pgid);
-int         __libc_back_signalSendPid(pid_t pid, int iSignalNo);
 int         __libc_back_signalSendPidOther(pid_t pid, int iSignalNo);
-int         __libc_back_signalSendPGrp(pid_t pgrp, int iSignalNo);
 int         __libc_back_signalAction(int iSignalNo, const struct sigaction *pSigAct, struct sigaction *pSigActOld);
-unsigned    __libc_back_signalRaise(int iSignalNo, siginfo_t *pSigInfo, void *pvXcptOrQueued, unsigned fFlags);
 int         __libc_back_signalRaisePoked(void *pvXcptParams, int tidPoker);
 void        __libc_back_signalOS2V1Handler16bit(unsigned short uSignal, unsigned short uArg);
 void        __libc_back_signalOS2V1Handler32bit(unsigned uSignal, unsigned uArg);
 
+
+/**
+ * Raises a signal in the current process.
+ *
+ * @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   iSignalNo           Signal to raise.
+ * @param   pSigInfo            Pointer to signal info for this signal.
+ *                              NULL is allowed.
+ * @param   pvXcptOrQueued      Exception handler parameter list.
+ *                              Or if __LIBC_BSRF_QUEUED is set, a pointer to locally malloced
+ *                              SIGQUEUED node.
+ * @param   fFlags              Flags of the #defines __LIBC_BSRF_* describing how to
+ *                              deliver the signal.
+ *
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int __libc_Back_signalRaise(int iSignalNo, siginfo_t *pSigInfo, void *pvXcptOrQueued, unsigned fFlags);
+
+/**
+ * Send a signal to a process.
+ *
+ * @returns 0 on if signal sent.
+ * @returns -errno on failure.
+ *
+ * @param   pid         Process Id of the process which the signal is to be sent to.
+ * @param   iSignalNo   The signal to send.
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int     __libc_Back_signalSendPid(pid_t pid, int iSignalNo);
+
+/**
+ * Verify the existance of another process and that the current process
+ * is allowed to signal it.
+ *
+ * @return 0 on success.
+ * @return -ESRCH if pid doesn't exist.
+ * @return -EPERM if we aren't allowed to signal the pid.
+ * @param   pid     Process Id for the process which we wanna signal.
+ * @todo    Do EPERM check, no ideas here yet.
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int     __libc_Back_signalVerifyPid(pid_t pid);
+
+/**
+ * Not implemented.
+ *
+ * @returns -ENOSYS.
+ * @param   pgrp        Process group (positive).
+ *                      0 means the process group of this process.
+ *                      1 means all process in the system.
+ * @param   iSignalNo   Signal to send to all the processes in the group.
+ */
+int     __libc_Back_signalSendPGrp(pid_t pgrp, int iSignalNo);
+
+/**
+ * Verify the existance of a process group and that the current process
+ * is allowed to signal it.
+ *
+ * @return 0 on success.
+ * @return -ESRCH if pgid doesn't exist.
+ * @return -EPERM if we aren't allowed to signal the pgid.
+ * @param   pgid    Process group id which the current process intend to signal.
+ * @todo    Do EPERM check, no ideas here yet.
+ * @remark  This Backend Signal API does NOT require the caller to own the signal semaphore.
+ */
+int     __libc_Back_signalVerifyPGrp(pid_t pgid);
+
+
 __END_DECLS
 

trunk/src/emx/include/sys/signal.h

@@ -147 +147 @@
 /** Take signal on a registerd stack_t. */
 #define SA_ONSTACK          0x00000001
-/** Restart system call on signal return. Not implemented on OS/2. */
+/** Restart system call on signal return. */
 #define SA_RESTART          0x00000002
 /** Reset signal handler to SIG_DFL when deliving the signal. */
@@ -395 +395 @@
     /** Timestamp when the signal was generated - LIBC extension. */
     unsigned        si_timestamp;
+    /** Flags - LIBC extension. __LIBC_SI_* */
+    unsigned        si_flags;
     /** Process sending the signal. */
     __pid_t         si_pid;
@@ -412 +414 @@
     int             si_fd;
     /** Reserve a little bit for future usage. */
-    unsigned        auReserved[4];
+    unsigned        auReserved[3];
 } siginfo_t;
+
+#ifdef __BSD_VISIBLE
+/** Signals LIBC flags.
+ * @{ */
+/** If set the signal was queue. */
+#define __LIBC_SI_QUEUED        0x00000001
+/** @} */
+#endif
 #endif