Changeset 1274 for trunk/dll/systemf.c

Timestamp:

Nov 11, 2008, 1:16:14 AM (17 years ago)

Author:

Gregg Young

Message:

Clean up of system.c changes to reflect final fix for ticket 58

File:

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

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)
 
 ***********************************************************************/
@@ -1086 +1084 @@
                 hTermQ = (HQUEUE)0;     // Try to survive
                 DosExitCritSec();
-                Dos_Error(MB_ENTER,rc,HWND_DESKTOP,pszSrcFile,__LINE__,"DosCreateEventSem");
+                Dos_Error(MB_ENTER,rc,HWND_DESKTOP,pszSrcFile,__LINE__,"DoCreateEventSem");
             }
             // if (!rc) fprintf(stderr,"%s %d qcreated ptib %x hTermQ %x\n",__FILE__, __LINE__,ptib,hTermQ);
@@ -1132 +1130 @@
       //     sdata.PgmInputs, sdata.TermQ, sdata.InheritOpt,
       //   sdata.SessionType, szTermQName,
-      //   hTermQ, ); fflush(stdout);
+      //   hTermQ, hTermQSem); fflush(stdout);
       ret = DosStartSession(&sdata, &ulSessID, &sessPID);
 
@@ -1170 +1168 @@
             if (DosSetSession(ulSessID, &sd))   // Check if session gone (i.e. finished)
               break;
-            if (ctr > 20) {
+            if (ctr > 10) {
               //   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
@@ -1206 +1204 @@
             }
 
-              //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) {
+            //  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
-            }
 
             // Requeue session for other thread