Changeset 1270 for trunk/dll

Timestamp:

Nov 8, 2008, 9:48:24 PM (17 years ago)

Author:

Gregg Young

Message:

Comments and code cleanup for WaitChildThread solution to hang cused by viewer opening before archiver process closes (Ticket 58)

Location:

trunk/dll

Files:

• arccnrs.c (modified) (5 diffs)
• systemf.c (modified) (3 diffs)

trunk/dll/arccnrs.c

@@ -59 +59 @@
   25 Aug 08 GKY Check TMP directory space warn if lee than 5 MiB prevent archiver from opening if
                 less than 10 KiB (It hangs and can't be closed)
+  08 Nov 08 GKY Add WaitChildThread to fix hang caused by viewer trying to open a file before
+                the archiver process closes. (Ticket 58)
 
 ***********************************************************************/
@@ -165 +167 @@
 WAITCHILD;
 
+// Creates a thread to wait for a child process to complete then posts a message and closes
 VOID WaitChildThread(VOID * arg)
 {
   WAITCHILD *WaitChild;
-  ULONG clPosted;
   HAB thab;
   CHAR *filename;
@@ -187 +189 @@
       DosWaitEventSem(hWaitChildSem, SEM_INDEFINITE_WAIT);
       priority_bumped();
-      DosResetEventSem(hWaitChildSem, &clPosted);
       if (IsFile(WaitChild->filename) == 1)
         PostMsg(WaitChild->hwndCnr, UM_ENTER, MPFROMP(filename), MPVOID);
@@ -1585 +1586 @@
           p++;
         }
-        //printf("%s %d UM_ENTER %s %x\n",__FILE__, __LINE__,WaitChild->filename, dcd->hwndCnr); fflush(stdout);        // 10 Mar 07 SHL hang
-        free(s);
+        free(s);
         WaitChild->hwndCnr = dcd->hwndCnr;
         rc = _beginthread(WaitChildThread, NULL, 65536, WaitChild);
@@ -1597 +1597 @@
             DosSleep(100);  // Allow unzip session to finish closing 14 Mar 07 SHL
 #endif
-          //DosWaitEventSem(hWaitChildSem, SEM_INDEFINITE_WAIT);
-          //WinSendMsg(WaitChild->hwndCnr, UM_ENTER, MPFROMP(WaitChild->filename), MPVOID);
+          //WinSendMsg(WaitChild->hwndCnr, UM_ENTER, MPFROMP(filename), MPVOID);
 
       }

trunk/dll/systemf.c

@@ -24 +24 @@
   26 May 08 SHL Use uiLineNumber correctly
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory or pTmpDir and use MakeTempName
+  08 Nov 08 GKY Post an event semaphore to WaitChildThread to fix hang caused by viewer trying
+                to open a file before the archiver process closes. (Ticket 58)
 
 ***********************************************************************/
@@ -1179 +1181 @@
         }
         else {
+          ULONG clPosted;
+
+          DosResetEventSem(hWaitChildSem, &clPosted);
           for (ctr = 0;; ctr++)
           {
@@ -1210 +1215 @@
 
             if (pTermInfo->usSessID == ulSessID) {
-              DosPostEventSem(hWaitChildSem);
+              DosPostEventSem(hWaitChildSem); //Posted to WaitChildThread (arccnrs.c)
                 break;                    // Our session is done
             }