Changeset 2786 for branches/libc-0.6/src/emx/include

Timestamp:

Aug 27, 2006, 4:26:13 PM (19 years ago)

Author:

bird

Message:

Fixed problems with fork() and module loading/unloading. Fixes #76.
Fixed atexit() and on_exit() problem with callbacks in unloaded DLLs. Fixes #103.

Location:

branches/libc-0.6/src/emx/include/InnoTekLIBC

Files:

• atexit.h (modified) (3 diffs)
• fork.h (modified) (2 diffs)

branches/libc-0.6/src/emx/include/InnoTekLIBC/atexit.h

@@ -37 +37 @@
     __LIBC_ATEXITTYPE_ONEXIT,
     /** State transition state. */
-    __LIBC_ATEXITTYPE_TRANS
+    __LIBC_ATEXITTYPE_TRANS,
+    /** The module containing the callback was unloaded. */
+    __LIBC_ATEXITTYPE_UNLOADED
 } __LIBC_ATEXITTYPE;
 
@@ -47 +49 @@
     /** Entry type. */
     __LIBC_ATEXITTYPE volatile enmType;
+    /** The (native) module handle this callback is connected to.
+     * This will be 0 if no such association. */
+    uintptr_t                  hmod;
     union
     {
@@ -92 +97 @@
  * @returns Pointer to new entry.
  * @returns NULL on failure.
+ *
+ * @param   pvCallback      The callback address.
+ *                          This used to initialize the __LIBC_AT_EXIT::hmod field.
  */
-__LIBC_PATEXIT __libc_atexit_new(void);
+__LIBC_PATEXIT __libc_atexit_new(void *pvCallback);
+
+/**
+ * Invalidate all atexit and on_exit callback for a
+ * module which is being unloaded.
+ *
+ * @param   hmod        The module handle.
+ */
+void __libc_atexit_unload(uintptr_t hmod);
 
 __END_DECLS

branches/libc-0.6/src/emx/include/InnoTekLIBC/fork.h

@@ -575 +575 @@
 /** Indicates that the module is an executable. */
 #define __LIBC_FORKMODULE_FLAGS_EXECUTABLE      0x00000001
-/** Indicates that the module was dynamically loaded. */
-#define __LIBC_FORKMODULE_FLAGS_DYNAMIC         0x00010000
+/** Indicates that the module already has been deregistered (libc termination). */
+#define __LIBC_FORKMODULE_FLAGS_DEREGISTERED    0x00010000
 /** @} */
 
@@ -606 +606 @@
  */
 int __libc_ForkRegisterModule(__LIBC_PFORKMODULE pModule, int fExecutable);
+
+
+/**
+ * Deregister a forkable module. Called by dll0.
+ *
+ * The call links pModule out of the list of forkable modules
+ * which is maintained in the process block.
+ *
+ * @param   pModule     Pointer to the fork module structure for the
+ *                      module which is to registered.
+ */
+void __libc_ForkDeregisterModule(__LIBC_PFORKMODULE pModule);