Changeset 1676 for trunk/src/emx/include

Timestamp:

Dec 2, 2004, 2:42:51 AM (21 years ago)

Author:

bird

Message:

Fixed fork() problem by adding DosLoadModuleEx and DosFreeModuleEx. (also fixed heap problem)

Location:

trunk/src/emx/include

Files:

• emx/startup.h (modified) (1 diff, 1 prop)
• os2emx.h (modified) (2 diffs, 1 prop)
• sys/fmutex.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/emx/startup.h

@@ -8 +8 @@
 #endif
 
-extern int  _CRT_init (void);
-extern void _CRT_term (void);
-extern void __ctordtorInit (void);
-extern void __ctordtorTerm (void);
+extern int  _CRT_init(void);
+extern void _CRT_term(void);
+extern void __ctordtorInit(void);
+extern void __ctordtorTerm(void);
+
+extern void __ctordtorInit1(int *);
+extern void __ctordtorTerm1(int *);
+
+/** init and term vectors.
+ * @{
+ */
+/** Array of CRT init functions. */
+extern int __crtinit1__;
+/** Array of CRT exit functions. */
+extern int __crtexit1__;
+/** Array of exception handlers something. */
+extern int __eh_init__;
+/** Array of exception handlers something. */
+extern int __eh_term__;
+/** Array of constructors. */
+extern int __CTOR_LIST__;
+/** Array of destructors. */
+extern int __DTOR_LIST__;
+/** @} */
+
 
 /* argv[i][-1] contains some flag bits: */

trunk/src/emx/include/os2emx.h

@@ -13529 +13529 @@
 APIRET APIENTRY DosCloseEventSemEx(HEV hev);
 
+/**
+ * Extended DosLoadModule() which will make sure the loaded module is
+ * loaded in a forked process.
+ */
+APIRET APIENTRY DosLoadModuleEx(PSZ pszObject, ULONG cbObject, PCSZ pszModule, PHMODULE phmod);
+
+/**
+ * Free module loaded using the extended APIs.
+ */
+APIRET APIENTRY DosFreeModuleEx(HMODULE hmod);
+
+
 #ifdef INCL_EXAPIS_MAPPINGS
 
@@ -13542 +13554 @@
 #define DosCloseEventSem(a)        DosCloseEventSemEx((a))
 
+#define DosLoadModule(a,b,c,d)     DosLoadModuleEx(a,b,c,d)
+#define DosFreeModule(a)           DosFreeModuleEx(a)
+
 #endif /* INCL_EXAPIS_MAPPINGS */
 

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

@@ -100 +100 @@
 }
 
+/**
+ * Release a semaphore in the child process after the
+ * semaphore was locked for the forking the parent.
+ *
+ * @param   pSem    Semaphore to unlock.
+ */
+static __inline__ void _fmutex_release_fork(_fmutex *pSem)
+{
+    pSem->fs = _FMS_AVAILABLE;
+    pSem->Owner = 0;
+}
 
 unsigned _fmutex_create (_fmutex *, unsigned);