Changeset 1873 for trunk/dll/treecnr.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/treecnr.c (modified) (12 diffs)

trunk/dll/treecnr.c

@@ -108 +108 @@
                 a thread. Loop and idle ExpandAll; Add CollapseAll; Move tree expand to a
                 thread; Have ShowTreeRec wait for the Flesh thread.
+  26 Sep 15 GKY Adjustments to ShowTreeRec to eliminate failures and reduce retries and container
+                noise on tree switches.
+  26 Sep 15 GKY Remove fInitialDriveScan code
+  26 Sep 15 GKY Changes to speed up ExpandAll
 
 ***********************************************************************/
@@ -191 +195 @@
 BOOL fMiniLVM;
 BOOL fLVM;
+BOOL fExpandAll;
 HPOINTER hptrDunno;
 HWND hwndMainMenu;
@@ -203 +208 @@
 static BOOL fOkayMinimize;
 static HMQ hmqExpandTree;
-static BOOL fExpandAll;
 
 APIRET16 APIENTRY16 Dos16MemAvail(PULONG pulAvailMem);
@@ -305 +309 @@
   CHAR chSaved;
 
-  //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec called for pszDir_ \"%s\"", pszDir_); // 2015-08-04 SHL FIXME debug
-
-  strcpy(szDirArg, pszDir_);            // Cache here in case arg content changed by some other thread
-
+  strcpy(szDirArg, pszDir_);    // Cache here in case arg content changed by some other thread
+  
   // already positioned to requested record?
   pci = WinSendMsg(hwndCnr,
@@ -314 +316 @@
                    MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
   if (pci && (INT)pci != -1 && !stricmp(pci->pszFileName, szDirArg)) {
-    found = TRUE;
     quickbail = TRUE;                   // Already at requested record - bypass repositioning
     goto MakeTop;
   }
-  // 2015-08-23 SHL FIXME to be gone - problem must be elsewhere
-  // 2015-08-22 GKY Without this FM2 has NULL pci->pszFileName errors and switch failures
-  if (fInitialDriveScan)
-    DosSleep(100); // 100 still had errors
-  if (fSwitchTreeOnDirChg)
-    DosSleep(200);
-
   // 2015-08-13 SHL add retry logic 2015-08-22 GKY increase retries from 10 to 100 to
   // eliminate switch failures on deep or large tree state switches
@@ -391 +385 @@
         }
       }
-
-      DosSleep(100);                    // 2015-08-13 SHL Let PM catch up
-
+      WaitFleshWorkListEmpty(NULL);     // 2015-09-26 GKY Let Flesh thread catch up
     } // while expanding
 
@@ -404 +396 @@
     if (~pci->rc.flRecordAttr & CRA_CURSORED) {
       if (collapsefirst) {
+        WaitFleshWorkListEmpty(NULL);
         pciP = WinSendMsg(hwndCnr,
                           CM_QUERYRECORD,
@@ -447 +440 @@
       }
       if (maketop || fTopDir) {
-        if (fCollapseFirst)
+        if (fCollapseFirst && !quickbail) {
           WaitFleshWorkListEmpty(NULL); //Let the root expand first otherwise it makes top
+        }
         // 2015-08-23 SHL FIXME debug
-        //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec ShowCnrRecord(%p) fTopDir %i maketop %i", pciToSelect, fTopDir, maketop); // 2015-08-04 SHL FIXME debug
+        //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec ShowCnrRecord(%p) filename %s", pciToSelect, pciToSelect->pszFileName); // 2015-08-04 SHL FIXME debug
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE)pciToSelect);
       }
@@ -759 +753 @@
 #endif
           //DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME calling ShowTreeRec(\"%s\")", mp1); // 2015-08-04 SHL FIXME debug
-          ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
-          //DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME calling PostMsg(IDM_UPDATE)"); // 2015-08-04 SHL FIXME debug
+          priority_idle(); // 2015-09-26 GKY Majority of work done by Flesh and UI threads
+          ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
+          priority_normal();
+          //DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME calling PostMsg(IDM_UPDATE)"); // 2015-08-04 SHL FIXME debug
           PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
 
@@ -3437 +3433 @@
                     driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
-                { // 2015-08-28 GKY fixme? I think this code runs on the UI thread
+                { 
                   WaitFleshWorkListEmpty(pci->pszFileName);     // 2015-08-19 SHL in case pci still in work list
                   AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
@@ -3446 +3442 @@
                      volser.serial)) {
                   if (qmsg.msg == UM_EXPANDTREE && AddFleshWorkRequest(dcd->hwndCnr, pci, eFlesh)
-                      && !dcd->suspendview  && fTopDir) {
+                      && !dcd->suspendview  && fTopDir && !fSwitchTreeOnDirChg) {
                     DosSleep(1);
                     WaitFleshWorkListEmpty(pci->pszFileName);
@@ -3456 +3452 @@
               else {
                 driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-                // 2015-08-28 GKY fixme? I think this code runs on the UI thread
                 WaitFleshWorkListEmpty(pci->pszFileName);       // 2015-08-19 SHL in case pci still in work list
                 AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);