Changeset 805

Timestamp:

Oct 26, 2010, 3:02:14 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed a hang when attempting to stop the file watcher thread after reusing it for more than one directory (e.g. like in the standard file dialog).

Location:

trunk/src/corelib/io

Files:

• qfilesystemwatcher_os2.cpp (modified) (5 diffs)
• qfilesystemwatcher_os2_p.h (modified) (1 diff)

trunk/src/corelib/io/qfilesystemwatcher_os2.cpp ¶

@@ -95 +95 @@
 
 QOS2FileSystemWatcherEngine::QOS2FileSystemWatcherEngine()
-    : notifyPipe(NULLHANDLE), eventSem(NULLHANDLE), finish(false)
+    : notifyPipe(NULLHANDLE), eventSem(NULLHANDLE), isRunning(false)
 {
     ULONG dummy;
@@ -163 +163 @@
     }
 
-    start(IdlePriority);
+    if (!isRunning) {
+        // (re)start the watcher thread
+        isRunning = true;
+        start(IdlePriority);
+    }
 
     return p;
@@ -199 +203 @@
     if (watchedPaths.isEmpty()) {
         // stop the thread
-        finish = true;
+        isRunning = false;
         DosPostEventSem(eventSem);
         locker.unlock();
@@ -221 +225 @@
         qDosNI(arc = DosWaitEventSem(eventSem, SEM_INDEFINITE_WAIT));
         locker.relock();
-
-        if (finish)
+        
+        if (!isRunning)
             break;
 
@@ -312 +316 @@
 {
     QMutexLocker locker(&mutex);
-    if (!finish) {
-        finish = true;
+    if (isRunning) {
+        isRunning = false;
         DosPostEventSem(eventSem);
         locker.unlock();

trunk/src/corelib/io/qfilesystemwatcher_os2_p.h ¶

@@ -87 +87 @@
     HFILE notifyPipe;
     HEV eventSem;
-    bool finish;
+    bool isRunning;
 
     enum Type { None = 0, Dir, File };