Changeset 1873 for trunk/dll/flesh.c

Timestamp:

Sep 26, 2015, 7:23:13 PM (10 years ago)

Author:

Gregg Young

Message:

Adjustments to ShowTreeRec to eliminate failures and reduce retries and container noise on tree switches. Remove fInitialDriveScan code. Changes to speed up ExpandAll. WaitFleshWorkListEmpty now gives error message and returns if semaphore request fails more than 5 consecutive times.

File:

• trunk/dll/flesh.c (modified) (5 diffs)

trunk/dll/flesh.c

@@ -41 +41 @@
                 complete container item. Add a flag to indicate when a directory needed to be
                 Fleshed
+  26 Sep 15 GKY Changes to speed up ExpandAll
+  26 Sep 15 GKY WaitFleshWorkListEmpty now gives error message and returns if semaphore request
+                fails more than 5 consecutive times.
 
 ***********************************************************************/
@@ -74 +77 @@
 #include "common.h"                     // IncrThreadUsage DecrThreadUsage
 #include "pathutil.h"
+#include "treecnr.h"                    // fExpandAll
 #if 0
 #define  __PMPRINTF__
@@ -863 +867 @@
   BOOL waited;
   PCSZ pszSavedFleshFocusPath;
+  INT rcCount = 0;
 
   if (tid == 1 || tid == tidFleshWorkListThread) {
@@ -902 +907 @@
     if (pszDirName) {
       rc = xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
-      if (rc)
-        continue;                       // Maybe should return ???
+      if (rc) {
+        rcCount++;
+        if (rcCount < 6)
+          continue;                     // Maybe should return ???
+        else {
+          Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    PCSZ_DOSREQUESTMUTEXSEM);
+          return;
+        }
+
+      }
 
       if (!pathSaved) {
@@ -915 +929 @@
 
       xDosReleaseMutexSem(hmtxFleshWork);
+      rcCount = 0;
 
       if (!item) {
         if (waited)
-          DosSleep(100);                // Let PM do some work
+          DosSleep(fExpandAll ? 1 : 240);               // Let PM do some work
         break;                          // Dependents gone from work list
       }
     } // if pszDirName
-
-    DosSleep(250);
+    DosSleep(fExpandAll ? 10 : 250);
   } // for