Changeset 1874

Timestamp:

Sep 27, 2015, 7:20:10 PM (10 years ago)

Author:

Gregg Young

Message:

DosSleep times in WaitFleshWorkListEmpty set by caller; TOPDIR code calls WaitFleshWorkListEmpty before ShowCnrRecord and now actually exists for directory containers in tree view. These calls are made from the object windows.

Location:

trunk/dll

Files:

• dircnrs.c (modified) (4 diffs)
• flesh.c (modified) (4 diffs)
• flesh.h (modified) (2 diffs)
• select.c (modified) (3 diffs)
• treecnr.c (modified) (15 diffs)

trunk/dll/dircnrs.c

@@ -93 +93 @@
                 duplicate subdirectory name caused by running Stubby in worker threads.
   07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
+  26 Sep 15 GKY Add code so case UM_TOPDIR actually exists put it in the object window so it
+                can call WaitFleshWorkListEmpty while avoiding thread 1
+  27 Sep 15 GKY DosSleep times in WaitFleshWorkListEmpty set by caller
 
 ***********************************************************************/
@@ -856 +859 @@
     return 0;
 
+  case UM_TOPDIR:
+    if (mp1) {
+      dcd = WinQueryWindowPtr(hwnd, QWL_USER);
+      if (dcd) {
+        PCNRITEM pci = (PCNRITEM) mp1;
+        WaitFleshWorkListEmpty(pci->pszFileName, 240L);
+        ShowCnrRecord(dcd->hwndCnr, (PMINIRECORDCORE) pci);
+      }
+    }
+    return 0;
+
   case UM_RESCAN:
     // populate container
@@ -2862 +2876 @@
                      driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
-                  // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
+                  // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
+                  // 2015-09-26 GKY Waits (WaitFleshWorkListEmpty) in object window
+                  DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
                   if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && AddFleshWorkRequest(hwnd, pci, eFlesh) &&
-                      !dcd->suspendview && fTopDir  && !fSwitchTreeOnDirChg) {
-                    PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
-                    //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+                      !dcd->suspendview && fTopDir) {
+                    PostMsg(dcd->hwndObject, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                    DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
                   }
                 }
@@ -2872 +2888 @@
               }
             }
-            else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
+            else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
+              DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
               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);
-                //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+                  fTopDir) {
+                // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
+                // 2015-09-26 GKY Waits (WaitFleshWorkListEmpty) in object window
+                PostMsg(dcd->hwndObject, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
               }
             }

trunk/dll/flesh.c

@@ -44 +44 @@
   26 Sep 15 GKY WaitFleshWorkListEmpty now gives error message and returns if semaphore request
                 fails more than 5 consecutive times.
+  27 Sep 15 GKY DosSleep times in WaitFleshWorkListEmpty set by caller
 
 ***********************************************************************/
@@ -263 +264 @@
                                 MPFROMP(pciParent),
                                 MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-    // No children or filename null
+    // Added by Stubby to create plus sign run Stubby on it here and skip it in ProcessDirectory
     if (pciL && (INT)pciL != -1) {
       AddFleshWorkRequest(hwndCnr, pciL, eStubby);
-      // 2015-08-06 SHL FIXME to ensure this an not happen
+      // 2015-08-06 SHL FIXME to ensure this can not happen
       if (!*pciL->pszFileName || !strcmp(pciL->pszFileName, NullStr))
         Runtime_Error(pszSrcFile, __LINE__, "Flesh called with pci %p pszFileName (null)", pciL);
@@ -856 +857 @@
 
 #ifndef WaitFleshWorkListEmpty // 2015-08-03 SHL FIXME debug
-VOID WaitFleshWorkListEmpty(PCSZ pszDirName)
+VOID WaitFleshWorkListEmpty(PCSZ pszDirName, ULONG ulSleep)
 #else
-VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, PCSZ pszSrcFile_, UINT uSrcLineNo_)
+VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, ULONG ulSleep, PCSZ pszSrcFile_, UINT uSrcLineNo_)
 #endif
 {
@@ -933 +934 @@
       if (!item) {
         if (waited)
-          DosSleep(fExpandAll ? 1 : 240);               // Let PM do some work
+          DosSleep(ulSleep);            // Let PM do some work
         break;                          // Dependents gone from work list
       }
     } // if pszDirName
-    DosSleep(fExpandAll ? 10 : 250);
+    DosSleep(ulSleep);
   } // for
 

trunk/dll/flesh.h

@@ -12 +12 @@
   19 Aug 15 SHL Allow WaitFleshWorkListEmpty to wait for dependent items
   22 Aug 15 GKY Remove recurse scan code.
+  27 Sep 15 GKY DosSleep times in WaitFleshWorkListEmpty set by caller
 
 ***********************************************************************/
@@ -27 +28 @@
 
 #if 0 // 2015-08-03 SHL FIXME debug
-VOID WaitFleshWorkListEmpty(PCSZ pszDirName);
+VOID WaitFleshWorkListEmpty(PCSZ pszDirName, ULONG ulSleep);
 #else
-#define WaitFleshWorkListEmpty(pszDirName) WaitFleshWorkListEmptyDbg(pszDirName, __FILE__, __LINE__)
-VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, PCSZ pszSrcFile, UINT uSrcLineNo);
+#define WaitFleshWorkListEmpty(pszDirName, ulSleep) WaitFleshWorkListEmptyDbg(pszDirName, ulSleep, __FILE__, __LINE__)
+VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, ULONG ulSleep, PCSZ pszSrcFile, UINT uSrcLineNo);
 #endif
 

trunk/dll/select.c

@@ -39 +39 @@
                 work with Flesh, Stubby and UnFlesh being moved to a thread
   26 Sep 15 GKY Changes to speed up ExpandAll
+  27 Sep 15 GKY DosSleep times in WaitFleshWorkListEmpty set by caller
 
 ***********************************************************************/
@@ -600 +601 @@
           DosSleep(0);       // Yield to EXPANDTREE and Flesh thread
         if (!IsFleshWorkListEmpty()) {
-          WaitFleshWorkListEmpty(NULL); // Let it expand
+          WaitFleshWorkListEmpty(NULL, 10); // Let it expand
         }
       }
@@ -606 +607 @@
     while (pci && (INT)pci != -1) {
       ExpandAll(hwndCnr, count, pci);
-      if (!IsFleshWorkListEmpty())
-        WaitFleshWorkListEmpty(NULL); // Wait for container to catch up
+      if (count != 0 && !IsFleshWorkListEmpty())
+        WaitFleshWorkListEmpty(NULL, 10); // Wait for container to catch up
       pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
                                   MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));

trunk/dll/treecnr.c

@@ -112 +112 @@
   26 Sep 15 GKY Remove fInitialDriveScan code
   26 Sep 15 GKY Changes to speed up ExpandAll
+  26 Sep 15 GKY Put UM_TOPDIR in the object window so it can call WaitFleshWorkListEmpty
+                while avoiding thread 1
+  27 Sep 15 GKY DosSleep times in WaitFleshWorkListEmpty set by caller
 
 ***********************************************************************/
@@ -353 +356 @@
       if (!pciP || (INT)pciP == -1) {
         //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(\"%s\") returned pciP %p", szDir, pciP); // 2015-08-04 SHL FIXME debug
-        WaitFleshWorkListEmpty(szDirArg);       // 2015-08-23 SHL
+        WaitFleshWorkListEmpty(szDirArg, 240);  // 2015-08-23 SHL
         break;                                  // No match
       }
@@ -385 +388 @@
         }
       }
-      WaitFleshWorkListEmpty(NULL);     // 2015-09-26 GKY Let Flesh thread catch up
+      WaitFleshWorkListEmpty(NULL, 240);     // 2015-09-26 GKY Let Flesh thread catch up
     } // while expanding
 
@@ -396 +399 @@
     if (~pci->rc.flRecordAttr & CRA_CURSORED) {
       if (collapsefirst) {
-        WaitFleshWorkListEmpty(NULL);
+        WaitFleshWorkListEmpty(NULL, 240);
         pciP = WinSendMsg(hwndCnr,
                           CM_QUERYRECORD,
@@ -441 +444 @@
       if (maketop || fTopDir) {
         if (fCollapseFirst && !quickbail) {
-          WaitFleshWorkListEmpty(NULL); //Let the root expand first otherwise it makes top
+          WaitFleshWorkListEmpty(NULL, 240); //Let the root expand first otherwise it makes top
         }
         // 2015-08-23 SHL FIXME debug
@@ -449 +452 @@
 
       if (!quickbail) {
-        WaitFleshWorkListEmpty(szDirArg);       // 2015-08-19 SHL try to ensure contents stable
+        WaitFleshWorkListEmpty(szDirArg, 240);  // 2015-08-19 SHL try to ensure contents stable
         //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec WinSendMsg(CM_SETRECORDEMPHASIS, CRA_SELECTED | CRA_CURSORED) szDirArg \"%s\"", szDirArg); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr,
@@ -771 +774 @@
     return 0;
 
+  case UM_TOPDIR:
+    if (mp1) {
+      dcd = INSTDATA(hwnd);
+      if (dcd) {
+        PCNRITEM pci = (PCNRITEM) mp1;
+        WaitFleshWorkListEmpty(pci->pszFileName, 240);
+        ShowCnrRecord(dcd->hwndCnr, (PMINIRECORDCORE) pci);
+      }
+    }
+    return 0;
+
   case DM_PRINTOBJECT:
     return MRFROMLONG(DRR_TARGET);
@@ -813 +827 @@
           x++;
           if (!IsFleshWorkListEmpty()) {
-            WaitFleshWorkListEmpty(NULL); // Let it expand
+            WaitFleshWorkListEmpty(NULL, 10); // Let it expand
           }
           fExpanding = ExpandAll(dcd->hwndCnr, x, (PCNRITEM) mp2);
@@ -967 +981 @@
             pci = FindParentRecord(dcd->hwndCnr, pci);
             driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-            WaitFleshWorkListEmpty(pci->pszFileName);   // 2015-08-19 SHL in case pci still in work list
+            WaitFleshWorkListEmpty(pci->pszFileName, 240);      // 2015-08-19 SHL in case pci still in work list
             AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
           }
@@ -1959 +1973 @@
   case UM_TOPDIR:
     if (mp1) {
-      PCNRITEM pci = (PCNRITEM) mp1;
-      ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci);
+      PostMsg(dcd->hwndObject, UM_TOPDIR, mp1, MPVOID);
     }
     return 0;
@@ -2077 +2090 @@
           else {
             driveserial[x] = -1;
-            //WaitFleshWorkListEmpty(NULL);     // 2015-08-13 SHL in case pci still in work list
+            //WaitFleshWorkListEmpty(NULL, 10); // 2015-08-13 SHL in case pci still in work list
             AddFleshWorkRequest(hwnd, pci, eUnFlesh);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -3433 +3446 @@
                     driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
-                { 
-                  WaitFleshWorkListEmpty(pci->pszFileName);     // 2015-08-19 SHL in case pci still in work list
+                {
+                  WaitFleshWorkListEmpty(pci->pszFileName, 10); // 2015-08-19 SHL in case pci still in work list
                   AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
                 }
@@ -3441 +3454 @@
                      driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
+                  WaitFleshWorkListEmpty(pci->pszFileName, 10); // 2015-08-19 SHL in case pci still in work list
                   if (qmsg.msg == UM_EXPANDTREE && AddFleshWorkRequest(dcd->hwndCnr, pci, eFlesh)
-                      && !dcd->suspendview  && fTopDir && !fSwitchTreeOnDirChg) {
-                    DosSleep(1);
-                    WaitFleshWorkListEmpty(pci->pszFileName);
+                      && !dcd->suspendview  && fTopDir) {
                     PostMsg(dcd->hwndCnr, UM_TOPDIR, MPFROMP(pci), MPVOID);
                   }
@@ -3452 +3464 @@
               else {
                 driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-                WaitFleshWorkListEmpty(pci->pszFileName);       // 2015-08-19 SHL in case pci still in work list
+                WaitFleshWorkListEmpty(pci->pszFileName, 10);   // 2015-08-19 SHL in case pci still in work list
                 AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
                 PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
@@ -3466 +3478 @@
                 DosSleep(1);
               else {
-                while (!IsFleshWorkListEmpty())
-                  DosSleep(10); //Yield to Flesh thread
+                WaitFleshWorkListEmpty(pci->pszFileName, 10);   // 2015-08-19 SHL in case pci still in work list
               }
               AddFleshWorkRequest(dcd->hwndCnr, pci, eFlesh);   // forceFlesh
-              if (!dcd->suspendview && fTopDir && !fSwitchTreeOnDirChg) {
+              if (!dcd->suspendview && fTopDir) {
                 //DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_TOPDIR %p pci %p %s",
                 //       qmsg.hwnd, pci, pci->pszFileName);  // 2015-08-04 SHL FIXME debug