Changeset 123 for trunk/src/helpers/threads.c

Timestamp:

Dec 14, 2001, 11:41:33 PM (24 years ago)

Author:

umoeller

Message:

Lots of changes for icons and refresh.

File:

• trunk/src/helpers/threads.c (modified) (10 diffs)

trunk/src/helpers/threads.c

@@ -40 +40 @@
     // as unsigned char
 
+#define INCL_WINMESSAGEMGR
 #define INCL_DOSPROCESS
 #define INCL_DOSSEMAPHORES
@@ -130 +131 @@
     if (pti)
     {
+        HEV hevExitComplete;
+
         if (pti->flFlags & THRF_WAIT)
             // "Wait" flag set: thrCreate is then
@@ -168 +171 @@
         }
 
+        // copy event sem before freeing pti
+        hevExitComplete = pti->hevExitComplete;
+
         // set exit flags
         // V0.9.7 (2000-12-20) [umoeller]
-        pti->fExitComplete = TRUE;
         pti->tid = NULLHANDLE;
 
@@ -180 +185 @@
         if (pti->flFlags & THRF_TRANSIENT)
             free(pti);
+
+        if (hevExitComplete)
+            // caller wants notification:
+            DosPostEventSem(hevExitComplete);
+                    // V0.9.16 (2001-12-08) [umoeller]
     }
 
@@ -394 +404 @@
  *@@added V0.9.5 (2000-08-26) [umoeller]
  *@@changed V0.9.9 (2001-03-07) [umoeller]: added pcszThreadName
+ *@@changed V0.9.16 (2001-12-08) [umoeller]: fixed hang with thrWait
  */
 
@@ -417 +428 @@
     {
         THREADINFO  ti = {0};
+        volatile unsigned long tidRunning = 0;
         thrCreate(&ti,
                   pfn,
-                  NULL,
+                  &tidRunning,
                   pcszThreadName,
                   THRF_PMMSGQUEUE,
                   ulData);
         ti.hwndNotify = hwndNotify;
+        // create event sem to wait on V0.9.16 (2001-12-08) [umoeller]
+        DosCreateEventSem(NULL,
+                          &ti.hevExitComplete,
+                          0,
+                          FALSE);       // not posted
 
         while (WinGetMsg(hab,
@@ -445 +462 @@
         // otherwise THREADINFO is deleted from the stack
         // before the thread exits... will crash!
-        thrWait(&ti);
+        // thrWait(&ti);
+        // now using event sem V0.9.16 (2001-12-08) [umoeller]
+        WinWaitEventSem(ti.hevExitComplete, 5000);
+        DosCloseEventSem(ti.hevExitComplete);
 
         WinDestroyWindow(hwndNotify);
@@ -481 +501 @@
         PLISTNODE pNode;
         *pcThreads = lstCountItems(&G_llThreadInfos);
-        _Pmpf((__FUNCTION__ ": got %d threads", *pcThreads));
         pArray = (PTHREADINFO)malloc(*pcThreads * sizeof(THREADINFO));
         pThis = pArray;
@@ -561 +580 @@
  *      the thread will actually terminate.
  *
+ *      Update V0.9.16: Do not use this with PM theads at
+ *      all. DosWaitThread can hang the system then.
+ *
  *      Returns FALSE if the thread wasn't running or TRUE
  *      if it was and has terminated.
@@ -631 +653 @@
 {
     if (pti)
-        if (!(pti->fExitComplete))
-            return (pti->tid);
+        return (pti->tid);
 
     return (NULLHANDLE);