Changeset 1871 for trunk/dll/dirsize.c

Timestamp:

Sep 21, 2015, 12:57:02 AM (10 years ago)

Author:

Gregg Young

Message:

Create CollapseAll and modify ExpandAll to reduce code overhead both to try and speed drive expansion. Change ExpandAll to allow it to loop in UM_EXPAND until until drive is completely expanded. Changes were need to work with Flesh, Stubby and UnFlesh being moved to a thread. Add code for Flesh to skip the directory entry added by Stubby (eliminate use of NULL/Nullstr pszFileNames by Stubby). Add code in Stubby to insert a complete container item. Add a flag to indicate when a directory needed to be Fleshed. Get expand and switch code to work with Flesh, UnFlesh and Stubby running on a thread. Loop and idle ExpandAll; Move tree expand to a thread; Have ShowTreeRec wait for the Flesh thread. Add a correction factor so directories don't get placed above the top of the tree container when a large drive has been expanded. Debug is mostly still in but all turned off.

File:

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

trunk/dll/dirsize.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2010 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -56 +56 @@
                 by temp file creation failures.
   12 Jun 11 GKY Added SleepIfNeeded in the container fill loop
+  20 Sep 15 GKY Move directory expansion to a thread. Split ExpandAll into ExpandAll and CollapseAll
+                to try to speed proccessing else where.
 
 ***********************************************************************/
@@ -109 +111 @@
 typedef struct
 {
+  HWND hwndCnr;
+  PCNRITEM pci;
+} EXPANDSIZE;
+
+typedef struct
+{
   CHAR szDirName[CCHMAXPATH];
   CHAR chStopFlag;
@@ -497 +505 @@
   PostMsg(WinQueryWindow(hwndCnr, QW_PARENT),
           UM_CONTAINER_FILLED, MPVOID, MPVOID);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+#  endif
+}
+
+static VOID ExpandCnrThread(VOID *args)
+{
+  HAB hab;
+  HMQ hmq;
+  INT x = 0;
+  EXPANDSIZE *expandsize = (EXPANDSIZE *)args;
+
+  if (!expandsize) {
+    Runtime_Error(pszSrcFile, __LINE__, NULL);
+    return;
+  }
+# ifdef FORTIFY
+  Fortify_EnterScope();
+  Fortify_BecomeOwner(expandsize);              // We free dirsize
+#  endif
+
+  DosError(FERR_DISABLEHARDERR);
+
+  priority_idle();
+  hab = WinInitialize(0);
+  if (hab) {
+    hmq = WinCreateMsgQueue(hab, 0);
+    if (hmq) {
+      WinCancelShutdown(hmq, TRUE);
+      ExpandAll(expandsize->hwndCnr, x, expandsize->pci);
+      WinDestroyMsgQueue(hmq);
+    }
+    WinTerminate(hab);
+  }
+
+  xfree(expandsize, pszSrcFile, __LINE__);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1010 +1054 @@
           WinEnableWindow(WinWindowFromID(hwnd, DSZ_PRINT), FALSE);
           WinEnableWindow(WinWindowFromID(hwnd, DID_CANCEL), FALSE);
-          // fixme to use thread - too slow on large trees
-          ExpandAll(WinWindowFromID(hwnd, DSZ_CNR),
-                    (SHORT1FROMMP(mp1) == DSZ_EXPAND), pci);
+          if (SHORT1FROMMP(mp1) == DSZ_EXPAND) {
+            EXPANDSIZE *expandsize;
+
+            expandsize = xmalloc(sizeof(EXPANDSIZE), pszSrcFile, __LINE__);
+            if (expandsize) {
+
+            expandsize->pci = pci;
+            expandsize->hwndCnr = WinWindowFromID(hwnd, DSZ_CNR);
+            if (xbeginthread(ExpandCnrThread,
+                             122880 * 5,
+                             expandsize,
+                             pszSrcFile,
+                             __LINE__) == -1)
+              xfree(expandsize, pszSrcFile, __LINE__);
+            }
+          }
+          else
+            CollapseAll(WinWindowFromID(hwnd, DSZ_CNR), pci);
           WinEnableWindow(WinWindowFromID(hwnd, DID_OK), TRUE);
           WinEnableWindow(WinWindowFromID(hwnd, IDM_HELP), TRUE);