Changeset 1642

Timestamp:

Nov 16, 2004, 11:18:46 AM (21 years ago)

Author:

bird

Message:

signal timers. (very untested!)

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (3 diffs, 1 prop)
• src/lib/process/getitimer.c (added)
• src/lib/process/setitimer.c (added)
• src/lib/sys/b_signal.h (modified) (1 diff, 1 prop)
• src/lib/sys/b_signalTimer.c (added)
• src/lib/sys/sharedpm.c (modified) (2 diffs, 1 prop)
• src/lib/sys/signals.c (modified) (3 diffs, 1 prop)

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

@@ -32 +32 @@
 #include <sys/_timeval.h>
 #include <sys/resource.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <signal.h>
@@ -498 +499 @@
  *                              deliver the signal.
  */
-int __libc_Back_signalRaise(int iSignalNo, siginfo_t *pSigInfo, void *pvXcptOrQueued, unsigned fFlags);
+int __libc_Back_signalRaise(int iSignalNo, const siginfo_t *pSigInfo, void *pvXcptOrQueued, unsigned fFlags);
 
 /**
@@ -637 +638 @@
  */
 int __libc_Back_signalPending(sigset_t *pSigSet);
+
+/**
+ * Queries and/or starts/stops a timer.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   iWhich      Which timer to get, any of the ITIMER_* #defines.
+ *                      OS/2 only supports ITIMER_REAL.
+ * @param   pValue      Where to store the value.
+ *                      Optional. If NULL pOldValue must not be NULL.
+ * @param   pOldValue   Where to store the old value.
+ *                      Optional. If NULL pValue must not be NULL.
+ */
+int __libc_Back_signalTimer(int iWhich, const struct itimerval *pValue, struct itimerval *pOldValue);
+
+
 
 /** @} */

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

@@ -60 +60 @@
 void        __libc_back_signalOS2V1Handler32bit(unsigned uSignal, unsigned uArg);
 int         __libc_back_signalInheritPack(__LIBC_PSPMINHSIG *ppSig, size_t *pcbSig);
+void        __libc_back_signalTimerNotifyTerm(void);
 
 

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

@@ -74 +74 @@
 #include <InnoTekLIBC/logstrict.h>
 #include "b_process.h"
+#include "b_signal.h"
 #include "syscalls.h"
 
@@ -2052 +2053 @@
 {
     /*
-     * Notify the wait facilities.
+     * Notify the wait and timer facilities.
      */
     __libc_back_processWaitNotifyTerm();
+    __libc_back_signalTimerNotifyTerm();
 
     /*

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

@@ -934 +934 @@
  *                              deliver the signal.
  */
-int __libc_Back_signalRaise(int iSignalNo, siginfo_t *pSigInfo, void *pvXcptOrQueued, unsigned fFlags)
+int __libc_Back_signalRaise(int iSignalNo, const siginfo_t *pSigInfo, void *pvXcptOrQueued, unsigned fFlags)
 {
     LIBCLOG_ENTER("iSignalNo=%d pSigInfo=%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} pvXcptOrQueued=%p fFlags=%#x\n",
@@ -985 +985 @@
 
     /*
-     * Fill in the rest of the SigInfo packet if we've got one.
-     */
+     * Copy the siginfo structure and fill in the rest of
+     * the SigInfo packet (if we've got one).
+     */
+    siginfo_t SigInfo;
     if (pSigInfo)
     {
-        if (!pSigInfo->si_timestamp)
-            pSigInfo->si_timestamp = signalTimestamp();
+        SigInfo = *pSigInfo;
+        if (!SigInfo.si_timestamp)
+            SigInfo.si_timestamp = signalTimestamp();
         if (fFlags & __LIBC_BSRF_QUEUED)
-            pSigInfo->si_flags |= __LIBC_SI_QUEUED;
-        if (!pSigInfo->si_pid)
-            pSigInfo->si_pid = _sys_pid;
-        if (!pSigInfo->si_tid && pThrd)
-            pSigInfo->si_tid = pThrd->tid;
+            SigInfo.si_flags |= __LIBC_SI_QUEUED;
+        if (!SigInfo.si_pid)
+            SigInfo.si_pid = _sys_pid;
+        if (!SigInfo.si_tid && pThrd)
+            SigInfo.si_tid = pThrd->tid;
     }
 
@@ -1015 +1018 @@
      * Schedule the signal.
      */
-    int rc = signalSchedule(pThrd, iSignalNo, pSigInfo, fFlags, fFlags & __LIBC_BSRF_QUEUED ? pvXcptOrQueued : NULL);
+    int rc = signalSchedule(pThrd, iSignalNo, pSigInfo ? &SigInfo : NULL, fFlags, fFlags & __LIBC_BSRF_QUEUED ? pvXcptOrQueued : NULL);
     if (rc >= 0)
     {