Changeset 1570 for trunk/dll/filldir.c

Timestamp:

Jun 13, 2011, 12:09:19 AM (14 years ago)

Author:

Gregg Young

Message:

Added IdleIfNeeded to place load and free loops to idle priority when dealing with large numbers of items. Used SleepIfNeeded more places for a similar purpose.

File:

• trunk/dll/filldir.c (modified) (8 diffs)

trunk/dll/filldir.c

@@ -95 +95 @@
   30 May 11 GKY Added SleepIfNeeded to DosFind and container load loops to improve WPS responsiveness
   31 May 11 SHL Disable antique debug code in RemoveCnrItems - really speeds up container close
+  12 Jun 11 GKY Added IdleIfNeeded to the container "free" loops to improve system
+                responsiveness when closing containers with large numbers of items
+  12 Jun 11 GKY Replaced SleepIfNeeded with IdleIfNeeded in the container loade loop
 
 ***********************************************************************/
@@ -986 +989 @@
                        &ulFindCnt,
                        FIL_QUERYEASIZEL);
-    //priority_normal();
+    priority_normal();
     pszFileSpec[strlen(pszFileSpec) - 1] = 0;   // Chop off wildcard
     if (!rc) {
@@ -1113 +1116 @@
         ulFindCnt = ulFindMax;
         rc = xDosFindNext(hdir, paffbFound, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZEL);
-        //priority_normal();
+        priority_normal();
         if (rc)
           DosError(FERR_DISABLEHARDERR);
@@ -1130 +1133 @@
           goto Abort;
 
+        InitITimer(&itdSleep, 500);
         pci = NULL;
         ullTotalBytes = 0;
@@ -1169 +1173 @@
           pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
 
+          if (!IdleIfNeeded(&itdSleep, 30)) {
+            for (x = x+1; x < cAffbTotal; x++) {
+              ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
+                                          pffbFile, partial, dcd);
+              pci = (PCNRITEM) pci->rc.preccNextRecord;
+              ullTotalBytes += ullBytes;
+              if (dcd) {
+                dcd->totalfiles = x;
+                dcd->ullTotalBytes = ullTotalBytes;
+              }
+              pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
+              if (pci == NULL) {
+                priority_normal();
+                InitITimer(&itdSleep, 500);
+                break;
+              }
+            }
+          }
+
           if (pci == NULL && ulRecsToInsert) {
             memset(&ri, 0, sizeof(RECORDINSERT));
@@ -1195 +1218 @@
             }
           }
-          SleepIfNeeded(&itdSleep, 1);
-        }
+          //SleepIfNeeded(&itdSleep, 1);
+        }
+        priority_normal();
         if (ok) {
           ullReturnBytes += ullTotalBytes;
@@ -1985 +2009 @@
     FreeCnrItemData(pci);
     pci = pciNext;
-    SleepIfNeeded(&itdSleep, 1);
-  }
-
+    if (!IdleIfNeeded(&itdSleep, 30)) {
+      for (usCount = usCount + 1; pci; usCount++) {
+        pciNext = (PCNRITEM) pci->rc.preccNextRecord;
+        FreeCnrItemData(pci);
+        pci = pciNext;
+      }
+      break;
+    }
+  }
+  priority_normal();
+  DosPostEventSem(CompactSem);
   if (usCount) {
     if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(usCount))) {
@@ -2045 +2077 @@
         if (remaining && --remaining == 0)
           break;
-        SleepIfNeeded(&itdSleep, 1);
-      }
+        if (!IdleIfNeeded(&itdSleep, 30)) {
+          while (pci) {
+            FreeCnrItemData(pci);
+            pci = (PCNRITEM)pci->rc.preccNextRecord;
+            if (remaining && --remaining == 0)
+              break;
+          }
+        }
+      }
+      priority_normal();
+      DosPostEventSem(CompactSem);
     }
   }