Changeset 1650

Timestamp:

Nov 21, 2004, 6:04:57 PM (21 years ago)

Author:

bird

Message:

bug fixing.

Location:

trunk/src/emx/src/lib

Files:

• process/sigwaitinfo.c (modified) (1 diff, 1 prop)
• sys/b_signalTimer.c (modified) (5 diffs, 1 prop)
• sys/signals.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/process/sigwaitinfo.c

@@ -41 +41 @@
  * Wait for a signal to become pending.
  *
- * @returns 0 on success.
+ * @returns Signal number on success.
  * @returns -1 on failure, errno set.
  * @param   pSigSet     Signals to wait for.

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

@@ -106 +106 @@
     SigInfo.si_signo = SIGALRM;
     SigInfo.si_code  = SI_TIMER;
-    for (;gfTerminate;)
+    for (;!gfTerminate;)
     {
         /*
@@ -339 +339 @@
         Value = *pValue;
         if (    Value.it_interval.tv_sec < 0
-            ||  Value.it_interval.tv_sec < 1000000
+            ||  Value.it_interval.tv_sec > 1000000
             ||  Value.it_interval.tv_usec < 0
             ||  Value.it_interval.tv_usec > 1000000
             ||  Value.it_value.tv_sec < 0
-            ||  Value.it_value.tv_sec < 1000000
+            ||  Value.it_value.tv_sec > 1000000
             ||  Value.it_value.tv_usec < 0
             ||  Value.it_value.tv_usec > 1000000)
@@ -439 +439 @@
             gfTerminate = 0;
             ghTimer = NULLHANDLE;
-            rc = DosCreateEventSem(NULL, (PHEV)&ghevTimer, 0, FALSE);
-            if (rc)
+            rc = DosCreateEventSem(NULL, (PHEV)&ghevTimer, DC_SEM_SHARED, FALSE);
+            if (!rc)
             {
                 rc = __libc_back_threadCreate(signalTimerWorkerThread, 0x10000, NULL, 1 /* Internal */);
@@ -447 +447 @@
                     gtidWorker = rc;
                     LIBCLOG_MSG("Create timer thread %d\n", gtidWorker);
+                    rc = 0;
                 }
                 else
@@ -461 +462 @@
         if (!rc && uNext) /* (Timer is already stopped.) */
         {
-            if (uInterval != uNext)
+            if (uInterval == uNext)
             {
                 /*

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

@@ -1291 +1291 @@
             if (!rc)
             {
-                __SIGSET_SET(&pThrd->SigSetPending, iSignalNo);
+                __SIGSET_SET(&pThrdSig->SigSetPending, iSignalNo);
                 if (pThrdSig != pThrd)
                     __libc_back_signalPokeThread(pThrdSig);