Changeset 1581

Timestamp:

Oct 10, 2004, 2:08:10 PM (21 years ago)

Author:

bird

Message:

...

Location:

trunk/src/emx/src/lib

Files:

• process/beginthr.c (modified) (4 diffs, 1 prop)
• process/thread_internals.c (modified) (3 diffs, 1 prop)
• sys/b_threadInit.c (modified) (1 diff, 1 prop)
• sys/b_threadStartup.c (modified) (1 diff, 1 prop)
• sys/sharedpm.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/process/beginthr.c

@@ -23 +23 @@
 static void _System threadWrapper(__LIBC_PTHREAD pThrd)
 {
-    LIBCLOG_ENTER("pThrd=%p\n", pThrd);
+    LIBCLOG_ENTER("pThrd=%p\n", (void *)pThrd);
     int                         tid;
     EXCEPTIONREGISTRATIONRECORD reg;
     FS_VAR();
 
+    __libc_threadUse(pThrd);
     __libc_Back_threadStartup(&reg);
-    LIBCLOG_MSG("calling thread function %p with arg %p\n", pThrd->u.startup.pfnStart, pThrd->u.startup.pvArg);
+
+    LIBCLOG_MSG("calling thread function %p with arg %p\n", (void *)pThrd->u.startup.pfnStart, pThrd->u.startup.pvArg);
     pThrd->u.startup.pfnStart(pThrd->u.startup.pvArg);
     LIBCLOG_MSG("thread function returned\n");
 
+    FS_SAVE_LOAD();
     __libc_threadTermination(0);
-    tid = _gettid();
-    __libc_threadFree(pThrd);
+    tid = pThrd->tid;
+    __libc_threadDereference(pThrd);
     __libc_Back_threadEnd(&reg);
     FS_SAVE_LOAD();
@@ -46 +49 @@
 int _beginthread(void (*pfnStart)(void *), void *pvStack, unsigned cbStack, void *pvArg)
 {
-    LIBCLOG_ENTER("pfnStart=%p pvStart=%p cbStack=%d pvArg=%p\n", pfnStart, pvStack, cbStack, pvArg);
+    LIBCLOG_ENTER("pfnStart=%p pvStart=%p cbStack=%d pvArg=%p\n", (void *)pfnStart, pvStack, cbStack, pvArg);
     int             rc;
     TID             tid;
@@ -87 +90 @@
     else
         errno = EINVAL;
-    __libc_threadFree(pThrd);
+    __libc_threadDereference(pThrd);
     LIBCLOG_RETURN_INT(-1);
 }
@@ -96 +99 @@
     LIBCLOG_ENTER("\n");
     __LIBC_PTHREAD  pThrd = __libc_threadCurrent();
-    int             tid;
+    int             tid = pThrd->tid;
     FS_VAR();
 
     __libc_threadTermination(0);
-    tid = _gettid();
-    __libc_threadFree(pThrd);
+    __libc_threadDereference(pThrd);
     FS_SAVE_LOAD();
     LIBCLOG_MSG("calling DosExit(%s, 0)\n", tid == 1 ? "EXIT_PROCESS" : "EXIT_THREAD");

trunk/src/emx/src/lib/process/thread_internals.c

@@ -94 +94 @@
          * Gain exclusive access to the signal stuff.
          */
+#ifdef __NEW_SIGNALS__
         int rc = __libc_back_signalSemRequest();
+#endif
 
         /*
@@ -109 +111 @@
          * Release semaphore.
          */
+#ifdef __NEW_SIGNALS__
         if (!rc)
             __libc_back_signalSemRelease();
+#endif
     }
     else
@@ -128 +132 @@
     /*
      * Check that pThrd isn't already in use and set gpTLS to point at pThrd.
-     */
-    assert(!pThrd->pNext && !pThrd->tid && !*__libc_gpTLS);
+     * (*gpTLS might already be pointing to a temporary structure.)
+     */
+    assert(!pThrd->pNext && !pThrd->tid);
     *__libc_gpTLS = pThrd;
 

trunk/src/emx/src/lib/sys/b_threadInit.c

@@ -37 +37 @@
 
 
-void __libc_Back_threadInit(__LIBC_PTHREAD pThrd)
+void __libc_Back_threadInit(__LIBC_PTHREAD pThrd, const __LIBC_PTHREAD pParentThrd)
 {
     unsigned        i;

trunk/src/emx/src/lib/sys/b_threadStartup.c

@@ -37 +37 @@
 #include <InnoTekLIBC/backend.h>
 
-void __libc_Back_threadStartup(void *pExpRegRec, const __LIBC_PTHREAD pParentThrd)
+void __libc_Back_threadStartup(void *pExpRegRec)
 {
     FS_VAR();

trunk/src/emx/src/lib/sys/sharedpm.c

@@ -900 +900 @@
      * This is mostly because we wanna crash before we take the sem.
      */
+#ifdef SIGRTMAX                         /* just make it build. */
     if (pSignal->si_signo <= 0 || pSignal->si_signo > SIGRTMAX)
     {
@@ -905 +906 @@
         LIBCLOG_RETURN_INT(-EINVAL);
     }
+#endif
     if (pSignal->auReserved[(sizeof(pSignal->auReserved) / sizeof(pSignal->auReserved[0])) - 1])
     {