Changeset 1553 for trunk/dll/treecnr.c

Timestamp:

Nov 20, 2010, 10:18:32 PM (15 years ago)

Author:

Gregg Young

Message:

Rework scanning code to remove redundant scans, prevent double directory entries in the tree container, fix related semaphore performance using combination of event and mutex semaphores

File:

• trunk/dll/treecnr.c (modified) (10 diffs)

trunk/dll/treecnr.c

@@ -84 +84 @@
   11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
                 never being posted
+  20 Nov 10 GKY Rework scanning code to remove redundant scans, prevent double directory
+                entries in the tree container, fix related semaphore performance using
+                combination of event and mutex semaphores
 
 ***********************************************************************/
@@ -644 +647 @@
       dcd = INSTDATA(hwnd);
       if (dcd) {
-        BOOL tempsusp, tempfollow, temptop;
+        BOOL tempsusp, tempfollow, temptop;
 
         DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
@@ -656 +659 @@
         }
         ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
-        // fixme Is this PostMsg needed if recursive scan has already been done?
         PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
         dcd->suspendview = (USHORT) tempsusp;
@@ -771 +773 @@
       if (cnri.cRecords) {
         sprintf(s, GetPString(IDS_NUMDRIVESTEXT), cnri.cRecords);
-        if (pci && pci->pszFileName && *pci->pszFileName) {
+        if (pci && (INT) pci != -1 && pci->pszFileName && *pci->pszFileName) {
           if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
                 DRIVE_REMOVABLE) ||
@@ -1827 +1829 @@
                      driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
-                  if (Flesh(hwnd, pci) &&
-                      SHORT2FROMMP(mp1) == CN_EXPANDTREE &&
-                      !dcd->suspendview && fTopDir) {
+                  if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && Flesh(hwnd, pci)
+                      &&!dcd->suspendview  && fTopDir) {
                     PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
                     //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
@@ -1905 +1906 @@
       INT x;
 
-      DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
+      DosRequestMutexSem(hmtxScanning, SEM_INDEFINITE_WAIT);
       DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
       if (fFollowTree)
@@ -1984 +1985 @@
           if (!status) {
             if (!volser.serial || driveserial[x] != volser.serial) {
-              UnFlesh(hwnd, pciP);
               Flesh(hwnd, pciP);
               driveserial[x] = volser.serial;
@@ -1992 +1992 @@
                               MPFROMP(pciP),
                               MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-            if (!pciL)
-              Flesh(hwnd, pciP);
+            if (!pciL) {
+              Flesh(hwnd, pciP);
+            }
             if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
                 strlen(pciP->pszFileName) < 4) {
@@ -2790 +2791 @@
               if (pci->flags & RECFLAGS_UNDERENV)
                 break;
-              DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
+              DosRequestMutexSem(hmtxScanning, SEM_INDEFINITE_WAIT);
               DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
               UnFlesh(hwnd, pci);
@@ -2802 +2803 @@
                 else  if (strlen(pci->pszFileName) < 4) {
                   SelectDriveIcon(pci);
-                }
-                if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
-                    strlen(pci->pszFileName) < 4) {
-                  strcpy(szBuf, pci->pszFileName);
-                  strcat(szBuf, " [");
-                  strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
-                  strcat(szBuf, "]");
-                  pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
-                  pci->rc.pszIcon = pci->pszDisplayName;
-                }
+                  if (fShowFSTypeInTree || fShowDriveLabelInTree) {
+                    strcpy(szBuf, pci->pszFileName);
+                    strcat(szBuf, " [");
+                    strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
+                    strcat(szBuf, "]");
+                    pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+                    pci->rc.pszIcon = pci->pszDisplayName;
+                  }
+                }
                 WinSendMsg(hwnd,
                            CM_INVALIDATERECORD,