Changeset 2289 for trunk/src/emx/include

Timestamp:

Aug 21, 2005, 12:08:50 AM (20 years ago)

Author:

bird

Message:

o Protect the fork operations by the means of must complete so

signals won't interrupt us till we're finished. This might leave
unkillable processes around if fork goes highwire.

o Better exception logging during fork.
o Use MMX memcpy in fork (if supported).
o The C function libc_Back_processFork() replaces the pure assembly fork().

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• InnoTekLIBC/fork.h (modified) (4 diffs, 1 prop)
• emx/asm386.h (modified) (1 diff, 1 prop)
• sys/errno.h (modified) (1 diff, 1 prop)
• sys/process.h (modified) (5 diffs, 1 prop)

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

@@ -767 +767 @@
 
 /**
+ * Fork a child process pretty much identical to the calling process.
+ * See SuS for full description of what fork() does and doesn't.
+ *
+ * @returns 0 in the child process.
+ * @returns process identifier of the new child in the parent process. (positive, non-zero)
+ * @returns Negative error code (errno.h) on failure.
+ */
+pid_t __libc_Back_processFork(void);
+
+/**
  * Waits/polls for on one or more processes to change it's running status.
  *

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

@@ -34 +34 @@
 
 /** Current fork version. */
-#define __LIBC_FORK_VERSION             0x00010000
+#define __LIBC_FORK_VERSION             0x00020000
+
+/** Current fork module version. */
+#define __LIBC_FORK_MODULE_VERSION      0x00010000
 
 /** Timeout on waiting semaphore in fork operations */
@@ -272 +275 @@
 typedef struct __libc_ForkHandle
 {
-    /** Fork version. */
+    /** Fork version (__LIBC_FORK_VERSION). */
     unsigned                uVersion;
     /** Parent process, i.e. the one which have called fork(). */
@@ -422 +425 @@
      * the front. */
     __LIBC_PFORKCOMPLETIONCALLBACK  papfnCompletionCallbacks;
+    /** Index of the next completion callback for the parent. */
+    volatile unsigned       iCompletionCallbackParent;
+    /** Index of the next completion callback for the child. */
+    volatile unsigned       iCompletionCallbackChild;
 
     /** Pointer to the start of the fork buffer. */
@@ -538 +545 @@
 typedef struct __libc_ForkModule
 {
-    /** Fork version. */
+    /** Fork module version (__LIBC_FORK_MODULE_VERSION). */
     unsigned                    uVersion;
     /** Fork callback function.

trunk/src/emx/include/emx/asm386.h

@@ -40 +40 @@
 
 #define ALIGN   .align  4, 0x90
+#define ALIGNP2(a) .align  a, 0x90
 
 #define SET_ERRNO_CONST(x) \

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

@@ -194 +194 @@
 #endif /* _POSIX_SOURCE */
 
+#ifdef __USE_EMX
+#define ENEWVER         90              /* mixing with a new version of a struct */
+#define EBADVER         91              /* bad version number */
+#endif
+
 #ifdef _KERNEL
 /* pseudo-errors returned inside kernel to modify return to process */

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

@@ -7 +7 @@
 #define _SYS_PROCESS_H
 
-#if defined (__cplusplus)
-extern "C" {
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+__BEGIN_DECLS
+
+#if !defined(_PID_T_DECLARED) && !defined(_PID_T)
+typedef __pid_t pid_t;
+#define _PID_T_DECLARED
+#define _PID_T
 #endif
 
@@ -51 +58 @@
 void exit (int) __attribute__ ((__noreturn__));
 void _exit (int) __attribute__ ((__noreturn__));
-int fork (void);
-int getpid (void);
-int getppid (void);
+pid_t fork (void);
+pid_t getpid (void);
+pid_t getppid (void);
 int spawnl (int, __const__ char *, __const__ char *, ...);
 int spawnle (int, __const__ char *, __const__ char *, ...);
@@ -63 +70 @@
 int spawnvpe (int, __const__ char *, char * __const__ *, char * __const__ *);
 int system (__const__ char *);
-int wait (int *);
-int waitpid (int, int *, int);
+pid_t wait (int *);
+pid_t waitpid (pid_t, int *, int);
 
 int _execl (__const__ char *, __const__ char *, ...);
@@ -75 +82 @@
 int _execvpe (__const__ char *, char * __const__ *, char * __const__ *);
 int _fork (void);
-int _getpid (void);
-int _getppid (void);
+pid_t _getpid (void);
+pid_t _getppid (void);
 int _spawnl (int, __const__ char *, __const__ char *, ...);
 int _spawnle (int, __const__ char *, __const__ char *, ...);
@@ -85 +92 @@
 int _spawnvp (int, __const__ char *, char * __const__ *);
 int _spawnvpe (int, __const__ char *, char * __const__ *, char * __const__ *);
-int _wait (int *);
-int _waitpid (int, int *, int);
+pid_t _wait (int *);
+pid_t _waitpid (pid_t, int *, int);
 
-
-#if defined (__cplusplus)
-}
-#endif
+__END_DECLS
 
 #endif /* not _SYS_PROCESS_H */