Changeset 1630 for trunk/src/emx/include

Timestamp:

Nov 14, 2004, 12:28:29 PM (21 years ago)

Author:

bird

Message:

More signals and waiting stuff.

Location:

trunk/src/emx/include

Files:

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

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

@@ -99 +99 @@
     /** Structure size. */
     unsigned                        cb;
-    /** Process ID. */
+    /** Process Id. */
     pid_t                           pid;
+    /** Process Group Id. */
+    pid_t                           pgrp;
     /** Exit code. */
     int                             iExitCode;
@@ -542 +544 @@
     unsigned                            cSigMaxActive;
     /** 112 - Notification event semaphore.
-     * This semaphore is signaled when an event occurs.
+     * This semaphore is signaled when an event occurs. An event is either a signal
+     * or a child notification.
+     * At the moment this isn't used by anyone, but it's being signaled just in case.
      */
     unsigned long                       hevNotify;

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

@@ -160 +160 @@
 /** Don't mask the signal which is being delivered. */
 #define SA_NODEFER          0x00000010
-/** Don't keep zombies around for wait*(). Not implmented on OS/2. */
+/** Don't keep zombies around for wait*(). */
 #define SA_NOCLDWAIT        0x00000020
 /** Signal the handler with the full set of arguments. */
@@ -407 +407 @@
     /** Signal code. (See SI_* and FPE_* macros.) */
     int             si_code;
-    /** Timestamp when the signal was generated - LIBC extension. */
+    /** LIBC Extension: Timestamp when the signal was generated. */
     unsigned        si_timestamp;
-    /** Flags - LIBC extension. __LIBC_SI_* */
+    /** LIBC Extension: Flags. __LIBC_SI_* */
     unsigned        si_flags;
     /** Process sending the signal. */
     __pid_t         si_pid;
-    /** Thread sending the signal - LIBC extension. */
+    /** LIBC Extension: the program group of the sender. */
+    unsigned        si_pgrp;
+    /** LIBC Extension: Thread sending the signal. */
     unsigned        si_tid;
-    /** User sending the signal (ruid). (Usually 0 for OS/2) */
+    /** User sending the signal (real uid). */
     __uid_t         si_uid;
     /** Exit value. (SIGCHLD) */
@@ -428 +430 @@
     int             si_fd;
     /** Reserve a little bit for future usage. */
-    unsigned        auReserved[3];
+    unsigned        auReserved[6];
 } siginfo_t;
 
@@ -435 +437 @@
  * @{ */
 /** If set the signal was queue. */
-#define __LIBC_SI_QUEUED        0x00000001
+#define __LIBC_SI_QUEUED            0x00000001
 /** Internal signal generated by LIBC. */
-#define __LIBC_SI_INTERNAL      0x00000002
+#define __LIBC_SI_INTERNAL          0x00000002
+/** Don't notify the child wait facilities. (Signal origins there.) */
+#define __LIBC_SI_NO_NOTIFY_CHILD   0x00000004
 /** @} */
 #endif

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

@@ -103 +103 @@
 pid_t   wait(int *);
 pid_t   waitpid(pid_t, int *, int);
-#if 0 /* bird: old __BSD_VISIBLE */
 struct rusage;
 pid_t   wait3(int *, int, struct rusage *);
 pid_t   wait4(pid_t, int *, int, struct rusage *);
-#endif
 
 
@@ -118 +116 @@
 /** Wait for processes that have exited. */
 #define WEXITED         8
-/** Wait for processes that have stopped. */
-#define WSTOPPED       16
-/** Keep the wait state around for later wait calls, i.e. just peek at the stuff. */
-#define WNOWAIT        32
+/** Wait for processes that have stopped. Same as WUNTRACED atm. */
+#define WSTOPPED       WUNTRACED
+/** Keep the wait state around for later wait calls, i.e. just peek at the stuff.
+ * Very logical name, not chance at all that anyone will confuse it for WNOHANG. */
+#define WNOWAIT        16
 
 /* The following values are used by the `waitid' function.  */