Changeset 1873 for trunk/dll

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.

Location:

trunk/dll

Files:

• dircnrs.c (modified) (2 diffs)
• filldir.c (modified) (5 diffs)
• flesh.c (modified) (5 diffs)
• init.c (modified) (3 diffs)
• init.h (modified) (1 diff)
• select.c (modified) (4 diffs)
• treecnr.c (modified) (12 diffs)
• treecnr.h (modified) (1 diff)

trunk/dll/dircnrs.c

@@ -2864 +2864 @@
                   // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
                   if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && AddFleshWorkRequest(hwnd, pci, eFlesh) &&
-                      !dcd->suspendview && fTopDir ) {
+                      !dcd->suspendview && fTopDir  && !fSwitchTreeOnDirChg) {
                     PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
                     //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
@@ -2873 +2873 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              if (AddFleshWorkRequest(hwnd, pci, eFlesh) && !dcd->suspendview && fTopDir) {
+              if (AddFleshWorkRequest(hwnd, pci, eFlesh) && !dcd->suspendview &&
+                  fTopDir && !fSwitchTreeOnDirChg) {
                 // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
                 PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);

trunk/dll/filldir.c

@@ -123 +123 @@
                 use of NULL/Nullstr pszFileNames by Stubby). Add code to relink pci chain
                 following rename, delete, etc. Add "Expanding" window text.
+  26 Sep 15 GKY Remove fInitialDriveScan code
 
 ***********************************************************************/
@@ -908 +909 @@
       do {
         /**
-         * remove . and .. from list if present
+         * remove . and .. and directories already added
+         * by Stubby from list if present
          * also counter file system bugs that sometimes
          * allows normal files to slip through when
@@ -1183 +1185 @@
 
     // 13 Oct 09 SHL FIXME to be saymsg if ERROR_NOT_READY and first try on volume
-    if (rc && rc != ERROR_NO_MORE_FILES && (fDontSuggestAgain || !fInitialDriveScan)) {
+    if (rc && rc != ERROR_NO_MORE_FILES && fDontSuggestAgain) {
       Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
                 GetPString(IDS_CANTFINDDIRTEXT), pszFileSpec);
@@ -1688 +1690 @@
 
   DosSleep(16);
-
-  fInitialDriveScan = FALSE;
-  //DbgMsg(pszSrcFile, __LINE__, "fInitialDriveScan now FALSE");         // 2015-08-03 SHL FIXME debug
   DosPostEventSem(CompactSem);
 
@@ -1697 +1696 @@
     BOOL includesyours = FALSE;
 
-    // 02 Mar 14 GKY !didone for fFirstTime so it works again
+    // 02 Mar 14 GKY !didonce for fFirstTime so it works again
    if (*szSuggest || ~driveflags[1] & DRIVE_IGNORE && !didonce) {
       if (!DosDevConfig(&info, DEVINFO_FLOPPY) && info == 1) {

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
 

trunk/dll/init.c

@@ -140 +140 @@
   24 Aug 15 GKY Remove obsolete code fDontAsk?zip
   20 Sep 15 GKY Move tree expand to a thread.
+  26 Sep 15 GKY Remove fInitialDriveScan code
   
 ***********************************************************************/
@@ -255 +256 @@
 ULONG ulDateFmt;
 BOOL fDontSuggestAgain;
-BOOL fInitialDriveScan;
 BOOL fAmAV2;
 BOOL fChangeTarget;
@@ -1211 +1211 @@
     fSwitchTreeExpand = fNoSearch = fCustomFileDlg = fOtherHelp =
     fSaveMiniCmds = fUserComboBox = fFM2Deletes = fConfirmTarget =
-    fShowTarget = fDrivebarHelp = fCheckMM = fInitialDriveScan =
-    fEjectRemovableScan = TRUE;
+    fShowTarget = fDrivebarHelp = fCheckMM = fEjectRemovableScan = TRUE;
   ulCnrType = CCS_EXTENDSEL;
   FilesToGet = FILESTOGET_MAX;

trunk/dll/init.h

@@ -215 +215 @@
 extern PCSZ WC_VIEWSTATUS;
 extern BOOL fDontSuggestAgain;
-extern BOOL fInitialDriveScan;
 extern BOOL fAmAV2;
 extern BOOL fChangeTarget;

trunk/dll/select.c

@@ -38 +38 @@
                 in UM_EXPAND until until drive is completely expanded. Changes were need to
                 work with Flesh, Stubby and UnFlesh being moved to a thread
+  26 Sep 15 GKY Changes to speed up ExpandAll
 
 ***********************************************************************/
@@ -572 +573 @@
 {
   PCNRITEM pci;
-  static BOOL fExpanding = FALSE;
+  static BOOL fExpanding = FALSE; // statics are only used by tree container
   static INT counter = 1;
 
@@ -596 +597 @@
       if (count != 0) {
         fExpanding = TRUE;
+        if (IsFleshWorkListEmpty())
+          DosSleep(0);       // Yield to EXPANDTREE and Flesh thread
         if (!IsFleshWorkListEmpty()) {
           WaitFleshWorkListEmpty(NULL); // Let it expand
@@ -609 +612 @@
     }
   }
-  //DosSleep(0);
   return fExpanding;
 }

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);

trunk/dll/treecnr.h

@@ -45 +45 @@
 extern BOOL fMiniLVM;
 extern BOOL fLVM;
+extern BOOL fExpandAll;
 extern HPOINTER hptrDunno;
 extern HWND hwndMainMenu;