Changeset 1268 for trunk/dll/systemf.c

Timestamp:

Oct 31, 2008, 4:19:47 AM (17 years ago)

Author:

Gregg Young

Message:

Added a thread to monitor completion of unarchive to send message to open viewer fix memory allocate/free issues. It appears that it fixes ticket 58

File:

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

trunk/dll/systemf.c

@@ -60 +60 @@
 
 static PSZ pszSrcFile = __FILE__;
+
+HEV hWaitChildSem;
 
 //static HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,
@@ -690 +692 @@
   static char szTermQName[30];
   static HQUEUE hTermQ;
-  static HEV hTermQSem;
+  //static HEV hTermQSem;
 
   if (pszDirectory && *pszDirectory) {
@@ -1078 +1080 @@
           }
           else {
-            rc = DosCreateEventSem(NULL,(PHEV)&hTermQSem,0,FALSE);
+            rc = DosCreateEventSem(NULL,(PHEV)&hWaitChildSem,0,FALSE);
             if (rc) {
-                hTermQSem = (HEV)0;     // Try to survive
+                hWaitChildSem = (HEV)0;     // Try to survive
                 DosCloseQueue(hTermQ);
                 hTermQ = (HQUEUE)0;     // Try to survive
                 DosExitCritSec();
-                Dos_Error(MB_ENTER,rc,HWND_DESKTOP,pszSrcFile,__LINE__,"DoCreateEventSem");
+                Dos_Error(MB_ENTER,rc,HWND_DESKTOP,pszSrcFile,__LINE__,"DosCreateEventSem");
             }
             // if (!rc) fprintf(stderr,"%s %d qcreated ptib %x hTermQ %x\n",__FILE__, __LINE__,ptib,hTermQ);
           }
         } // if 1st time
-        useTermQ = hTermQ && hTermQSem;
+        useTermQ = hTermQ && hWaitChildSem;
         if (!rc)
           DosExitCritSec();
@@ -1130 +1132 @@
       //     sdata.PgmInputs, sdata.TermQ, sdata.InheritOpt,
       //   sdata.SessionType, szTermQName,
-      //   hTermQ, hTermQSem); fflush(stdout);
+      //   hTermQ, hWaitChildSem); fflush(stdout);
       ret = DosStartSession(&sdata, &ulSessID, &sessPID);
 
@@ -1168 +1170 @@
             if (DosSetSession(ulSessID, &sd))   // Check if session gone (i.e. finished)
               break;
-            if (ctr > 10) {
+            if (ctr > 20) {
               //   printf("%s %d thread 0x%x showing slow sess %u pid 0x%x\n",
               //        __FILE__, __LINE__,ptib->tib_ordinal,ulSessID,sessPID); fflush(stdout); // 12 Mar 07 SHL
@@ -1181 +1183 @@
             if (ctr < 20) {
               rc = DosReadQueue(hTermQ, &rq, &ulLength, (PPVOID)&pTermInfo, 0,
-                                DCWW_NOWAIT, &bPriority, hTermQSem);
+                                DCWW_NOWAIT, &bPriority, hWaitChildSem);
               if (rc == ERROR_QUE_EMPTY) {
                 DosSleep(50);//05 Aug 07 GKY 100
@@ -1204 +1206 @@
             }
 
-            //  printf("%s %d DosReadQueue thread 0x%x sess %u sessRC %u rq.pid 0x%x rq.data 0x%x\n",
-            //       __FILE__, __LINE__,ptib->tib_ordinal,pTermInfo->usSessID,pTermInfo->usRC,rq.pid, rq.ulData); fflush(stdout);
-
-            if (pTermInfo->usSessID == ulSessID)
-              break;                    // Our session is done
+              //printf("%s %d DosReadQueue thread 0x%x sess %u sessRC %u rq.pid 0x%x rq.data 0x%x\n",
+              //     __FILE__, __LINE__,ptib->tib_ordinal,pTermInfo->usSessID,pTermInfo->usRC,rq.pid, rq.ulData); fflush(stdout);
+
+            if (pTermInfo->usSessID == ulSessID) {
+              DosPostEventSem(hWaitChildSem);
+                break;                    // Our session is done
+            }
 
             // Requeue session for other thread