Changeset 1763 for trunk/dll

Timestamp:

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

Author:

Gregg Young

Message:

Reverted some code from the RemoveCnrItems CS[1759] changes adding a previously missing break and comments explaining the code structure. Ticket [514}

File:

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

trunk/dll/filldir.c

@@ -103 +103 @@
   02 Mar 14 GKY Speed up intial drive scans Ticket 528
   19 Mar 14 SHL RemoveCnrItems: clean up odd code
+  22 Mar 14 GKY Reverted some code from the RemoveCnrItems changes adding a previously
+                missing break and comments explaining the code structure.
 
 ***********************************************************************/
@@ -2019 +2021 @@
         if (!pci)
           break;
-        if (remaining && --remaining == 0)
-          break;
-        IdleIfNeeded(&itdSleep, 30);
+        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;
+        }
       } // while
       priority_normal();