Changeset 1764 for trunk/dll

Timestamp:

Mar 22, 2014, 9:01:22 PM (12 years ago)

Author:

John Small

Message:

RemoveCnrItems changes:
Remove unneeded nested loop
Stop calling IdleIfNeeded after idle has been set
No call to priority_normal if idle priority was never set
Fix compile error

File:

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

trunk/dll/filldir.c

@@ -1994 +1994 @@
 {
   INT remaining = usCnt;
+  BOOL bIdlePrioritySet = FALSE;
+// #define RCI_ITEMS_PER_TIMER_CHECK (10)
+// 10 seems a very conservative number
+//   USHORT usTimerCheckCountdown       = RCI_ITEMS_PER_TIMER_CHECK;
   PCNRITEM pci;
   ITIMER_DESC itdSleep = { 0 };         // 30 May 11 GKY
@@ -2021 +2025 @@
         if (!pci)
           break;
-        if (remaining && --remaining == 0) '
+        if (remaining && --remaining == 0)
           break;
-        // 22 Mar 14 GKY This second loop is to avoid calling or checking if
-        // IdleIfNeeded has been called on loops after it has set the process to idle
-        if (!IdleIfNeeded(&itdSleep, 30)) {
-          while (pci) {
-            FreeCnrItemData(pci);
-            pci = (PCNRITEM)pci->rc.preccNextRecord;
-            if (remaining && --remaining == 0)
-              break;
-          } // while
-          break;
+        if (!bIdlePrioritySet /* && --usTimerCheckCountdown == 0 */) {
+          bIdlePrioritySet = !IdleIfNeeded(&itdSleep, 30);
+//           usTimerCheckCountdown = RCI_ITEMS_PER_TIMER_CHECK;
         }
       } // while
-      priority_normal();
+      if (bIdlePrioritySet)
+        priority_normal();
+
       DosPostEventSem(CompactSem);
     }