Changeset 945 for trunk/src/corelib/io/qfilesystemwatcher_os2.cpp

Timestamp:

Aug 5, 2011, 11:26:12 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Make native QFileSystemWatcher recognize file changes.

The original notification mechanism does not actually implement
the file date/time/size change notification. To solve this,
we add another thread that only check for file attribute changes
at specified polling intervals (using a relatively fast native stat call)
and nothing more.

The file change notification is needed e.g. for Qt Creator which
uses it to detect external file notifications in the editor.

File:

• trunk/src/corelib/io/qfilesystemwatcher_os2.cpp (modified) (17 diffs)

trunk/src/corelib/io/qfilesystemwatcher_os2.cpp

@@ -94 +94 @@
 QT_BEGIN_NAMESPACE
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 class QOS2FileSysWatcherThread : public QThread
 {
@@ -113 +145 @@
     static void removePaths(QOS2FileSystemWatcherEngine *engine);
 
+
+
     static bool isOk() { return instance->notifyPipe != NULLHANDLE; }
 
@@ -121 +155 @@
 
     void run();
+
+
 
     int refcnt;
@@ -127 +163 @@
     HFILE notifyPipe;
     HEV eventSem;
+
+
 
     enum Type { None = 0, Dir, File };
@@ -143 +181 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // static
 QOS2FileSysWatcherThread *QOS2FileSysWatcherThread::instance = 0;
@@ -170 +324 @@
         QOS2FileSysWatcherThread *instance = QOS2FileSysWatcherThread::instance;
         QOS2FileSysWatcherThread::instance = 0;
-        if (instance->isRunning()) {
-            // stop the thread
-            instance->finish = true;
-            locker.unlock();
-            DosPostEventSem(instance->eventSem);
-            instance->wait();
-        }
+        instance->poller.stop();
+        instance->stop(locker);
         delete instance;
     }
@@ -228 +377 @@
 {
     Q_ASSERT(!refcnt);
-    Q_ASSERT(!watchedPaths.size());
+    Q_ASSERT(());
 
     if (notifyPipe != NULLHANDLE) {
@@ -236 +385 @@
 }
 
+
 QStringList QOS2FileSysWatcherThread::addPaths(QOS2FileSystemWatcherEngine *engine,
                                                const QStringList &paths,
@@ -243 +393 @@
     QMutexLocker locker(&mutex);
 
-    QStringList p = paths;
+    QStringList p = paths;
     QMutableListIterator<QString> it(p);
     while (it.hasNext()) {
@@ -264 +414 @@
         }
 
+
+
+
         QList<PathInfo> &variants = instance->watchedPaths[normalPath];
-        bool alreadyAdded = false;
+        bool alreadyAdded = false;
         for (QList<PathInfo>::iterator pathIt = variants.begin();
              pathIt != variants.end(); ++pathIt) {
             if (pathIt->path == path) {
-                if (pathIt->engines.contains(engine)) {
+                found = true;
+                if (pathIt->engines.contains(engine))
                     alreadyAdded = true;
-                    break;
-                }
-                pathIt->engines.append(engine);
+                
+                
+                ;
             }
         }
@@ -279 +433 @@
             continue;
 
-        variants << PathInfo(path, type, engine);
+        if (!found)
+            variants << PathInfo(path, type, engine);
         it.remove();
     }
@@ -289 +444 @@
     }
 
+
+
+
+
     return p;
 }
 
+
 QStringList QOS2FileSysWatcherThread::removePaths(QOS2FileSystemWatcherEngine *engine,
                                                   const QStringList &paths,
@@ -299 +459 @@
     QMutexLocker locker(&mutex);
 
-    QStringList p = paths;
+    QStringList p = paths;
     QMutableListIterator<QString> it(p);
     while (it.hasNext()) {
@@ -322 +482 @@
             }
 
-            if (variants.isEmpty())
+            if (variants.isEmpty())
                 instance->watchedPaths.remove(normalPath);
-        }
-    }
-
-    if (instance->watchedPaths.isEmpty()) {
-        // stop the thread
-        instance->finish = true;
-        DosPostEventSem(instance->eventSem);
-    }
+                pollerPaths << normalPath;
+            }
+        }
+    }
+
+    // remove unwatched normal paths from the poller
+    if (!pollerPaths.isEmpty())
+        instance->poller.removePaths(pollerPaths);
+
+    if (instance->watchedPaths.isEmpty())
+        instance->stop(locker);
 
     return p;
 }
 
+
 void QOS2FileSysWatcherThread::removePaths(QOS2FileSystemWatcherEngine *engine)
 {
     QMutexLocker locker(&mutex);
 
+
     foreach (const QString &normalPath, instance->watchedPaths.keys()) {
         QList<PathInfo> &variants = instance->watchedPaths[normalPath];
@@ -352 +517 @@
         }
 
-        if (variants.isEmpty())
+        if (variants.isEmpty())
             instance->watchedPaths.remove(normalPath);
-    }
-
-    if (instance->watchedPaths.isEmpty()) {
-        // stop the thread
-        instance->finish = true;
-        DosPostEventSem(instance->eventSem);
+            pollerPaths << normalPath;
+        }
+    }
+
+    // remove unwatched normal paths from the poller
+    if (!pollerPaths.isEmpty())
+        instance->poller.removePaths(pollerPaths);
+
+    if (instance->watchedPaths.isEmpty() && instance->isRunning())
+        instance->stop(locker);
+}
+
+// static
+void QOS2FileSysWatcherThread::reportChanges(const QStringList &paths)
+{
+    QMutexLocker locker(&mutex);
+
+    foreach (const QString &path, paths) {
+        // signal the change
+        if (instance->watchedPaths.contains(path)) {
+            QList<PathInfo> &variants = instance->watchedPaths[path];
+            foreach(const PathInfo &pi, variants) {
+                foreach(QOS2FileSystemWatcherEngine *e, pi.engines) {
+                    if (pi.type == File)
+                        e->doFileChanged(pi.path, false);
+                    else
+                        e->doDirectoryChanged(pi.path, false);
+                }
+            }
+        }
     }
 }
@@ -421 +610 @@
                         bool deleted = info->bAction != RCNF_CHANGED;
                         if (deleted) {
+
                             deletedVariants = variants;
                             variants = deletedVariants;
+
                             watchedPaths.remove(normalPath);
+
                         }
                         foreach(const PathInfo &pi, variants) {
@@ -467 +659 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QOS2FileSystemWatcherEngine::QOS2FileSystemWatcherEngine()
 {