Changeset 2937

Timestamp:

Jan 3, 2007, 3:03:12 AM (19 years ago)

Author:

bird

Message:

Made libc07.dll link and load. still some init and term work left.

Location:

trunk/libc

Files:

• include/InnoTekLIBC/sharedpm.h (modified) (2 diffs)
• src/kNIX/Makefile.kmk (modified) (2 diffs)
• src/kNIX/b_initArgv.c (added)
• src/kNIX/b_initterm.c (modified) (1 diff)
• src/kNIX/os2/b_initterm-os2.c (modified) (2 diffs)
• src/kNIX/os2/libcfork.c (modified) (8 diffs)
• src/kNIX/os2/sharedpm.c (modified) (12 diffs)
• src/libc/libc.def (modified) (2 diffs)
• src/libc/startup/initterm.c (modified) (3 diffs)
• src/libc/startup/os2/x86/dll0.s (modified) (1 diff)

trunk/libc/include/InnoTekLIBC/sharedpm.h

@@ -653 +653 @@
 
 /**
- * Initializes the shared process management for this process.
- *
- * This might actually initialize the SPM globally too if this is the
- * first process using it.
- *
- * @returns 0 on success.
- * @returns Negative error code (errno.h) on failure.
- */
-int __libc_spmInit(void);
-
-/**
  * Gets the current process.
  *
@@ -669 +658 @@
  * @returns NULL and errno on failure.
  * @remark  For this too __libc_spmRelease() must be called when done.
- */
-__LIBC_PSPMPROCESS __libc_spmSelf(void);
+ * @param   fAutoInit   Set if it's ok to automatically initialize SPM.
+ */
+__LIBC_PSPMPROCESS __libc_spmSelf(int fAutoInit);
 
 /**

trunk/libc/src/kNIX/Makefile.kmk

@@ -36 +36 @@
 libc_kNIX_SOURCES = \
     $(PATH_LIBC_SRC)/kNIX/b_initterm.c \
+    $(PATH_LIBC_SRC)/kNIX/b_initArgv.c \
     $(PATH_LIBC_SRC)/kNIX/b_fhImport.c \
     $(PATH_LIBC_SRC)/kNIX/b_fhValidate.c \
@@ -178 +179 @@
     $(PATH_LIBC_SRC)/kNIX/os2/_os2_bad.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__spawnve.c \
-    $(PATH_LIBC_SRC)/kNIX/os2/__read_kbd.c
+    $(PATH_LIBC_SRC)/kNIX/os2/__read_kbd.c \
+    $(PATH_LIBC_SRC)/kNIX/os2/__select.c
 TODO= \
     $(PATH_LIBC_SRC)/kNIX/os2/__init.c \

trunk/libc/src/kNIX/b_initterm.c

@@ -134 +134 @@
      */
     const int32_t cRefs = __atomic_increment_s32(&g_ckNIXUsers);
-    if (cRefs != 1)
-        LIBCLOG_RETURN_MSG(0, "ret 0 (g_ckNIXUsers=%d)\n", cRefs);
-    int rc = __libc_back_init(hmod, pvOS, fFlags);
+    int rc;
+    if (cRefs == 1)
+        rc = __libc_back_init(hmod, pvOS, fFlags);
+    else
+        /* (Might later add initialization code for every module here.) */
+        rc = 0;
     if (!rc)
         LIBCLOG_RETURN_INT(0);
+
+    /* failure */
     __atomic_decrement_s32(&g_ckNIXUsers);
     LIBCLOG_ERROR_RETURN_INT(rc);
 }
 
+
+/**
+ * Terminates the backend.
+ * Called when a frontend shuts down.
+ *
+ * @returns 0 on success, non-zero on failure.
+ * @param   hmod        The handle of the module that's causing the frontend to shut down.
+ * @param   pvOS        OS specific argument.
+ * @param   fFlags      Termination flags.
+ */
+int __libc_Back_term(uintptr_t hmod, void *pvOS, unsigned fFlags)
+{
+    /** @todo */
+    return 0;
+}

trunk/libc/src/kNIX/os2/b_initterm-os2.c

@@ -70 +70 @@
 {
     LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x\n", hmod, pvOS, fFlags);
-    int rc = __libc_spmInit();
+    /*
+     * Initialize _osmajor and _osminor.
+     */
+    ULONG aul[2] = {0, 0};
+    DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR, &aul[0], sizeof(aul));
+    _osminor = (unsigned char)aul[1];
+    _osmajor = (unsigned char)aul[0];
+
+    /*
+     * Check for high memory (>512MB) support.
+     */
+    ULONG ul;
+    __libc_back_gcbVirtualAddressLimit = 512 * 1024 * 1024;
+    if (    !DosQuerySysInfo(QSV_VIRTUALADDRESSLIMIT, QSV_VIRTUALADDRESSLIMIT, &ul, sizeof(ul))
+        &&  ul > 512
+        &&  (   (_osmajor == 20 && _osminor >= 40)
+             || _osmajor > 20 /* yeah, sure! */) )
+        __libc_back_gcbVirtualAddressLimit = ul * 1024*1024;
+
+    /*
+     * Initialize TLS.
+     */
+    int rc = DosAllocThreadLocalMemory(1, (PULONG*)(void*)&__libc_gpTLS);
     if (!rc)
     {
-        /*
-         * Initialize _osmajor and _osminor.
-         */
-        ULONG aul[2] = {0, 0};
-        DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR, &aul[0], sizeof(aul));
-        _osminor = (unsigned char)aul[1];
-        _osmajor = (unsigned char)aul[0];
-
-        /*
-         * Check for high memory (>512MB) support.
-         */
-        ULONG ul;
-        __libc_back_gcbVirtualAddressLimit = 512 * 1024 * 1024;
-        if (    !DosQuerySysInfo(QSV_VIRTUALADDRESSLIMIT, QSV_VIRTUALADDRESSLIMIT, &ul, sizeof(ul))
-            &&  ul > 512
-            &&  (   (_osmajor == 20 && _osminor >= 40)
-                 || _osmajor > 20 /* yeah, sure! */) )
-            __libc_back_gcbVirtualAddressLimit = ul * 1024*1024;
-
-        /*
-         * Initialize TLS.
-         */
-        rc = DosAllocThreadLocalMemory(1, (PULONG*)(void*)&__libc_gpTLS);
+        rc = _fmutex_create2(&__libc_gmtxExec,  0, "LIBC SYS Exec Mutex");
         if (!rc)
         {
-            rc = _fmutex_create2(&__libc_gmtxExec,  0, "LIBC SYS Exec Mutex");
-            if (!rc)
+            /* Ensure that SPM is initialized. */
+            __LIBC_PSPMPROCESS pSelf = __libc_spmSelf(1 /* auto init */);
+            if (pSelf)
             {
-                __LIBC_PSPMPROCESS pSelf = __libc_spmSelf();
-                if (!pSelf)
-                {
-                    /*
-                     * Done here.
-                     */
-                    LIBCLOG_RETURN_INT(0);
-                }
-                else
-                {
-                    LIBC_ASSERTM_FAILED("__libc_spmSelf() failed\n");
-                    rc = -ESRCH;
-                }
-                _fmutex_close(&__libc_gmtxExec);
+                __libc_spmRelease(pSelf);
+
+                /*
+                 * Done here.
+                 */
+                LIBCLOG_RETURN_INT(0);
             }
-            DosFreeThreadLocalMemory((PULONG)__libc_gpTLS);
-            __libc_gpTLS = NULL;
-        }
-        else
-            LIBC_ASSERTM_FAILED("DosAllocThreadLocalMemory() failed. rc=%d\n", rc);
-    }
+            else
+            {
+                LIBC_ASSERTM_FAILED("__libc_spmSelf() failed\n");
+                rc = -ESRCH;
+            }
+            _fmutex_close(&__libc_gmtxExec);
+        }
+        DosFreeThreadLocalMemory((PULONG)__libc_gpTLS);
+        __libc_gpTLS = NULL;
+    }
+    else
+        LIBC_ASSERTM_FAILED("DosAllocThreadLocalMemory() failed. rc=%d\n", rc);
+    /** @todo terminate SPM */
     LIBCLOG_ERROR_RETURN_INT(rc);
 }
@@ -142 +142 @@
     DosFreeThreadLocalMemory((PULONG)__libc_gpTLS);
     __libc_gpTLS = NULL;
+
+    /*
+     * Terminate SPM.
+     */
+    /** @todo terminate SPM */
 
     LIBCLOG_RETURN_VOID();

trunk/libc/src/kNIX/os2/libcfork.c

@@ -350 +350 @@
         __libc_Timebomb();
 #endif
-
         /*
          * Find the SPM process.
          */
-        pProcess = __libc_spmSelf();
+        pProcess = __libc_spmSelf(1 /* auto init */);
         if (!pProcess)
         {
@@ -417 +416 @@
         {
             pTib->tib_pexchain = XcptRegRec.Core.prev_structure;
+            __libc_spmRelease(pProcess);
             LIBCLOG_RETURN_INT(0);
         }
@@ -425 +425 @@
          */
         pForkHandle = forkChlOpenHandle(pProcess->pvForkHandle);
+        __libc_spmRelease(pProcess);
         if (!pForkHandle)
         {
@@ -499 +500 @@
         /*
          * Don't deregister modules which has already been deregistered.
-         * Don't deregister if we're in shutting down the process (waste of time and
-         * SPM might already be shut down).
+         * Don't deregister if we're in shutting down the process (waste of time and SPM might already be shut down).
          */
         if (pModule->fFlags & __LIBC_FORKMODULE_FLAGS_DEREGISTERED)
@@ -521 +521 @@
          * Find the SPM process.
          */
-        __LIBC_PSPMPROCESS pProcess = __libc_spmSelf();
+        __LIBC_PSPMPROCESS pProcess = __libc_spmSelf(0 /* don't auto init */);
         if (!pProcess)
         {
             pTib->tib_pexchain = XcptRegRec.Core.prev_structure;
-            LIBC_ASSERTM_FAILED("can't find the process! weird!\n");
+            LIBC_ASSERTM_FAILED("can't find the process! weird!\n"); /* DLL termination order might be screwed up... */
             LIBCLOG_RETURN_VOID();
         }
@@ -559 +559 @@
         pModule->fFlags |= __LIBC_FORKMODULE_FLAGS_DEREGISTERED;
 
+        __libc_spmRelease(pProcess);
         pTib->tib_pexchain = XcptRegRec.Core.prev_structure;
         LIBCLOG_RETURN_VOID();
@@ -1566 +1567 @@
      */
     forkBthCloseHandle(pForkHandle, __LIBC_FORK_CTX_CHILD);
-    __LIBC_PSPMPROCESS pProcess = __libc_spmSelf();
+    __LIBC_PSPMPROCESS pProcess = __libc_spmSelf(0 /* no init */);
     LIBC_ASSERTM(pProcess, "No self process!!!\n");
     pProcess->pvForkHandle = NULL;
-
-    /*
-     * The return here will go back to the inline assmebly which called us in forkChlDoFork()
+    __libc_spmRelease(pProcess);
+
+
+    /*
+     * The return here will go back to the inline assembly which called us in forkChlDoFork()
      * and restore the stack pointer to the __libc_Back_processFork() and jump to the fork_ret
      * label in __libc_Back_processFork().
@@ -2217 +2220 @@
 {
     __LIBC_PFORKMODULE  pModules;
-    __LIBC_PSPMPROCESS  pProcessSelf = __libc_spmSelf();
+    __LIBC_PSPMPROCESS  pProcessSelf = __libc_spmSelf(0 /* no init */);
     if (pProcessSelf)
     {

trunk/libc/src/kNIX/os2/sharedpm.c

@@ -93 +93 @@
 static int  spmRequestMutex(__LIBC_PSPMXCPTREGREC pRegRec);
 static int  spmReleaseMutex(__LIBC_PSPMXCPTREGREC pRegRec);
+static int  spmInit(__LIBC_PSPMXCPTREGREC pRegRec);
 static VOID APIENTRY spmExitList(ULONG ulReason);
 static void spmCleanup(void);
@@ -337 +338 @@
  *
  * @returns Pointer to the current process.
- * @returns NULL and errno on failure.
+ * @returns NULL on failure.
  * @remark  For this too __libc_spmRelease() must be called when done.
- */
-__LIBC_PSPMPROCESS __libc_spmSelf(void)
-{
-    LIBCLOG_ENTER("\n");
+ * @param   fAutoInit   Set if it's ok to automatically initialize SPM.
+ */
+__LIBC_PSPMPROCESS __libc_spmSelf(int fAutoInit)
+{
+    LIBCLOG_ENTER("fAutoInit=%d\n", fAutoInit);
     __LIBC_PSPMPROCESS pProcess;
 
@@ -350 +352 @@
 
     /*
-     * Check if we've already registered (we're allways registred).
-     * If we have we'll simply return.
+     * Read the cached variable.
+     * If the caller permits automatic initialization, we'll give it a shot.
      */
     pProcess = gpSPMSelf;
-    if (!pProcess)
-    {
-        __LIBC_SPMXCPTREGREC    RegRec;
-        if (spmRequestMutexErrno(&RegRec))
-            LIBCLOG_RETURN_P(NULL);
-        if (!gpSPMSelf)
-            pProcess = gpSPMSelf;
+    if (!pProcess && fAutoInit)
+    {
+        /* Don't try initialize unless we're in a virgin state. */
+        if (!gpSPMHdr && !gcNesting)
+        {
+            __LIBC_SPMXCPTREGREC RegRec;
+            int rc = spmInit(&RegRec);
+            if (!rc)
+            {
+                pProcess = gpSPMSelf;
+                spmReleaseMutex(&RegRec);
+                LIBC_ASSERT(pProcess);
+            }
+            else
+                LIBCLOG_ERROR("rc=%d\n", rc);
+        }
         else
-        {
-            PTIB                    pTib;
-            PPIB                    pPib;
-            PLINFOSEG               pLIS = GETLINFOSEG();
-            FS_VAR()
-            FS_SAVE_LOAD();
-            DosGetInfoBlocks(&pTib, &pPib);
-            pProcess = spmRegisterSelf(pPib->pib_ulpid, pPib->pib_ulppid, pLIS->sgCurrent);
-            FS_RESTORE();
-        }
-        spmReleaseMutex(&RegRec);
+            LIBCLOG_MSG("fAutoInit=%d gpSPMHdr=%p gcNesting=%d\n", fAutoInit, gpSPMHdr, gcNesting);
     }
 
@@ -1966 +1967 @@
     {
         /*
-         * Before exec we must ensure that we're opened
-         * for the logic below to work.
+         * Before exec we must ensure that we're opened for the logic below to work.
+         * (This is probably not necessary, but it doesn't hurt.)
          */
         case __LIBC_FORK_OP_EXEC_CHILD:
             if (!gpSPMSelf)
-                __libc_spmSelf();
+                __libc_spmSelf(1 /* auto init */);
             LIBCLOG_RETURN_INT(0);
 
@@ -2044 +2045 @@
 
 /**
- * Requests the shared mutex semphore and checks that we're
- * successfully initialized.
+ * Requests the shared mutex semphore and checks that we're successfully initialized.
+ *
  * @returns 0 on success.
  * @returns Negative error code (errno.h) on failure.
@@ -2077 +2078 @@
 
     /*
-     * Check if initatied.
+     * Check if initiated.
      */
     if (!ghmtxSPM || !gpSPMHdr)
     {
-        LIBC_ASSERTM_FAILED("not initialized!\n");
+        LIBC_ASSERTM_FAILED("not initialized! rc=%d\n", rc);
         DosUnsetExceptionHandler(&pRegRec->Core);
         FS_RESTORE();
@@ -2177 +2178 @@
  * first process using it.
  *
- * @returns 0 on success.
+ * @returns 0 on success, mutex owned.
  * @returns Negative error code (errno.h) on failure.
- */
-int __libc_spmInit(void)
+ *
+ * @param   pRegRec     Same as with spmRequestMutex().
+ */
+static int spmInit(__LIBC_PSPMXCPTREGREC pRegRec)
 {
     LIBCLOG_ENTER("\n");
@@ -2211 +2214 @@
 
     /*
+     * Install the exception handler.
+     */
+    FS_SAVE_LOAD();
+    pRegRec->Core.prev_structure   = (void *)~0;
+    pRegRec->Core.ExceptionHandler = spmXcptHandler;
+    DosSetExceptionHandler(&pRegRec->Core);
+
+    /*
+     * Check stack.
+     */
+    if (spmRequestMutexStackChecker())
+    {
+        DosUnsetExceptionHandler(&pRegRec->Core);
+        FS_RESTORE();
+        LIBC_ASSERTM_FAILED("Too little stack left!\n");
+        LIBCLOG_RETURN_INT(-EFAULT);
+    }
+
+    /*
      * Get current process id and parent process id
      * and install the exception handler.
@@ -2219 +2241 @@
      * Open or create mutex.
      */
-    FS_SAVE_LOAD();
     rc = DosOpenMutexSem((PCSZ)SPM_MUTEX_NAME, &ghmtxSPM);
     if (rc)
@@ -2230 +2251 @@
             if (rc2)
             {
+                DosUnsetExceptionHandler(&pRegRec->Core);
                 FS_RESTORE();
                 /* too bad, can create it for some reason. */
@@ -2335 +2357 @@
              */
             rc = DosExitList(0x9800 | EXLST_ADD, spmExitList);
+            LIBC_ASSERTM(!rc, "DosExitList failed with rc=%d\n", rc);
             FS_RESTORE();
-            DosReleaseMutexSem(ghmtxSPM);
-            DosExitMustComplete(&ul);
-            LIBC_ASSERTM(!rc, "DosExitList failed with rc=%d\n", rc);
             LIBCLOG_RETURN_INT(0);
         }
@@ -2356 +2376 @@
     gpSPMHdr = NULL;
     gpSPMSelf = NULL;
+    DosUnsetExceptionHandler(&pRegRec->Core);
     FS_RESTORE();
     rc = -__libc_back_native2errno(rc);

trunk/libc/src/libc/libc.def

@@ -1953 +1953 @@
     "__std_getdirents" @1951
     "___libc_Back_ioFileControlStandard" @1952
-    "___libc_Back_termDll" @1953
+    ; dead "___libc_Back_termDll" @1953
     "___libc_ForkDeregisterModule" @1954
     "__std_nan" @1955
@@ -1960 +1960 @@
 
     ; new stuff 0.7
-    "__libc_back_envInitAsm" @1958
-    "__std_adjtime" @1959
-    "__std_getrusage" @1960
-    "__std_ttyname_r" @1961
+    "__std_adjtime" @1958
+    "__std_getrusage" @1959
+    "__std_ttyname_r" @1960

trunk/libc/src/libc/startup/initterm.c

@@ -160 +160 @@
 
     /*
-     * The remaining bits are only done once.
-     *
-     * We currently IGNORE the posibility that two thread might be racing here and
-     * the loser begin able to call into LIBC while it's begin initialized.
-     */
-    const int32_t cRefs = __atomic_increment_s32(&g_cCrtUsers);
-    if (cRefs != 1)
-        LIBCLOG_RETURN_MSG(0, "ret 0 (g_cCrtUsers=%d)\n", cRefs);
-
-    /*
      * The backend must be initialized first.
      */
@@ -175 +165 @@
     if (!rc)
     {
+        /*
+         * The remaining bits are only done once.
+         *
+         * We currently IGNORE the posibility that two thread might be racing here and
+         * the loser begin able to call into LIBC while it's begin initialized.
+         */
+        const int32_t cRefs = __atomic_increment_s32(&g_cCrtUsers);
+        if (cRefs != 1)
+            LIBCLOG_RETURN_MSG(0, "ret 0 (g_cCrtUsers=%d)\n", cRefs);
+
         /*
          * Init the frontend.
@@ -182 +182 @@
          */
 
-        /* weak initializers. */
-        __ctordtorTerm1(&__crtinit1__);
-
-        LIBCLOG_RETURN_INT(0);
+        {
+            /* weak initializers. */
+            __ctordtorTerm1(&__crtinit1__);
+
+            LIBCLOG_RETURN_INT(0);
+        }
+        __atomic_decrement_s32(&g_cCrtUsers);
     }
 
-    __atomic_decrement_s32(&g_cCrtUsers);
     LIBCLOG_ERROR_RETURN_INT(rc);
 }

trunk/libc/src/libc/startup/os2/x86/dll0.s

@@ -69 +69 @@
      * What are we in for?
      */
-    movl    8(%ebp), %eax
+    movl    0xc(%ebp), %eax
     orl     %eax, %eax
     je      dll0_init