Changeset 1313

Timestamp:

Dec 3, 2008, 3:59:19 PM (17 years ago)

Author:

Gregg Young

Message:

Improved fix to delete race condition with container updates (Ticket 304)

Location:

trunk/dll

Files:

• init.c (modified) (2 diffs)
• init.h (modified) (1 diff)
• worker.c (modified) (5 diffs)

trunk/dll/init.c

@@ -158 +158 @@
 
 #pragma data_seg(GLOBAL1)
-HMTX hmtxDeleteDir;
+HMTX hmtxFM2Delete;
 HMTX hmtxFM2Globals;
 ULONG OS2ver[2];
@@ -1185 +1185 @@
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               "DosCreateMutexSem");
-  if (DosCreateMutexSem("\\SEM\\DELETDIR", &hmtxDeleteDir, 0L, FALSE))
+  if (DosCreateMutexSem("\\SEM\\DELETE1", &hmtxFM2Delete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               "DosCreateMutexSem");

trunk/dll/init.h

@@ -92 +92 @@
 extern ULONGLONG ullTmpSpaceNeeded;
 extern HMTX hmtxFM2Globals;
-extern HMTX hmtxDeleteDir;
+extern HMTX hmtxFM2Delete;
 
 #endif // INIT_H

trunk/dll/worker.c

@@ -1605 +1605 @@
                                  &fsa, (ULONG) sizeof(FILESTATUS3));
                 if (fsa.attrFile & FILE_DIRECTORY) {
-                  //priority_bumped();
-                  DosRequestMutexSem(hmtxDeleteDir, SEM_INDEFINITE_WAIT);
                   sprintf(prompt,
                           GetPString(IDS_DELETINGTEXT), wk->li->list[x]);
+                  DosRequestMutexSem(hmtxFM2Delete, SEM_INDEFINITE_WAIT); // Prevent race 12-3-08 GKY
                   AddNote(prompt);
                   error = (APIRET) wipeallf("%s%s*",
@@ -1622 +1621 @@
                   else
                     DosDeleteDir(wk->li->list[x]);
-                  DosReleaseMutexSem(hmtxDeleteDir);
-                  //priority_normal();
+                  DosReleaseMutexSem(hmtxFM2Delete);
                 }
                 else {
@@ -1646 +1644 @@
                         error = WinMoveObject(hObjectofObject, hObjectdest, 0);
                     }
-                    else
-                      error = DosDelete(wk->li->list[x]);
+                    else {
+                      DosRequestMutexSem(hmtxFM2Delete, SEM_INDEFINITE_WAIT); // Prevent race 12-3-08 GKY
+                      error = DosDelete(wk->li->list[x]);
+                      DosReleaseMutexSem(hmtxFM2Delete);
+                    }
                   }
-                  else
-                    error = DosForceDelete(wk->li->list[x]);
+                  else {
+                    DosRequestMutexSem(hmtxFM2Delete, SEM_INDEFINITE_WAIT); // Prevent race 12-3-08 GKY
+                    error = DosForceDelete(wk->li->list[x]);
+                    DosReleaseMutexSem(hmtxFM2Delete);
+                  }
                   if (error) {
                     DosError(FERR_DISABLEHARDERR);
@@ -1670 +1674 @@
                           error = WinMoveObject(hObjectofObject, hObjectdest, 0);
                       }
-                      else
-                        error = DosDelete(wk->li->list[x]);
+                      else {
+                        DosRequestMutexSem(hmtxFM2Delete, SEM_INDEFINITE_WAIT); // Prevent race 12-3-08 GKY
+                        error = DosDelete(wk->li->list[x]);
+                        DosReleaseMutexSem(hmtxFM2Delete);
+                      }
                     }
-                    else
-                      error = DosForceDelete(wk->li->list[x]);
+                    else {
+                      DosRequestMutexSem(hmtxFM2Delete, SEM_INDEFINITE_WAIT); // Prevent race 12-3-08 GKY
+                      error = DosForceDelete(wk->li->list[x]);
+                      DosReleaseMutexSem(hmtxFM2Delete);
+                    }
                   }
                 }
@@ -1699 +1709 @@
                   AddNote(prompt);
                 }
-                if ((fSyncUpdates  && !(fsa.attrFile & FILE_DIRECTORY)) ||
+                if (fSyncUpdates ||
                     AddToList(wk->li->list[x], &files, &numfiles, &numalloc))
                   Broadcast(hab2,