Changeset 1564

Timestamp:

May 30, 2011, 10:05:56 PM (14 years ago)

Author:

Gregg Young

Message:

Rework filldir and grep directories to correctly support more than 65K records.
Collector was trapping. Added SleepIfNeeded to loops to improve WPS responsiveness.

Location:

trunk/dll

Files:

• filldir.c (modified) (14 diffs)
• grep.c (modified) (4 diffs)

trunk/dll/filldir.c

@@ -91 +91 @@
                 entries in the tree container, fix related semaphore performance using
                 combination of event and mutex semaphores
+  30 May 11 GKY Fixed trap caused by passing a nonexistant pci to FillInRecordFromFFB in FillDir
+                because pci is limited to 65535 files. (nRecord is a USHORT) SHL's single loop
+  30 May 11 GKY Added SleepIfNeeded to DosFind and container load loops to improve WPS responsiveness
 
 ***********************************************************************/
@@ -98 +101 @@
 #include <malloc.h>                     // _msize _heapchk
 #include <ctype.h>
+#include <limits.h>
 // #include <process.h>                 // _beginthread
 
@@ -134 +138 @@
 #include "fm3dlg.h"                     // INFO_LABEL
 #include "pathutil.h"                   // AddBackslashToPath
+#include "tmrsvcs.h"                    // ITIMER_DESC
 
 VOID StubbyScanThread(VOID * arg);
@@ -944 +949 @@
   ULONG ulBufBytes;
   ULONG x;
+  ITIMER_DESC itdSleep = { 0 };         // 30 May 11 GKY
 
   if (isalpha(*szDirBase) && szDirBase[1] == ':' && szDirBase[2] == '\\') {
@@ -980 +986 @@
                        &ulFindCnt,
                        FIL_QUERYEASIZEL);
-    priority_normal();
+    //priority_normal();
     pszFileSpec[strlen(pszFileSpec) - 1] = 0;   // Chop off wildcard
     if (!rc) {
+      InitITimer(&itdSleep, 500);
       do {
         /*
@@ -1088 +1095 @@
               cAffbTotal += ulSelCnt;
               // 15 Sep 09 SHL allow timed updates to see
-              if (dcd) {
+              /*if (dcd) {
                 dcd->totalfiles += ulSelCnt;
                 dcd->ullTotalBytes += ullTotalBytes;
-              }
+              } */  //30 May 11 GKY caused counter to increment twice
             }
             else {
@@ -1106 +1113 @@
         ulFindCnt = ulFindMax;
         rc = xDosFindNext(hdir, paffbFound, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZEL);
-        priority_normal();
+        //priority_normal();
         if (rc)
-          DosError(FERR_DISABLEHARDERR);
+          DosError(FERR_DISABLEHARDERR);
+        SleepIfNeeded(&itdSleep, 1);
       } while (!rc);
 
@@ -1122 +1130 @@
           goto Abort;
 
-        pciFirst = WinSendMsg(hwndCnr, CM_ALLOCRECORD,
-                              MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(cAffbTotal));
-
-        if (!pciFirst) {
-          Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    GetPString(IDS_CMALLOCRECERRTEXT));
-          ok = FALSE;
-          ullTotalBytes = 0;
-        }
-        else {
-          // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
-          if (hwndStatus && dcd &&
-              dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
-            WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_PLEASEWAITCOUNTINGTEXT));
-          }
-          pci = pciFirst;
-          ullTotalBytes = 0;
-          pffbFile = paffbTotal;
-          for (x = 0; x < cAffbTotal; x++) {
-            ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
-                                           pffbFile, partial, dcd);
-            pci = (PCNRITEM) pci->rc.preccNextRecord;
-            ullTotalBytes += ullBytes;
-            // 15 Sep 09 SHL allow timed updates to see
-            if (dcd) {
-              dcd->totalfiles = x;
-              dcd->ullTotalBytes = ullTotalBytes;
-            }
-            // Can not use offset since we have merged lists - this should be equivalent
-            pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
-          }
-          if (cAffbTotal) {
+        pci = NULL;
+        ullTotalBytes = 0;
+        pffbFile = paffbTotal;
+        for (x = 0; x < cAffbTotal; x++) {
+          ULONG ulRecsToInsert;
+
+          if (pci ==NULL) {
+            ulRecsToInsert = cAffbTotal - x <  USHRT_MAX  ? cAffbTotal - x : USHRT_MAX;
+            pciFirst = WinSendMsg(hwndCnr, CM_ALLOCRECORD,
+                                  MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(ulRecsToInsert));
+
+            if (!pciFirst) {
+              Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                        GetPString(IDS_CMALLOCRECERRTEXT));
+              ok = FALSE;
+              ullTotalBytes = 0;
+              break;
+            }
+            else {
+              // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
+              if (hwndStatus && dcd &&
+                  dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
+                WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_PLEASEWAITCOUNTINGTEXT));
+              }
+              pci = pciFirst;
+            }
+          }
+          ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
+                                         pffbFile, partial, dcd);
+          pci = (PCNRITEM) pci->rc.preccNextRecord;
+          ullTotalBytes += ullBytes;
+          // 15 Sep 09 SHL allow timed updates to see
+          if (dcd) {
+            dcd->totalfiles = x;
+            dcd->ullTotalBytes = ullTotalBytes;
+          }
+          // Can not use offset since we have merged lists - this should be equivalent
+          pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
+
+          if (pci == NULL && ulRecsToInsert) {
             memset(&ri, 0, sizeof(RECORDINSERT));
             ri.cb = sizeof(RECORDINSERT);
@@ -1159 +1175 @@
             ri.pRecordParent = (PRECORDCORE) pciParent;
             ri.zOrder = (ULONG) CMA_TOP;
-            ri.cRecordsInsert = cAffbTotal;
+            ri.cRecordsInsert = ulRecsToInsert;
             ri.fInvalidateRecord = (!fSyncUpdates && dcd &&
                                     dcd->type == DIR_FRAME) ? FALSE : TRUE;
@@ -1173 +1189 @@
                 ullTotalBytes = 0;
                 if (WinIsWindow((HAB) 0, hwndCnr))
-                  FreeCnrItemList(hwndCnr, pciFirst);
+                  FreeCnrItemList(hwndCnr, pciFirst);
+                pciFirst = NULL;
+                break;
               }
             }
-          }
-        }
+          }
+          SleepIfNeeded(&itdSleep, 1);
+        }
         if (ok) {
           ullReturnBytes += ullTotalBytes;
@@ -1959 +1978 @@
   PCNRITEM pciNext;
   USHORT usCount;
-
+  ITIMER_DESC itdSleep = { 0 };         // 30 May 11 GKY
+
+  InitITimer(&itdSleep, 500);
   for (usCount = 0; pci; usCount++) {
     pciNext = (PCNRITEM) pci->rc.preccNextRecord;
     FreeCnrItemData(pci);
     pci = pciNext;
+    SleepIfNeeded(&itdSleep, 1);
   }
 
@@ -1984 +2006 @@
   INT remaining = usCnt;
   PCNRITEM pci;
+  ITIMER_DESC itdSleep = { 0 };         // 30 May 11 GKY
+     
 
   if ((usCnt && !pciFirst) || (!usCnt && pciFirst)) {
@@ -2003 +2027 @@
         }
       }
+      InitITimer(&itdSleep, 500);
       while (pci) {
         // 12 Sep 07 SHL dwg drivebar crash testing - ticket# ???
@@ -2012 +2037 @@
           Dos_Error(MB_ENTER, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
                     "DosQueryMem failed pci %p pciLast %p", pci, pciLast);
-        FreeCnrItemData(pci);
+        FreeCnrItemData(pci);
         pciLast = pci;
         pci = (PCNRITEM)pci->rc.preccNextRecord;
         if (remaining && --remaining == 0)
-          break;
+          break;
+        SleepIfNeeded(&itdSleep, 1);
       }
     }

trunk/dll/grep.c

@@ -36 +36 @@
                 Mostly cast CHAR CONSTANT * as CHAR *.
   29 May 10 GKY Suppress ERROR_FILENAME_EXCED_RANGE error because of problem with NTFS
+  30 May 11 GKY Fixed potential trap caused by passing a nonexistant pci to FillInRecordFromFFB
+                in DoInsertion because pci is limited to 65535 files. (nRecord is a USHORT)
+                SHL's single loop fix.
 
 ***********************************************************************/
@@ -43 +46 @@
 #include <ctype.h>
 #include <share.h>
+#include <limits.h>
 
 #define INCL_DOS
@@ -718 +722 @@
   PCNRITEM pci, pciFirst;
   UINT x;
+  ULONG ulRecsToInsert;
 
   if (!grep || !grep->toinsert || !grep->insertffb || !grep->dir)
     return FALSE;
 
-  pci = WinSendMsg(grep->hwndFiles,
-                   CM_ALLOCRECORD,
-                   MPFROMLONG(EXTRA_RECORD_BYTES),
-                   MPFROMLONG(grep->toinsert));
-  if (!pci) {
-    Win_Error(grep->hwndFiles, grep->hwndFiles, pszSrcFile, __LINE__,
-              PCSZ_CM_ALLOCRECORD);
-  }
-  else {
-    if (grep->sayfiles) {
-      if (!hwndStatus)
-        WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+  pci = NULL;
+  dcd = INSTDATA(grep->hwndFiles);
+  for (x = 0; grep->insertffb[x]; x++) {
+    if (pci == NULL) {
+      ulRecsToInsert = grep->toinsert - x < USHRT_MAX  ? grep->toinsert - x : USHRT_MAX;
+      pciFirst = WinSendMsg(grep->hwndFiles, CM_ALLOCRECORD,
+                       MPFROMLONG(EXTRA_RECORD_BYTES),
+                       MPFROMLONG(ulRecsToInsert));
+      if (!pciFirst) {
+        Win_Error(grep->hwndFiles, grep->hwndFiles, pszSrcFile, __LINE__,
+                  PCSZ_CM_ALLOCRECORD);
+        freegreplist(grep);
+        return FALSE;
+      }
       else {
-        if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
-          WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+        pci = pciFirst;
+        if (grep->sayfiles) {
+          if (!hwndStatus)
+            WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+          else {
+            if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+              WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+          }
+        }
       }
     }
-    pciFirst = pci;
-    dcd = INSTDATA(grep->hwndFiles);
-    for (x = 0; grep->insertffb[x]; x++) {
-      FillInRecordFromFFB(grep->hwndFiles,
-                          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);
-    ri.pRecordOrder = (PRECORDCORE) CMA_END;
-    ri.pRecordParent = (PRECORDCORE) NULL;
-    ri.zOrder = (USHORT) CMA_TOP;
-    ri.cRecordsInsert = grep->toinsert;
-    ri.fInvalidateRecord = TRUE;
-    WinSendMsg(grep->hwndFiles,
-               CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri));
-    if (dcd) {
-      //DosEnterCritSec(); //GKY 11-29-08
-      DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
-      dcd->ullTotalBytes += grep->insertedbytes;
-      DosReleaseMutexSem(hmtxFM2Globals);
-      //DosExitCritSec();
+    FillInRecordFromFFB(grep->hwndFiles,
+                        pci, grep->dir[x], grep->insertffb[x], FALSE, dcd);
+    pci = (PCNRITEM) pci->rc.preccNextRecord;
+    //SleepIfNeeded(pitdSleep, 1);
+    if (pci == NULL && ulRecsToInsert) {
+      memset(&ri, 0, sizeof(RECORDINSERT));
+      ri.cb = sizeof(RECORDINSERT);
+      ri.pRecordOrder = (PRECORDCORE) CMA_END;
+      ri.pRecordParent = (PRECORDCORE) NULL;
+      ri.zOrder = (USHORT) CMA_TOP;
+      ri.cRecordsInsert = ulRecsToInsert;
+      ri.fInvalidateRecord = TRUE;
+      WinSendMsg(grep->hwndFiles,
+                 CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri));
+      if (dcd) {
+        DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
+        dcd->ullTotalBytes += grep->insertedbytes;
+        DosReleaseMutexSem(hmtxFM2Globals);
+      }
+      pciFirst = NULL;
     }
     SleepIfNeeded(pitdSleep, 1);
+  }//for
     // if (grep->toinsert == FilesToGet)        // 07 Feb 08 SHL
     //  DosSleep(0);  //26 Aug 07 GKY 1 // 07 Feb 08 SHL
@@ -769 +781 @@
     PostMsg(grep->hwndFiles, UM_RESCAN, MPVOID, MPVOID);
     return TRUE;
-  }
-  freegreplist(grep);
-  return FALSE;
 }