Changeset 1461 for trunk/src/emx/include

Timestamp:

Sep 6, 2004, 6:22:46 AM (21 years ago)

Author:

bird

Message:

Fixing, extending, optimizing.

Location:

trunk/src/emx/include/InnoTekLIBC

Files:

• fork.h (modified) (3 diffs, 1 prop)
• sharedpm.h (modified) (3 diffs, 1 prop)

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

@@ -494 +494 @@
     /* Priority of this callback */
     unsigned                uPriority;
-    /** Pointer to the next record in a sorted callback list.
-     * @remark This is initialized to point to self in order to shut up the compiler.
-     * (Encountered some limitations of the GNU inline assmebler which prevents me from
-     * referencing the symbol.)
-     */
-    struct __libc_ForkCallback *pNext;
+    /** Pointer to self.
+     * This is a hack to allow the callbacks to be static without gcc
+     * optimizing them away as unused.
+     */
+    const struct __libc_ForkCallback *pSelf;
 } __LIBC_FORKCALLBACK, *__LIBC_PFORKCALLBACK;
 
@@ -513 +512 @@
  */
 #define _FORK_PARENT1(uPriority, pfnCallback) \
-    static __LIBC_FORKCALLBACK __fork_parent1_##pfnCallback = { pfnCallback, uPriority, &__fork_parent1_##pfnCallback }; \
+    static const __LIBC_FORKCALLBACK __fork_parent1_##pfnCallback = { pfnCallback, uPriority, &__fork_parent1_##pfnCallback }; \
     __asm__ (".stabs \"___fork_parent1__\", 25, 0, 0, ___fork_parent1_" #pfnCallback);
 
@@ -526 +525 @@
  */
 #define _FORK_CHILD1(uPriority, pfnCallback) \
-    static __LIBC_FORKCALLBACK __fork_child1_##pfnCallback  = { pfnCallback, uPriority, &__fork_child1_##pfnCallback  }; \
+    static const __LIBC_FORKCALLBACK __fork_child1_##pfnCallback  = { pfnCallback, uPriority, &__fork_child1_##pfnCallback  }; \
     __asm__ (".stabs \"___fork_child1__\",  25, 0, 0, ___fork_child1_" #pfnCallback );
 

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

@@ -233 +233 @@
     /** Pointer to fork handle which a child should use when spawned by fork(). */
     void                       *pvForkHandle;
+    /** Creation timestamp. */
+    unsigned                    uTimestamp;
 
     /** Reserved pool pointer field with default value 0. */
-    unsigned                    aReserved[40 - 13];
+    unsigned                    aReserved[40 - 14];
 
     /** Number of possible pointers to shared memory starting at pvInherit.
@@ -243 +245 @@
     /** Pointer to data inherited from the parent process. */
     __LIBC_PSPMINHERIT volatile pInherit;
+    /** Pointer to data inherited from the parent process when it's locked.
+     * When locked pInherit is NULL and this member points to the data instead.
+     * This prevents spmAlloc() from reclaiming it while it's in use. */
+    __LIBC_PSPMINHERIT volatile pInheritLocked;
 } __LIBC_SPMPROCESS, *__LIBC_PSPMPROCESS;
 
@@ -367 +373 @@
 
 /**
+ * Gets the inherit data associated with the current process.
+ * This call prevents it from being release by underrun handling.
+ *
+ * @returns Pointer to inherit data.
+ *          The caller must call __libc_spmInheritRelease() when done.
+ * @returns NULL and errno if no inherit data.
+ */
+__LIBC_PSPMINHERIT  __libc_spmInheritRequest(void);
+
+/**
+ * Releases the inherit data locked by the __libc_spmInheritRequest() call.
+ *
+ * @returns 0 on success.
+ * @returns -1 and errno on failure.
+ */
+int  __libc_spmInheritRelease(void);
+
+/**
+ * Frees the inherit data of this process.
+ * This is called when the executable is initialized.
+ */
+void  __libc_spmInheritFree(void);
+
+/**
  * Create an embryo related to the current process.
  *