Changeset 846 for trunk/dll/comp.c

Timestamp:

Sep 27, 2007, 11:16:00 PM (18 years ago)

Author:

Steven Levine

Message:

Correct ULONGLONG size formatting to avoid traps

File:

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

trunk/dll/comp.c

@@ -36 +36 @@
   20 Aug 07 SHL Revert to DosSleep(0)
   20 Aug 07 SHL Use GetMSecTimer for timing
+  20 Aug 07 SHL A few more speed up tweaks.  Some experimental timing code
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
+  27 Sep 07 SHL Correct ULONGLONG size formatting
 
 ***********************************************************************/
@@ -121 +123 @@
           strcpy(enddir, pffb->achName);
           if (!(pffb->attrFile & FILE_DIRECTORY))
+            // 27 Sep 07 SHL fixme to use CommaFmtULL
             fprintf(fp,
-                    "\"%s\",%u,%lu,%04u/%02u/%02u,%02u:%02u:%02u,%lu,%lu,N\n",
+                    "\"%s\",%u,%llu,%04u/%02u/%02u,%02u:%02u:%02u,%lu,%lu,N\n",
                     mask,
                     enddir - mask,
@@ -132 +135 @@
                     pffb->ftimeLastWrite.minutes,
                     pffb->ftimeLastWrite.twosecs,
-                    pffb->attrFile, (pffb->cbList > 4) ? (pffb->cbList / 2) : 0);
+                    pffb->attrFile,
+                    pffb->cbList > 4 ? pffb->cbList / 2 : 0);
           // Skip . and ..
           else if (recurse &&
@@ -372 +376 @@
 
   case WM_DESTROY:
-    DosSleep(50);//05 Aug 07 GKY 100
+    DosSleep(50);                       // 05 Aug 07 GKY 100
     break;
   }
@@ -482 +486 @@
               else
                 cmp->cmp->totalright--;
-              DosSleep(0); //8-26-07 GKY 1
+              DosSleep(0);              // 8-26-07 GKY 1
             }
             break;
@@ -750 +754 @@
     return;
   }
+
+  // DbgMsg(pszSrcFile, __LINE__, "FillDirList start %s", str);
 
   maskstr = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
@@ -816 +822 @@
 
     DosFindClose(hDir);
-    DosSleep(1);
+    DosSleep(0);
   }
 
@@ -826 +832 @@
   free(maskstr);
   free(pffbArray);
+
+  // DbgMsg(pszSrcFile, __LINE__, "FillDirList finish %s", str);
 }
 
@@ -836 +844 @@
 
   return stricmp(fl1->fname, fl2->fname);
+}
+
+// 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);
+  }
 }
 
@@ -847 +894 @@
   BOOL notified = FALSE;
 
+#if 0
   ULONG lastMSec = GetMSecTimer();
   ULONG ul;
+#endif
 
   HWND hwndLeft, hwndRight;
@@ -858 +907 @@
     _endthread();
   }
+
+  // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread enter");
 
   DosError(FERR_DISABLEHARDERR);
@@ -873 +924 @@
       INT l;
       INT r;
-      ULONG cntr;
+      UINT cntr;
       FILELIST **filesl = NULL;
       FILELIST **filesr = NULL;
@@ -916 +967 @@
       if (filesl)
         qsort(filesl, numfilesl, sizeof(CHAR *), CompNames);
+
+      // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread sorted filesl");
 
       // Build list of all files in right directory
@@ -997 +1050 @@
                       if (p) {
                         p++;
+                        // 27 Sep 07 SHL fixme to do ULONGLONG conversion
                         fb4.cbFile = atol(p);
                         p = strchr(p, ',');
@@ -1062 +1116 @@
         qsort(filesr, numfilesr, sizeof(CHAR *), CompNames);
 
+      // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread sorted filesr");
+
       // We now have two lists of files, both sorted.
       // Count total number of container entries required on each side
@@ -1115 +1171 @@
 
       if (recsNeeded) {
+
+        // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread filling");
 
         pcil = pcilFirst;
@@ -1324 +1382 @@
             DosSleep(0);
           cntr++;
-#else
-          if ((cntr++ % 500) == 0) {
+#endif
+#if 0                                   // 20 Aug 07 SHL
+          if (cntr++ % 256 == 0) {
             ul = GetMSecTimer();
-            if (ul - lastMSec >= 1000) {
+            if (ul - lastMSec >= 200) {
               lastMSec = ul;
               DosSleep(1);
             }
           }
+#endif
+#if 1                                   // 20 Aug 07 SHL
+          SleepIfNeeded(0, 500, 1);
 #endif
 
@@ -1381 +1443 @@
         cmp->cmp->totalright = numfilesr;
 
+        // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread filled");
+
       } // if recsNeeded
 
       Deselect(hwndLeft);
       Deselect(hwndRight);
+
+      // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread deselected");
 
       if (!PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID))
         WinSendMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
       notified = TRUE;
+
+      // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread FILLED posted");
 
       if (filesl)
@@ -1404 +1472 @@
   free(cmp);
   DosPostEventSem(CompactSem);
+
+  // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread exit");
 }
 
@@ -1409 +1479 @@
 #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 ===
@@ -1621 +1720 @@
       CHAR s[81];
 
+      // DbgMsg(pszSrcFile, __LINE__, "CompareDlgProc UM_CONTAINER_FILLED enter");
+
       cmp->filling = FALSE;
       WinEnableWindow(hwndLeft, TRUE);
@@ -1670 +1771 @@
       else
         WinSetDlgItemText(hwnd, COMP_NOTE, GetPString(IDS_COMPREADYTEXT));
+
+      // DbgMsg(pszSrcFile, __LINE__, "CompareDlgProc UM_CONTAINER_FILLED exit");
+
     }
     break;
@@ -1848 +1952 @@
                 }
                 if (SHORT1FROMMP(mp1) == COMP_LEFTDIR) {
-                  if (WinIsWindowEnabled(hwndLeft) || !(cmp->selleft % 50)) {
+                  // if (WinIsWindowEnabled(hwndLeft) || !(cmp->selleft % 50)) {
+                  if (WinIsWindowEnabled(hwndLeft) || NeedGUIUpdate(0)) {
                     sprintf(s, " %d", cmp->selleft);
                     WinSetDlgItemText(hwnd, COMP_SELLEFT, s);
@@ -1854 +1959 @@
                 }
                 else {
-                  if (WinIsWindowEnabled(hwndRight) || !(cmp->selright % 50)) {
+                  // if (WinIsWindowEnabled(hwndRight) || !(cmp->selright % 50)) {
+                  if (WinIsWindowEnabled(hwndRight) || NeedGUIUpdate(1)) {
                     sprintf(s, " %d", cmp->selright);
                     WinSetDlgItemText(hwnd, COMP_SELRIGHT, s);