Changeset 2195 for trunk

Timestamp:

Jul 3, 2005, 10:56:24 AM (20 years ago)

Author:

bird

Message:

Fixed some waitid() and waitpid() problems related to stopping and resuming children.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• include/sys/wait.h (modified) (1 diff, 1 prop)
• src/lib/process/wait4.c (modified) (1 diff, 1 prop)
• src/lib/sys/signals.c (modified) (3 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -22 +22 @@
         o Updated features.h and sys/gnu/cdefs.h with more recent versions from cvs.
         o Ported from GLIBC 2.3.x CVS.
+        o Fixed some waitid() and waitpid() problems related to stopping and resuming children.
     - libcrypt:
         o Created stub library.

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

@@ -56 +56 @@
 #define WIFSTOPPED(x)   (_WSTATUS(x) == _WSTOPPED)
 #define WSTOPSIG(x)     (_W_INT(x) >> 8)
-#define WIFSIGNALED(x)  (_WSTATUS(x) != _WSTOPPED && _WSTATUS(x) != 0)
+#define WIFSIGNALED(x)  (_WSTATUS(x) != 0 && !WIFSTOPPED(x) && !WIFCONTINUED(x)) /* bird: made GLIBC tests happy. */
 #define WTERMSIG(x)     (_WSTATUS(x))
 #define WIFEXITED(x)    (_WSTATUS(x) == 0)

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

@@ -119 +119 @@
             case CLD_TRAPPED:   iStatus = W_STOPCODE(SigInfo.si_status); break;
             case CLD_STOPPED:   iStatus = W_STOPCODE(SigInfo.si_status); break;
-            case CLD_CONTINUED: iStatus = W_STOPCODE(SigInfo.si_status); break;
+            case CLD_CONTINUED: iStatus = W_EXITCODE(0, SigInfo.si_status); break;
 
         }

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

@@ -2275 +2275 @@
     SigInfo.si_pid      = _sys_pid;
     SigInfo.si_code     = CLD_STOPPED;
+    SigInfo.si_status   = iSignalNo;
     SigInfo.si_flags    = __LIBC_SI_INTERNAL;
     __libc_back_signalSendPidOther(_sys_ppid, SIGCHLD, &SigInfo);
@@ -2291 +2292 @@
 /**
  * Resume the process (job control emulation).
- *
- * @param   iSignalNo   Signal causing the termination.
  */
 static int signalJobResume(void)
@@ -2305 +2304 @@
     SigInfo.si_pid      = _sys_pid;
     SigInfo.si_code     = CLD_CONTINUED;
+    SigInfo.si_status   = SIGCONT;
     SigInfo.si_flags    = __LIBC_SI_INTERNAL;
     __libc_back_signalSendPidOther(_sys_ppid, SIGCHLD, &SigInfo);