Changeset 1271 for trunk/dll/systemf.c

Timestamp:

Nov 10, 2008, 4:58:50 AM (17 years ago)

Author:

Gregg Young

Message:

A fix for the ticket 58 hang which runs runemf2 with the WAIT flag in a separate thread. This appears to fix Ticket 58 for all cases. Removed semaphore fix and reverted hTermQSem code.

File:

• trunk/dll/systemf.c (modified) (7 diffs)

trunk/dll/systemf.c

@@ -62 +62 @@
 
 static PSZ pszSrcFile = __FILE__;
-
-HEV hWaitChildSem;
 
 //static HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,
@@ -694 +692 @@
   static char szTermQName[30];
   static HQUEUE hTermQ;
-  //static HEV hTermQSem;
+  static HEV hTermQSem;
 
   if (pszDirectory && *pszDirectory) {
@@ -1082 +1080 @@
           }
           else {
-            rc = DosCreateEventSem(NULL,(PHEV)&hWaitChildSem,0,FALSE);
+            rc = DosCreateEventSem(NULL,(PHEV)&hTermQSem,0,FALSE);
             if (rc) {
-                hWaitChildSem = (HEV)0;     // Try to survive
+                hTermQSem = (HEV)0;     // Try to survive
                 DosCloseQueue(hTermQ);
                 hTermQ = (HQUEUE)0;     // Try to survive
@@ -1093 +1091 @@
           }
         } // if 1st time
-        useTermQ = hTermQ && hWaitChildSem;
+        useTermQ = hTermQ && hTermQSem;
         if (!rc)
           DosExitCritSec();
@@ -1134 +1132 @@
       //     sdata.PgmInputs, sdata.TermQ, sdata.InheritOpt,
       //   sdata.SessionType, szTermQName,
-      //   hTermQ, hWaitChildSem); fflush(stdout);
+      //   hTermQ, ); fflush(stdout);
       ret = DosStartSession(&sdata, &ulSessID, &sessPID);
 
@@ -1181 +1179 @@
         }
         else {
-          ULONG clPosted;
-
-          DosResetEventSem(hWaitChildSem, &clPosted);
           for (ctr = 0;; ctr++)
           {
             if (ctr < 20) {
               rc = DosReadQueue(hTermQ, &rq, &ulLength, (PPVOID)&pTermInfo, 0,
-                                DCWW_NOWAIT, &bPriority, hWaitChildSem);
+                                DCWW_NOWAIT, &bPriority, hTermQSem);
               if (rc == ERROR_QUE_EMPTY) {
                 DosSleep(50);//05 Aug 07 GKY 100
@@ -1215 +1210 @@
 
             if (pTermInfo->usSessID == ulSessID) {
-              DosPostEventSem(hWaitChildSem); //Posted to WaitChildThread (arccnrs.c)
-                break;                    // Our session is done
+              priority_bumped();
+              break;                    // Our session is done
             }