Changeset 948 for trunk/dll/grep.c

Timestamp:

Feb 12, 2008, 6:20:47 AM (18 years ago)

Author:

Steven Levine

Message:

Rework collector progress reporting and improve performance (ticket #79)

File:

• trunk/dll/grep.c (modified) (56 diffs)

trunk/dll/grep.c

@@ -9 +9 @@
   Copyright (c) 2001, 2008 Steven H. Levine
 
-  12 Feb 03 SHL insert_grepfile: standardize EA math
+  12 Feb 03 SHL InsertGrepFile: standardize EA math
   12 Feb 03 SHL doonefile: standardize EA math
   25 May 05 SHL Rework for ULONGLONG
@@ -27 +27 @@
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
   21 Sep 07 GKY Fix trap on search that includes filenames that exceed maxpath
+  07 Feb 08 SHL Use ITIMER_DESC to control sleeps and reporting
 
 ***********************************************************************/
@@ -47 +48 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "tmrsvcs.h"                    // ITIMER_DESC
 #include "fm3dll.h"
 
@@ -53 +55 @@
 static PSZ pszSrcFile = __FILE__;
 
-static VOID doallsubdirs(GREP *grep, CHAR *searchPath, BOOL recursing,
-                         char **fle, int numfls);
-static INT domatchingfiles(GREP *grep, CHAR *path, char **fle, int numfls);
-static BOOL doonefile(GREP *grep, CHAR *fileName, FILEFINDBUF4L *pffb);
-static BOOL doinsertion(GREP *grep);
+static VOID DoAllSubdirs(GREP *grep,
+                         CHAR *searchPath,
+                         BOOL recursing,
+                         char **fle,
+                         UINT numfls,
+                         ITIMER_DESC *pitdSleep,
+                         ITIMER_DESC *pitdReport);
+static INT DoMatchingFiles(GREP *grep,
+                           CHAR *path,
+                           CHAR **fle,
+                           UINT numfls,
+                           ITIMER_DESC *pitdSleep,
+                           ITIMER_DESC *pitdReport);
+static BOOL DoOneFile(GREP *grep,
+                      CHAR *fileName,
+                      FILEFINDBUF4L *pffb,
+                      ITIMER_DESC *pitdSleep,
+                      ITIMER_DESC *pitdReport);
+static BOOL DoInsertion(GREP *grep,
+                        ITIMER_DESC *pitdSleep,
+                        ITIMER_DESC *pitdReport);
 static BOOL InsertDupe(GREP *grep, CHAR *dir, FILEFINDBUF4L *pffb);
-static VOID FillDupes(GREP *grep);
+static VOID FillDupes(GREP *grep,
+                      ITIMER_DESC *pitdSleep,
+                      ITIMER_DESC *pitdReport);
+
 static VOID FreeDupes(GREP *grep);
 
@@ -69 +90 @@
 static INT monthdays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
-ULONG SecsSince1980(FDATE * date, FTIME * time)
+ULONG SecsSince1980(FDATE *date, FTIME *time)
 {
   ULONG total = 0;
-  register int x;
+  UINT x;
 
   for (x = 1980; x < date->year + 1980; x++) {
@@ -98 +119 @@
  */
 
-static BOOL m_match(CHAR * string, CHAR * pattern, BOOL absolute, BOOL ignore,
+static BOOL m_match(CHAR *string, CHAR *pattern, BOOL absolute, BOOL ignore,
                     LONG len)
 {
@@ -214 +235 @@
 }
 
-static BOOL match(CHAR * string, CHAR * patterns, BOOL absolute, BOOL ignore,
-                  LONG len, ULONG numlines, CHAR * matched, BOOL matchall)
+static BOOL match(CHAR *string, CHAR *patterns, BOOL absolute, BOOL ignore,
+                  LONG len, ULONG numlines, CHAR *matched, BOOL matchall)
 {
   BOOL ret = FALSE;
@@ -235 +256 @@
 }
 
-VOID GrepThread(VOID * arg)
+VOID GrepThread(VOID *arg)
 {
   HAB ghab;
   HMQ ghmq;
   GREP grep;
-  register INT x, numfls;
-  static CHAR *fle[512];
+  UINT x;
+  UINT numfls;
+  static CHAR *fle[512];                // 06 Feb 08 SHL fixme to not be static
   CHAR *p, *pp, searchPath[CCHMAXPATH * 2];
+
+  ITIMER_DESC itdSleep = { 0 };         // 06 Feb 08 SHL
+  ITIMER_DESC itdReport = { 0 };
 
   if (!arg) {
@@ -261 +286 @@
       WinCancelShutdown(ghmq, TRUE);
       IncrThreadUsage();
-      DosSleep(100); //05 Aug 07 GKY 128
-      WinSetWindowText(grep.hwndCurFile,
-                       GetPString((grep.finddupes) ?
-                                  IDS_GREPDUPETEXT : IDS_GREPSCANTEXT));
+      // DosSleep(100); //05 Aug 07 GKY 128     // 07 Feb 08 SHL
+      // hwndStatus does not exist for applet
+      WinSetWindowText(hwndStatus ? hwndStatus : grep.hwndCurFile,
+                       GetPString(grep.finddupes ? IDS_GREPDUPETEXT :
+                                                   IDS_GREPSCANTEXT));
 
       pp = grep.searchPattern;
@@ -293 +319 @@
 
       grep.anyexcludes = FALSE;
-      numfls = x = 0;
+      numfls = 0;
       fle[numfls++] = strtok(grep.tosearch, ";");
+
       while ((fle[numfls] = strtok(NULL, ";")) != NULL && numfls < 511) {
         if (*fle[numfls] == '/')
@@ -301 +328 @@
       }
 
-      while (x < numfls) {              // loop through search masks
+      InitITimer(&itdSleep, 500);       // Sleep every 500 mSec
+      InitITimer(&itdReport, 2000);     // Report every 2 sec
+
+      // loop through search masks
+      for (x = 0; x < numfls; x++) {
 
         if (*fle[x] == '/')             // is an exclude mask only
@@ -326 +357 @@
             strcpy(grep.fileMask, p);
           }
-          if (*p == '\\') {             // got a 'full' path
-
+          if (*p == '\\') {
+            // got a 'full' path
             CHAR temp;
 
@@ -344 +375 @@
           break;
         // do single directory
-        domatchingfiles(&grep, searchPath, fle, numfls);
+        DoMatchingFiles(&grep, searchPath, fle, numfls, &itdSleep, &itdReport);
         if (grep.dirFlag)               // do subdirs
-          doallsubdirs(&grep, searchPath, FALSE, fle, numfls);
+          DoAllSubdirs(&grep, searchPath, FALSE, fle, numfls, &itdSleep, &itdReport);
       ExcludeSkip:
         if (*grep.stopflag)
           break;
-        x++;
         if (WinIsWindow(grep.ghab, grep.hwndFiles))
-          doinsertion(&grep);           // insert any remaining objects
-      } // while
+          DoInsertion(&grep, &itdSleep, &itdReport);    // insert any remaining objects
+      } // for
 
       if (WinIsWindow(grep.ghab, grep.hwndFiles))
-        doinsertion(&grep);             // insert any remaining objects
-
-      if (WinIsWindow(grep.ghab, grep.hwndFiles) && grep.finddupes &&
+        DoInsertion(&grep, &itdSleep, &itdReport);      // insert any remaining objects
+
+      if (WinIsWindow(grep.ghab, grep.hwndFiles) &&
+          grep.finddupes &&
           !*grep.stopflag)
-        FillDupes(&grep);
+      {
+        FillDupes(&grep, &itdSleep, &itdReport);
+      }
 
       if (!PostMsg(grep.hwndFiles, UM_CONTAINER_FILLED, MPVOID, MPVOID))        // tell window we're done
@@ -375 +408 @@
   if (grep.numlines && grep.matched)
     free(grep.matched);
+  // 07 Feb 08 SHL fixme to free grep here when not static
   DosPostEventSem(CompactSem);
 }
 
-static BOOL IsExcluded(char *name, char **fle, int numfls)
-{
-  int x;
-  char *n;
+static BOOL IsExcluded(CHAR *name, CHAR **fle, UINT numfls)
+{
+  UINT x;
+  CHAR *n;
 
   n = strrchr(name, '\\');
@@ -399 +433 @@
 }
 
-static VOID doallsubdirs(GREP * grep, CHAR * searchPath, BOOL recursing,
-                         char **fle, int numfls)
+static VOID DoAllSubdirs(GREP *grep,
+                         CHAR *searchPath,
+                         BOOL recursing,
+                         CHAR **fle,
+                         UINT numfls,
+                         ITIMER_DESC *pitdSleep,
+                         ITIMER_DESC *pitdReport)
 {
   // process all subdirectories
@@ -437 +476 @@
         strcpy(p, ffb.achName);
         if (!grep->anyexcludes || !IsExcluded(searchPath, fle, numfls)) {
-          domatchingfiles(grep, searchPath, fle, numfls);
-          doallsubdirs(grep, searchPath, TRUE, fle, numfls);
-          DosSleep(0); //26 Aug 07 GKY 1
+          // 07 Feb 08 SHL
+          if (IsITimerExpired(pitdReport)) {
+            if (!hwndStatus)
+              WinSetWindowText(grep->hwndCurFile, searchPath);
+            else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles) {
+              CHAR s[CCHMAXPATH + 64];
+              sprintf(s, "%s %s", GetPString(IDS_SCANNINGTEXT), searchPath);
+              WinSetWindowText(hwndStatus, s);
+            }
+          }
+          DoMatchingFiles(grep, searchPath, fle, numfls, pitdSleep, pitdReport);
+          // 07 Feb 08 SHL
+          if (IsITimerExpired(pitdReport)) {
+            if (!hwndStatus)
+              WinSetWindowText(grep->hwndCurFile, searchPath);
+            else {
+              if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles) {
+                CHAR s[CCHMAXPATH + 64];
+                sprintf(s, "%s %s", GetPString(IDS_SCANNINGTEXT), searchPath);
+                WinSetWindowText(hwndStatus, s);
+              }
+            }
+          }
+          DoAllSubdirs(grep, searchPath, TRUE, fle, numfls, pitdSleep, pitdReport);
+          // DosSleep(0); //26 Aug 07 GKY 1     // 07 Feb 08 SHL
         }
       }
@@ -453 +514 @@
 }
 
-static INT domatchingfiles(GREP * grep, CHAR * path, char **fle, int numfls)
+/**
+ * Scan for files matching filespecs in single directory
+ */
+
+static INT DoMatchingFiles(GREP *grep,
+                           CHAR *path,
+                           CHAR **fle,
+                           UINT numfls,
+                           ITIMER_DESC *pitdSleep,
+                           ITIMER_DESC *pitdReport)
 {
   // process all matching files in a directory
@@ -473 +543 @@
     return 0;
 
-  // build filemask
   BldFullPathName(szFindPath, path, grep->fileMask);
-  // sprintf(szFindPath,
-  //      "%s%s%s",
-  //      path,
-  //      (path[strlen(path) - 1] == '\\') ? NullStr : "\\", grep->fileMask);
 
   MakeFullName(szFindPath);
@@ -508 +573 @@
           break;
         if (*pffbFile->achName != '.' ||
-            (pffbFile->achName[1] && pffbFile->achName[1] != '.')) {
-          strcpy(p, pffbFile->achName); // build filename
-          if (strlen(szFindPath) > CCHMAXPATH){   //21 Sep GKY check for pathnames that exceed maxpath
-            DosFindClose(findHandle);
-            free(pffbArray);
-            if (!fDone) {
-              fDone = TRUE;
-              saymsg(MB_OK | MB_ICONASTERISK,
-                     HWND_DESKTOP,
+            (pffbFile->achName[1] && pffbFile->achName[1] != '.')) {
+          strcpy(p, pffbFile->achName); // build filename
+          if (strlen(szFindPath) > CCHMAXPATH){
+            // Complain if pathnames exceeds max
+            DosFindClose(findHandle);
+            free(pffbArray);
+            if (!fDone) {
+              fDone = TRUE;
+              saymsg(MB_OK | MB_ICONASTERISK,
+                     HWND_DESKTOP,
                      GetPString(IDS_WARNINGTEXT),
-                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
-            }
+                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
+            }
             return 1;
-          }
+          }
+
+          // 07 Feb 08 SHL
+          if (IsITimerExpired(pitdReport)) {
+            if (!hwndStatus)
+              WinSetWindowText(grep->hwndCurFile, szFindPath);
+            else {
+              if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles) {
+                CHAR s[CCHMAXPATH + 64];
+                sprintf(s, "%s %s", GetPString(IDS_SCANNINGTEXT), szFindPath);
+                WinSetWindowText(hwndStatus, s);
+              }
+            }
+          }
+
           if (!grep->anyexcludes || !IsExcluded(szFindPath, fle, numfls)) {
             if (!grep->finddupes)
-              doonefile(grep, szFindPath, pffbFile);
+              DoOneFile(grep, szFindPath, pffbFile, pitdSleep, pitdReport);
             else if (!InsertDupe(grep, szFindPath, pffbFile)) {
               DosFindClose(findHandle);
@@ -538 +618 @@
       if (*grep->stopflag)
         break;
-      DosSleep(0); //26 Aug 07 GKY 1
+      SleepIfNeeded(pitdSleep, 1);
+      // DosSleep(0); //26 Aug 07 GKY 1 // 07 Feb 08 SHL
       ulFindCnt = FilesToGet;
       rc = xDosFindNext(findHandle, pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZEL);
@@ -556 +637 @@
 }
 
-static VOID freegreplist(GREP * grep)
-{
-  INT x;
+static VOID freegreplist(GREP *grep)
+{
+  UINT x;
 
   if (grep) {
@@ -578 +659 @@
 }
 
-static BOOL doinsertion(GREP * grep)
+/**
+ * Insert record into container
+ */
+
+static BOOL DoInsertion(GREP *grep,
+                        ITIMER_DESC *pitdSleep,
+                        ITIMER_DESC *pitdReport)
 {
   RECORDINSERT ri;
   DIRCNRDATA *dcd;
   PCNRITEM pci, pciFirst;
-  INT x;
+  UINT x;
 
   if (!grep || !grep->toinsert || !grep->insertffb || !grep->dir)
     return FALSE;
+
   pci = WinSendMsg(grep->hwndFiles,
                    CM_ALLOCRECORD,
                    MPFROMLONG(EXTRA_RECORD_BYTES),
                    MPFROMLONG(grep->toinsert));
-  // 04 Jan 08 SHL fixme to complain if CM_ALLOCRECORD fails
-  if (pci) {
-    // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
-    if (grep->sayfiles)
-      WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPINSERTINGTEXT));
+  if (!pci) {
+    Win_Error(grep->hwndFiles, grep->hwndFiles, pszSrcFile, __LINE__,
+              "CM_ALLOCRECORD %u failed", grep->toinsert);
+  }
+  else {
+    if (grep->sayfiles) {
+      if (!hwndStatus)
+        WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPINSERTINGTEXT));
+      else {
+        if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+          WinSetWindowText(hwndStatus, GetPString(IDS_GREPINSERTINGTEXT));
+      }
+    }
     pciFirst = pci;
     dcd = INSTDATA(grep->hwndFiles);
@@ -602 +698 @@
                           pci, grep->dir[x], grep->insertffb[x], FALSE, dcd);
       pci = (PCNRITEM) pci->rc.preccNextRecord;
-    }
+      SleepIfNeeded(pitdSleep, 1);
+    } // for
     memset(&ri, 0, sizeof(RECORDINSERT));
     ri.cb = sizeof(RECORDINSERT);
@@ -617 +714 @@
       DosExitCritSec();
     }
-    if (grep->toinsert == FilesToGet)
-      DosSleep(0);  //26 Aug 07 GKY 1
+    SleepIfNeeded(pitdSleep, 1);
+    // if (grep->toinsert == FilesToGet)        // 07 Feb 08 SHL
+    //  DosSleep(0);  //26 Aug 07 GKY 1 // 07 Feb 08 SHL
     freegreplist(grep);
     PostMsg(grep->hwndFiles, UM_RESCAN, MPVOID, MPVOID);
@@ -627 +725 @@
 }
 
-static BOOL insert_grepfile(GREP *grep, CHAR *filename, PFILEFINDBUF4L pffb)
+/**
+ * Insert file ffb and directory name into lists
+ */
+
+static BOOL InsertGrepFile(GREP *grep,
+                           CHAR *pszFileName,
+                           PFILEFINDBUF4L pffb,
+                           ITIMER_DESC *pitdSleep,
+                           ITIMER_DESC *pitdReport)
 {
   PSZ p;
   CHAR szDirectory[CCHMAXPATH];
 
-  if (WinIsWindow(grep->ghab, grep->hwndFiles)) {
+  if (!WinIsWindow(grep->ghab, grep->hwndFiles)) {
+    // Window closed - clean up and go away
+    freegreplist(grep);
+  }
+  else {
     grep->numfiles++;
-    strcpy(szDirectory, filename);
+    strcpy(szDirectory, pszFileName);
     p = strrchr(szDirectory, '\\');
+
     if (p) {
+      // Got directory
       if (p < szDirectory + 4)
-        p++;
+        p++;                            // Include root backslash
       *p = 0;
+
       if (!grep->insertffb) {
         // Allocate 1 extra for end marker?
@@ -653 +766 @@
         }
       }
+
       grep->insertffb[grep->toinsert] =
         xmalloc(sizeof(FILEFINDBUF4L), pszSrcFile, __LINE__);
@@ -658 +772 @@
         return FALSE;
       memcpy(grep->insertffb[grep->toinsert], pffb, sizeof(FILEFINDBUF4L));
+
       grep->dir[grep->toinsert] = xstrdup(szDirectory, pszSrcFile, __LINE__);
       if (!grep->dir) {
@@ -663 +778 @@
         return FALSE;
       }
+
       grep->insertedbytes += pffb->cbFile + CBLIST_TO_EASIZE(pffb->cbList);
       grep->toinsert++;
       if (grep->toinsert == FilesToGet)
-        return doinsertion(grep);
+        return DoInsertion(grep, pitdSleep, pitdReport);
       return TRUE;
     }
   }
-  else
-    freegreplist(grep);
   return FALSE;
 }
 
-static BOOL doonefile(GREP *grep, CHAR *filename, FILEFINDBUF4L * pffb)
+/**
+ * Check file matches search criteria
+ */
+
+static BOOL DoOneFile(GREP *grep,
+                      CHAR *pszFileName,
+                      FILEFINDBUF4L *pffb,
+                      ITIMER_DESC *pitdSleep,
+                      ITIMER_DESC *pitdReport)
 {
   // process a single file
@@ -684 +806 @@
 
   grep->fileCount++;
-  if (grep->sayfiles)
-    WinSetWindowText(grep->hwndCurFile, filename);
+  if (grep->sayfiles) {
+    if (!hwndStatus)
+      WinSetWindowText(grep->hwndCurFile, pszFileName);
+    else {
+      if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+        WinSetWindowText(hwndStatus, pszFileName);
+    }
+  }
 
   if (grep->greaterthan || grep->lessthan) {
@@ -724 +852 @@
 
   if ((!grep->searchEAs && !grep->searchFiles) || !*grep->searchPattern)        // just a find
-    return insert_grepfile(grep, filename, pffb);
+    return InsertGrepFile(grep, pszFileName, pffb, pitdSleep, pitdReport);
 
   if (grep->searchEAs) {
@@ -733 +861 @@
     CHAR *data, temp;
 
-    head = GetFileEAs(filename, FALSE, TRUE);
+    head = GetFileEAs(pszFileName, FALSE, TRUE);
     if (head) {
       info = head;
       while (info && !strmatch) {
         alltext = TRUE;
-        switch (*(USHORT *) info->value) {
+        switch (*(USHORT *)info->value) {
         case EAT_ASCII:
           if (match(info->value + (sizeof(USHORT) * 2),
                     grep->searchPattern, grep->absFlag,
-                    (grep->caseFlag == FALSE),
+                    grep->caseFlag == FALSE,
                     info->cbValue - (sizeof(USHORT) * 2),
-                    grep->numlines, grep->matched, !grep->findifany)) {
+                    grep->numlines,
+                    grep->matched,
+                    !grep->findifany)) {
             strmatch = TRUE;
           }
           break;
         case EAT_MVST:
-          type = *(USHORT *) (info->value + (sizeof(USHORT) * 3));
+          type = *(USHORT *)(info->value + (sizeof(USHORT) * 3));
           if (type == EAT_ASCII) {
             data = info->value + (sizeof(USHORT) * 4);
@@ -829 +959 @@
       }                                 // while
       Free_FEAList(head);
-      DosSleep(1);
+      // DosSleep(1);                   // 07 Feb 08 SHL
     }
   }
@@ -838 +968 @@
       LONG len;
 
-      inputFile = _fsopen(filename, "rb", SH_DENYNO);
+      inputFile = _fsopen(pszFileName, "rb", SH_DENYNO);
       if (inputFile) {
         pos = ftell(inputFile);
@@ -863 +993 @@
       }
       free(input);
-      DosSleep(1);
+      // DosSleep(1);                   // 07 Feb 08 SHL
     }
   } // if
 
   if (strmatch)
-    ret = insert_grepfile(grep, filename, pffb);
+    ret = InsertGrepFile(grep, pszFileName, pffb, pitdSleep, pitdReport);
   return ret;
 }
 
-static LONG cr3tab[] = {        // CRC polynomial 0xEDB88320
+static LONG cr3tab[] = {                // CRC polynomial 0xEDB88320
 
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
@@ -940 +1070 @@
 };
 
-LONG CRCBlock(register CHAR * str, register INT blklen, register LONG crc)
+LONG CRCBlock(register CHAR *str, register INT blklen, register LONG crc)
 {
   while (blklen--) {
@@ -950 +1080 @@
 }
 
-LONG CRCFile(CHAR * filename, INT * error)
+LONG CRCFile(CHAR *pszFileName, INT *error)
 {
   LONG CRC = -1L, len;
@@ -961 +1091 @@
     *error = -1;
   else {
-    fp = _fsopen(filename, "rb", SH_DENYNO);
+    fp = _fsopen(pszFileName, "rb", SH_DENYNO);
     if (!fp)
       *error = -2;
@@ -971 +1101 @@
         else
           break;
-        DosSleep(0); //26 Aug 07 GKY 1
+        // DosSleep(0); //26 Aug 07 GKY 1       // 07 Feb 08 SHL
       }
       fclose(fp);
-      DosSleep(1);
+      // DosSleep(1);                   // 07 Feb 08 SHL
     }
     free(buffer);
@@ -1001 +1131 @@
 }
 
-int comparenamesq(const void *v1, const void *v2)
+INT comparenamesq(const VOID *v1, const VOID *v2)
 {
   DUPES *d1 = *(DUPES **) v1;
@@ -1020 +1150 @@
 }
 
-int comparenamesqe(const void *v1, const void *v2)
+INT comparenamesqe(const VOID *v1, const VOID *v2)
 {
   DUPES *d1 = *(DUPES **) v1;
   DUPES *d2 = *(DUPES **) v2;
   CHAR *p1, *p2, *p1e, *p2e, e1, e2;
-  int ret;
+  INT ret;
 
   p1 = strrchr(d1->name, '\\');
@@ -1055 +1185 @@
 }
 
-int comparesizesq(const void *v1, const void *v2)
+INT comparesizesq(const void *v1, const void *v2)
 {
   DUPES *d1 = *(DUPES **) v1;
@@ -1063 +1193 @@
 }
 
-int comparenamesb(const void *v1, const void *v2)
+INT comparenamesb(const void *v1, const void *v2)
 {
   DUPES *d1 = (DUPES *) v1;
@@ -1082 +1212 @@
 }
 
-int comparenamesbe(const void *v1, const void *v2)
+INT comparenamesbe(const VOID *v1, const VOID *v2)
 {
   DUPES *d1 = (DUPES *) v1;
   DUPES *d2 = *(DUPES **) v2;
   CHAR *p1, *p2, *p1e, *p2e, e1, e2;
-  int ret;
+  INT ret;
 
   p1 = strrchr(d1->name, '\\');
@@ -1117 +1247 @@
 }
 
-int comparesizesb(const void *v1, const void *v2)
+INT comparesizesb(const VOID *v1, const VOID *v2)
 {
   DUPES *d1 = (DUPES *) v1;
@@ -1125 +1255 @@
 }
 
-static VOID FillDupes(GREP * grep)
+static VOID FillDupes(GREP *grep,
+                      ITIMER_DESC *pitdSleep,
+                      ITIMER_DESC *pitdReport)
 {
   DUPES *c, *i, **r;
@@ -1132 +1264 @@
   UINT numfiles = 0, numalloced = 0;
   INT error;
-  register ULONG x = 0, y = 0;
-  ULONG cntr = 1000;
-
-  if (grep->CRCdupes)
-    cntr = 100;
-  i = grep->dupehead;
-  while (i) {
-    x++;
-    i = i->next;
-  }
+  ULONG x;
+  ULONG y;
+  // ULONG cntr = 1000;                 // 09 Feb 08 SHL
+
+  // if (grep->CRCdupes)                // 09 Feb 08 SHL
+  //  cntr = 100;                       // 09 Feb 08 SHL
+  x = 0;
+  for (i = grep->dupehead; i; i = i->next)
+    x++;                                // Count
+
   if (x) {
-    WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPESORTINGTEXT));
-    DosSleep(0);  //26 Aug 07 GKY 1
+    if (!hwndStatus)
+      WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPESORTINGTEXT));
+    else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+      WinSetWindowText(hwndStatus, GetPString(IDS_GREPDUPESORTINGTEXT));
+    // DosSleep(0);  //26 Aug 07 GKY 1  // 07 Feb 08 SHL
     grep->dupenames = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
     if (!grep->nosizedupes)
       grep->dupesizes = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
     if (grep->dupenames && (grep->nosizedupes || grep->dupesizes)) {
-      i = grep->dupehead;
-      while (i) {
+      y = 0;
+      for (i = grep->dupehead; i; i = i->next) {
         grep->dupenames[y] = i;
         if (!grep->nosizedupes)
           grep->dupesizes[y] = i;
-        i = i->next;
         y++;
       }
-      grep->dupenames[y] = NULL;
+      grep->dupenames[y] = NULL;        // Mark end
       if (!grep->nosizedupes)
         grep->dupesizes[y] = NULL;
-      DosSleep(0); //26 Aug 07 GKY 1
+
+      InitITimer(pitdSleep, 0);         // Reset rate estimator
+      SleepIfNeeded(pitdSleep, 1);
+      // DosSleep(0); //26 Aug 07 GKY 1 // 07 Feb 08 SHL
+
       qsort(grep->dupenames,
             x,
             sizeof(DUPES *),
-            ((grep->ignoreextdupes) ? comparenamesqe : comparenamesq));
-      DosSleep(0); //26 Aug 07 GKY 1
+            grep->ignoreextdupes ? comparenamesqe : comparenamesq);
+      SleepIfNeeded(pitdSleep, 1);
+      // DosSleep(0); //26 Aug 07 GKY 1 // 07 Feb 08 SHL
       if (!grep->nosizedupes) {
         qsort(grep->dupesizes, x, sizeof(DUPES *), comparesizesq);
-        DosSleep(0); //26 Aug 07 GKY 1
+        SleepIfNeeded(pitdSleep, 1);
+        // DosSleep(0); //26 Aug 07 GKY 1       // 07 Feb 08 SHL
       }
-      WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
-
+
+      if (!hwndStatus)
+        WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+      else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+        WinSetWindowText(hwndStatus, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+
+      InitITimer(pitdSleep, 0);         // Reset rate estimator
       i = grep->dupehead;
       y = 0;
@@ -1177 +1322 @@
         if (*grep->stopflag)
           break;
+        SleepIfNeeded(pitdSleep, 1);    // 07 Feb 08 SHL
         if (!(i->flags & GF_SKIPME)) {
           r = (DUPES **) bsearch(i, grep->dupenames, x, sizeof(DUPES *),
@@ -1216 +1362 @@
               if (!AddToList((*r)->name, &list, &numfiles, &numalloced)) {
                 (*r)->flags |= GF_INSERTED;
-                if (grep->sayfiles)
-                  WinSetWindowText(grep->hwndFiles, (*r)->name);
+                if (grep->sayfiles) {
+                  if (!hwndStatus)
+                    WinSetWindowText(grep->hwndFiles, (*r)->name);
+                  else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+                    WinSetWindowText(hwndStatus, (*r)->name);
+                }
                 if ((*r)->size == i->size &&
                     (i->date.year == (*r)->date.year &&
@@ -1277 +1427 @@
                 }
                 if (!AddToList((*r)->name, &list, &numfiles, &numalloced)) {
-                  if (grep->sayfiles)
-                    WinSetWindowText(grep->hwndCurFile, (*r)->name);
+                  if (grep->sayfiles) {
+                    if (!hwndStatus)
+                      WinSetWindowText(grep->hwndCurFile, (*r)->name);
+                    else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+                      WinSetWindowText(hwndStatus, (*r)->name);
+                  }
                   (*r)->flags |= GF_INSERTED;
                   if (((grep->ignoreextdupes) ?
@@ -1298 +1452 @@
         i = i->next;
         y++;
-        if (!(y % cntr)) {
-
+        // 08 Feb 08 SHL
+        if (IsITimerExpired(pitdReport)) {
           CHAR s[44];
-
           sprintf(s, GetPString(IDS_GREPDUPECHECKPROGTEXT), y, grep->numfiles);
-          WinSetWindowText(grep->hwndCurFile, s);
-          DosSleep(1);          //05 Aug 07 GKY 128
+          if (!hwndStatus)
+            WinSetWindowText(grep->hwndCurFile, s);
+          else {
+            if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+              WinSetWindowText(hwndStatus, s);
+          }
         }
-        DosSleep(0); //26 Aug 07 GKY 1
-      }
+        // DosSleep(0); //26 Aug 07 GKY 1
+      } // while
     }
     else {
-      // Insufficient memory - fall back
+      // Insufficient memory - fall back to slow method - fixme to saymsg?
       DosBeep(50, 100);
-      WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+      if (!hwndStatus)
+        WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+      else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+        WinSetWindowText(hwndStatus, GetPString(IDS_GREPDUPECOMPARINGTEXT));
       x = y = 0;
       if (grep->dupenames) {
@@ -1322 +1482 @@
         grep->dupesizes = NULL;
       }
+
+      InitITimer(pitdSleep, 0);         // Reset rate estimator
       i = grep->dupehead;
       while (i) {
         if (*grep->stopflag)
           break;
+        SleepIfNeeded(pitdSleep, 1);
         if (!(i->flags & GF_SKIPME)) {
-          if (!(y % cntr)) {
-
+          if (IsITimerExpired(pitdReport)) {
+            // if (!(y % cntr)) { }
             CHAR s[44];
-
             sprintf(s, GetPString(IDS_GREPDUPECHECKPROGTEXT), y, grep->numfiles);
-            WinSetWindowText(grep->hwndCurFile, s);
-            DosSleep(0); //26 Aug 07 GKY 1
+            if (!hwndStatus)
+              WinSetWindowText(grep->hwndCurFile, s);
+            else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+              WinSetWindowText(hwndStatus, s);
+            // DosSleep(0); //26 Aug 07 GKY 1   // 07 Feb 08 SHL
           }
           y++;
@@ -1383 +1548 @@
                     goto BreakOut;      // Failed
                 }
-                if (grep->sayfiles)
-                  WinSetWindowText(grep->hwndCurFile, pc);
+                if (grep->sayfiles) {
+                  if (!hwndStatus)
+                    WinSetWindowText(grep->hwndCurFile, pc);
+                  else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+                    WinSetWindowText(hwndStatus, pc);
+                }
                 c->flags |= GF_INSERTED;
                 i->flags |= GF_INSERTED;
@@ -1392 +1561 @@
                 }
               }
-              else if (!(x % 100))
-                DosSleep(0);  //26 Aug 07 GKY 1
+              // else if (!(x % 100))   // 07 Feb 08 SHL
+              //        DosSleep(0);  //26 Aug 07 GKY 1 // 07 Feb 08 SHL
             }
             c = c->next;
@@ -1399 +1568 @@
         }
         i = i->next;
-      }
+      } // while
     }
   }
@@ -1406 +1575 @@
   if (numfiles && list) {
     if (!PostMsg(grep->hwndFiles,
-                 WM_COMMAND, MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(list)))
+                 WM_COMMAND,
+                 MPFROM2SHORT(IDM_COLLECTOR, 0),
+                 MPFROMP(list)))
       FreeList(list);
   }
@@ -1443 +1614 @@
 }
 
-#pragma alloc_text(GREP,insert_grepfile,doonefile,doinsertion,freegreplist)
+#pragma alloc_text(GREP,InsertGrepFile,DoOneFile,DoInsertion,freegreplist)
 #pragma alloc_text(GREP,SecsSince1980,match,mmatch,GrepThread)
-#pragma alloc_text(GREP,doallsubdirs,domatchingfiles,InsertDupes,FreeDupes)
+#pragma alloc_text(GREP,DoAllSubdirs,DoMatchingFiles,InsertDupes,FreeDupes)
 
 #pragma alloc_text(DUPES,InsertDupe,FillDupes,FreeDupes,CRCFile,CRCBlock)