Changeset 907 for trunk/dll/comp.c

Timestamp:

Jan 6, 2008, 8:26:17 AM (18 years ago)

Author:

Steven Levine

Message:

Avoid out of memory traps in Compare Directories
Rework Compare Directories progress display for 2 second update rate
Start refactoring to reduce dependence on fm3dll.h
Add timer services (IsITimerExpired etc.)

File:

• trunk/dll/comp.c (modified) (39 diffs)

trunk/dll/comp.c

@@ -7 +7 @@
 
   Copyright (c) 1993-02 M. Kimes
-  Copyright (c) 2003, 2007 Steven H. Levine
+  Copyright (c) 2003, 2008 Steven H. Levine
 
   16 Oct 02 MK Baseline
@@ -40 +40 @@
   27 Sep 07 SHL Correct ULONGLONG size formatting
   30 Dec 07 GKY Use TestCDates for compare by file date/time
+  04 Jan 08 SHL Avoid traps if CM_ALLOCRECORD returns less that requested
+  05 Jan 08 SHL Use WM_TIMER for progress messaging
+  05 Jan 08 SHL Use ITIMER_DESC for hogging control
 
 ***********************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <share.h>
+#include <io.h>
+#include <process.h>                    // _beginthread
 
 #define INCL_DOS
@@ -48 +57 @@
 #define INCL_GPI
 #define INCL_LONGLONG
-#include <os2.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <share.h>
-#include <io.h>
-#include <process.h>                    // _beginthread
-
-#include "fm3dll.h"
+
 #include "fm3dlg.h"
 #include "fm3str.h"
+#include "pathutil.h"                   // BldFullPathName
+#include "filldir.h"                    // EmptyCnr...
+#include "makelist.h"                   // AddToFileList...
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "tmrsvcs.h"                    // IsITimerExpired
+#include "comp.h"
+#include "fm3dll.h"
 
 typedef struct
@@ -71 +78 @@
 
 static PSZ pszSrcFile = __FILE__;
-
-/**
- * Build full path name in callers buffer given directory
- * name and filename
- * @param pszPathName points to drive/directory if not NULL
- * @returns pointer to full path name in caller's buffer
- * @note OK for pszFullPathName and pszPathName to point to same buffer
- *
- */
-
-PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
-{
-  UINT c = pszPathName ? strlen(pszPathName) : 0;
-  if (c > 0) {
-    memcpy(pszFullPathName, pszPathName, c);
-    if (pszFullPathName[c - 1] != '\\')
-      pszFullPathName[c++] = '\\';
-  }
-  strcpy(pszFullPathName + c, pszFileName);
-  return pszFullPathName;
-}
 
 //=== SnapShot() Write directory tree to file and recurse if requested ===
@@ -116 +102 @@
       // 13 Aug 07 SHL fixme to report errors
       if (!xDosFindFirst(mask,
-                         &hdir,
+                         &hdir,
                          FILE_NORMAL | FILE_DIRECTORY |
                          FILE_ARCHIVED | FILE_READONLY | FILE_HIDDEN |
@@ -450 +436 @@
                         MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 
+      WinStartTimer(hab, cmp->hwnd, ID_TIMER, 2000);
+
       while (pci && (INT)pci != -1 && pciD && (INT)pciD != -1) {
 
@@ -675 +663 @@
       } // while
     Abort:
+      WinStopTimer(hab, cmp->hwnd, ID_TIMER);
       WinDestroyMsgQueue(hmq);
     }
+    PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1L), MPVOID);
+    PostMsg(cmp->hwnd, WM_COMMAND, MPFROM2SHORT(IDM_DESELECTALL, 0), MPVOID);
     DecrThreadUsage();
     WinTerminate(hab);
   }
-  PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1L), MPVOID);
-  PostMsg(cmp->hwnd, WM_COMMAND, MPFROM2SHORT(IDM_DESELECTALL, 0), MPVOID);
   free(cmp);
 }
@@ -707 +696 @@
       IncrThreadUsage();
       priority_normal();
+      WinStartTimer(hab, cmp->hwnd, ID_TIMER, 2000);
       switch (cmp->action) {
       case IDM_INVERT:
@@ -724 +714 @@
         break;
       }
+      WinStopTimer(hab, cmp->hwnd, ID_TIMER);
       if (!PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1L), MPVOID))
         WinSendMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1L), MPVOID);
@@ -738 +729 @@
  */
 
-static VOID FillDirList(CHAR *str, INT skiplen, BOOL recurse,
-                        FILELIST ***list, INT *numfiles, INT *numalloc)
+static VOID FillDirList(CHAR *str, UINT skiplen, BOOL recurse,
+                        FILELIST ***list, UINT *pnumfiles, UINT *pnumalloc)
 {
   CHAR *enddir;
@@ -780 +771 @@
   ulFindCnt = FilesToGet;
   rc = xDosFindFirst(maskstr, &hDir,
-                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
+                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
                      FILE_SYSTEM | FILE_HIDDEN |
                      (recurse ? FILE_DIRECTORY : 0),
@@ -799 +790 @@
               strlwr(pffbFile->achName);
             memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
-            FillDirList(maskstr, skiplen, recurse, list, numfiles, numalloc);
+            FillDirList(maskstr, skiplen, recurse, list, pnumfiles, pnumalloc);
           }
         }
@@ -809 +800 @@
           memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
           if (AddToFileList(maskstr + skiplen,
-                            pffbFile, list, numfiles, numalloc)) {
+                            pffbFile, list, pnumfiles, pnumalloc)) {
             goto Abort;
           }
@@ -847 +838 @@
 }
 
-// 20 Aug 07 SHL experimental fixme
-
-typedef struct {
-  // Caller must init
-  UINT sleepTime;               // How long to sleep
-  UINT interval;                // How often to sleep
-  // Owned by SleepIfNeeded
-  UINT modulo;                  // How often to call GetMSecTimer
-  UINT cntr;                    // Call counter
-  ULONG lastMSec;               // Last time DosSleep invoked
-} SLEEP_DESC;
-
-VOID SleepIfNeeded(BOOL id, UINT interval, UINT sleepTime)
-{
-  static ULONG lastMSec[10];
-  static UINT cntr;
-  static UINT modulo = 32;
-  BOOL yes = ++cntr >= modulo;
-
-  if (yes) {
-    ULONG newMSec = GetMSecTimer();
-    // 1st time will have large difference, but don't care
-    ULONG diff = newMSec - lastMSec[id];
-    cntr = 0;
-    yes = diff >= interval;
-    // Try to tune modulo counter to approx 12% error
-    if (yes) {
-      lastMSec[id] = newMSec;
-      if (diff >= interval + (interval / 8) && modulo > 0)
-        modulo--;
-    }
-    else {
-      if (diff < interval - (interval / 8))
-        modulo++;
-    }
-    DosSleep(sleepTime);
-  }
-}
-
 //=== FillCnrsThread() Fill left and right containers ===
 
@@ -894 +846 @@
   HMQ hmq;
   BOOL notified = FALSE;
-
-#if 0
-  ULONG lastMSec = GetMSecTimer();
-  ULONG ul;
-#endif
+  ITIMER_DESC itdSleep = { 0 };
 
   HWND hwndLeft, hwndRight;
@@ -912 +860 @@
 
   DosError(FERR_DISABLEHARDERR);
+
+  InitITimer(&itdSleep, 500);           // Sleep every 500 mSec
 
   hab = WinInitialize(0);
@@ -923 +873 @@
     else {
       INT x;
-      INT l;
-      INT r;
+      UINT l;
+      UINT r;
       UINT cntr;
       FILELIST **filesl = NULL;
       FILELIST **filesr = NULL;
-      INT numfilesl = 0;
-      INT numfilesr = 0;
-      INT numallocl = 0;
-      INT numallocr = 0;
+      UINT numfilesl = 0;
+      UINT numfilesr = 0;
+      UINT numallocl = 0;
+      UINT numallocr = 0;
       INT ret = 0;
       UINT lenl;                        // Directory prefix length
       UINT lenr;
       UINT recsNeeded;
+      UINT recsGotten;
+      UINT filesSeenL;
+      UINT filesSeenR;
       PCNRITEM pcilFirst;
       PCNRITEM pcirFirst;
+      PCNRITEM pcilLast;
+      PCNRITEM pcirLast;
       PCNRITEM pcil;
       PCNRITEM pcir;
@@ -945 +900 @@
       WinCancelShutdown(hmq, TRUE);
       IncrThreadUsage();
+      WinStartTimer(hab, cmp->hwnd, ID_TIMER, 2000);
+
       hwndLeft = WinWindowFromID(cmp->hwnd, COMP_LEFTDIR);
       hwndRight = WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR);
@@ -965 +922 @@
         strupr(cmp->leftdir);
       FillDirList(cmp->leftdir, lenl, cmp->includesubdirs,
-                  &filesl, &numfilesl, &numallocl);
+                  &filesl, &cmp->cmp->totalleft, &numallocl);
+      numfilesl = cmp->cmp->totalleft;
 
       if (filesl)
@@ -979 +937 @@
           strupr(cmp->rightdir);
         FillDirList(cmp->rightdir, lenr, cmp->includesubdirs,
-                    &filesr, &numfilesr, &numallocr);
+                    &filesr, &cmp->cmp->totalright, &numallocr);
+        numfilesr = cmp->cmp->totalright;
       }
       else {
@@ -1144 +1103 @@
       } // while
 
+      // Say building list - fixme to post?
       WinSendMsg(cmp->hwnd, UM_CONTAINERHWND, MPVOID, MPVOID);
 
@@ -1178 +1138 @@
         pcil = pcilFirst;
         pcir = pcirFirst;
+        pcilLast = 0;
+        pcirLast = 0;
+
+        recsGotten = 0;
+        filesSeenL = 0;
+        filesSeenR = 0;
+
         while ((filesl && filesl[l]) || (filesr && filesr[r])) {
+
+          // 03 Jan 08 SHL fixme to have user friendly message
+          if (!pcil) {
+            Runtime_Error(pszSrcFile, __LINE__, "pcil short %u/%u",
+                          recsGotten, recsNeeded);
+            break;
+          }
+
+          // 03 Jan 08 SHL fixme to have user friendly message
+          if (!pcir) {
+            Runtime_Error(pszSrcFile, __LINE__, "pcir short %u/%u",
+                          recsGotten, recsNeeded);
+            break;
+          }
+          recsGotten++;
           pcir->hwndCnr = hwndRight;
           pcir->rc.hptrIcon = (HPOINTER) 0;
@@ -1195 +1177 @@
           if (x <= 0) {
             // File appears on left side
+            filesSeenL++;
             BldFullPathName(szBuf, cmp->leftdir, filesl[l]->fname);
             //sprintf(szBuf, "%s%s%s", cmp->leftdir,
@@ -1233 +1216 @@
           if (x >= 0) {
             // File appears on right side
+            filesSeenR++;
             BldFullPathName(szBuf, cmp->rightdir, filesr[r]->fname);
             //sprintf(szBuf, "%s%s%s", cmp->rightdir,
@@ -1291 +1275 @@
               strcpy(pch, GetPString(IDS_SMALLERTEXT));
               pch += 7;
-            }
-            ret = TestCDates(&pcir->date, &pcir->time,
-                             &pcil->date, &pcil->time);
-            if (ret == 1)
-              /*((pcil->date.year > pcir->date.year) ? TRUE :
+            }
+            ret = TestCDates(&pcir->date, &pcir->time,
+                             &pcil->date, &pcil->time);
+            if (ret == 1)
+              /*((pcil->date.year > pcir->date.year) ? TRUE :
                 (pcil->date.year < pcir->date.year) ? FALSE :
                 (pcil->date.month > pcir->date.month) ? TRUE :
@@ -1316 +1300 @@
               pch += 5;
             }
-            else if (ret == -1)
-              /*((pcil->date.year < pcir->date.year) ? TRUE :
+            else if (ret == -1)
+              /*((pcil->date.year < pcir->date.year) ? TRUE :
                      (pcil->date.year > pcir->date.year) ? FALSE :
                      (pcil->date.month < pcir->date.month) ? TRUE :
@@ -1382 +1366 @@
             pcir->pszDispAttr = NullStr;
 
-#if 0                                   // 20 Aug 07 SHL fixme to be gone
-          if (!(cntr % 500))
-            DosSleep(1);
-          else if (!(cntr % 50))
-            DosSleep(0);
-          cntr++;
-#endif
-#if 0                                   // 20 Aug 07 SHL
-          if (cntr++ % 256 == 0) {
-            ul = GetMSecTimer();
-            if (ul - lastMSec >= 200) {
-              lastMSec = ul;
-              DosSleep(1);
-            }
-          }
-#endif
-#if 1                                   // 20 Aug 07 SHL
-          SleepIfNeeded(0, 500, 1);
-#endif
-
+          // Avoid hogging systems
+          SleepIfNeeded(&itdSleep, 0);
+
+          pcilLast = pcil;
+          pcirLast = pcir;
           pcil = (PCNRITEM) pcil->rc.preccNextRecord;
           pcir = (PCNRITEM) pcir->rc.preccNextRecord;
 
+          // Show running totals every 2 seconds
+          cmp->cmp->totalleft = filesSeenL;
+          cmp->cmp->totalright = filesSeenR;
+
         } // while filling left or right
+
+        // If stopped early CM_ALLOCATERECORD partially failed
+        // Free up container records we did not use on other side
+        // Free up filesl/filer entries we skipped
+        if (recsGotten < recsNeeded) {
+          if (pcil) {
+            pcilLast->rc.preccNextRecord = NULL;
+            FreeCnrItemList(hwndLeft, pcil);
+          }
+          if (filesl) {
+            while (filesl[l]) {
+              free(filesl[l]);
+              l++;
+            }
+          }
+          if (pcir) {
+            pcirLast->rc.preccNextRecord = NULL;
+            FreeCnrItemList(hwndRight, pcir);
+          }
+          if (filesr) {
+            while (filesr[r]) {
+              free(filesr[r]);
+              r++;
+            }
+          }
+          // Reduce counts to match what is in container
+          if (numfilesl > filesSeenL)
+            numfilesl = filesSeenL;
+          if (numfilesr > filesSeenR)
+            numfilesr = filesSeenR;
+          recsNeeded = recsGotten;
+        } // if insufficient resources
+
 
         if (filesl)
@@ -1413 +1419 @@
           free(filesr);
         filesr = NULL;
-        // Insert 'em
+
+        // Say inserting
         WinSendMsg(cmp->hwnd, UM_CONTAINERDIR, MPVOID, MPVOID);
 
+        // Insert left side
         memset(&ri, 0, sizeof(RECORDINSERT));
         ri.cb = sizeof(RECORDINSERT);
@@ -1430 +1438 @@
         }
 
+        // Insert right side
         memset(&ri, 0, sizeof(RECORDINSERT));
         ri.cb = sizeof(RECORDINSERT);
@@ -1453 +1462 @@
       } // if recsNeeded
 
+      WinStopTimer(hab, cmp->hwnd, ID_TIMER);
+
       Deselect(hwndLeft);
       Deselect(hwndRight);
@@ -1458 +1469 @@
       // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread deselected");
 
+      // Request window update
       if (!PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID))
         WinSendMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
@@ -1470 +1482 @@
 
       WinDestroyMsgQueue(hmq);
-    }
+    } // if have queue
+    if (!notified)
+      PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
     DecrThreadUsage();
     WinTerminate(hab);
   }
-  if (!notified)
-    PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
   free(cmp);
   DosPostEventSem(CompactSem);
@@ -1485 +1497 @@
 #define hwndLeft        (WinWindowFromID(hwnd,COMP_LEFTDIR))
 #define hwndRight       (WinWindowFromID(hwnd,COMP_RIGHTDIR))
-
-// 20 Aug 07 SHL fixme experimental
-
-BOOL NeedGUIUpdate(BOOL id)
-{
-  static ULONG lastMSec[10];
-  static UINT cntr;
-  static UINT modulo = 32;
-  BOOL yes = ++cntr >= modulo;
-
-  if (yes) {
-    ULONG newMSec = GetMSecTimer();
-    // 1st time will have large difference, but don't care
-    ULONG diff = newMSec - lastMSec[id];
-    cntr = 0;
-    yes = diff >= 500;
-    // Try to tune modulo counter to 10% error
-    if (yes) {
-      lastMSec[id] = newMSec;
-      if (diff >= 550 && modulo > 0)
-        modulo--;
-    }
-    else {
-      if (diff < 450)
-        modulo++;
-    }
-  }
-  return yes;
-}
 
 //=== CompareDlgProc() Compare directories dialog procedure ===
@@ -1521 +1504 @@
   COMPARE *cmp;
   BOOL temp;
+  CHAR s[81];
 
   static HPOINTER hptr;
@@ -1710 +1694 @@
 
   case UM_CONTAINERHWND:
+    // Building list
     WinSetDlgItemText(hwnd, COMP_NOTE, GetPString(IDS_COMPHOLDBLDLISTTEXT));
     return 0;
 
   case UM_CONTAINERDIR:
+    // Filling container
     WinSetDlgItemText(hwnd, COMP_NOTE, GetPString(IDS_COMPHOLDFILLCNRTEXT));
     return 0;
+
+  case WM_TIMER:
+    // Show current totals
+    cmp = INSTDATA(hwnd);
+    if (!cmp) {
+      Runtime_Error(pszSrcFile, __LINE__, "pCompare NULL");
+      WinDismissDlg(hwnd, 0);
+    }
+    else {
+      // 05 Jan 08 SHL fixme to use timer id to optimize output
+      sprintf(s, " %d", cmp->totalleft);
+      WinSetDlgItemText(hwnd, COMP_TOTALLEFT, s);
+      sprintf(s, " %d", cmp->totalright);
+      WinSetDlgItemText(hwnd, COMP_TOTALRIGHT, s);
+      sprintf(s, " %d", cmp->selleft);
+      WinSetDlgItemText(hwnd, COMP_SELLEFT, s);
+      sprintf(s, " %d", cmp->selright);
+      WinSetDlgItemText(hwnd, COMP_SELRIGHT, s);
+    }
+    break;
 
   case UM_CONTAINER_FILLED:
@@ -1724 +1730 @@
     }
     else {
-      CHAR s[81];
 
       // DbgMsg(pszSrcFile, __LINE__, "CompareDlgProc UM_CONTAINER_FILLED enter");
@@ -1938 +1943 @@
               else {
 
-                CHAR s[81];
-
                 cmp = INSTDATA(hwnd);
                 if (pci->rc.flRecordAttr & CRA_SELECTED) {
@@ -1955 +1958 @@
                     if (cmp->selright)
                       cmp->selright--;
-                  }
-                }
-                if (SHORT1FROMMP(mp1) == COMP_LEFTDIR) {
-                  // if (WinIsWindowEnabled(hwndLeft) || !(cmp->selleft % 50)) {
-                  if (WinIsWindowEnabled(hwndLeft) || NeedGUIUpdate(0)) {
-                    sprintf(s, " %d", cmp->selleft);
-                    WinSetDlgItemText(hwnd, COMP_SELLEFT, s);
-                  }
-                }
-                else {
-                  // if (WinIsWindowEnabled(hwndRight) || !(cmp->selright % 50)) {
-                  if (WinIsWindowEnabled(hwndRight) || NeedGUIUpdate(1)) {
-                    sprintf(s, " %d", cmp->selright);
-                    WinSetDlgItemText(hwnd, COMP_SELRIGHT, s);
                   }
                 }
@@ -2180 +2169 @@
             fakelist[2] = NULL;
             ExecOnList(hwnd, compare,
-                       WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL,
-                       pszSrcFile, __LINE__);
+                       WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL,
+                       pszSrcFile, __LINE__);
           }
           else {