Changeset 947 for trunk/src

Timestamp:

Aug 8, 2011, 9:35:15 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Added debugging to QFilleSystemWatcher impl.

File:

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

trunk/src/corelib/io/qfilesystemwatcher_os2.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
+//#define QFILESYSTEMWATCHER_DEBUG
+
 #include "qfilesystemwatcher.h"
 #include "qfilesystemwatcher_os2_p.h"
@@ -51 +53 @@
 
 #include "qdebug.h"
+#ifdef QFILESYSTEMWATCHER_DEBUG
+#define DEBUG(a) qDebug a
+#else
+#define DEBUG(a) do {} while(0)
+#endif
 
 // OS/2 has the Dos*ChangeNotify API for file system change notifications but
@@ -212 +219 @@
         arc = DosQueryPathInfo(QFile::encodeName(path), FIL_STANDARD,
                                &newInfo, sizeof(newInfo));
+        DEBUG(() << "POLLER ADD" << path << arc);
         if (arc == NO_ERROR)
             watchedPaths.insert(path, newInfo);
@@ -228 +236 @@
 
     foreach (const QString &path, paths) {
+        DEBUG(() << "POLLER REMOVE" << path);
         watchedPaths.remove(path);
     }
@@ -255 +264 @@
 
         locker.relock();
+
+        //DEBUG(() << "*** POLLER" << watchedPaths.size() << "items");
 
         for (PathMap::iterator it = watchedPaths.begin();
@@ -273 +284 @@
                 newInfo.attrFile != info.attrFile) {
                 // there was a change, memorize it and update the info
+                DEBUG(() << "POLLER CHANGE!" << path);
                 changedPaths << path;
                 info = newInfo;
@@ -285 +297 @@
 void QOS2FileSysPollerThread::stop(QMutexLocker &locker)
 {
-    Q_ASSERT(locker.locked());
-
     if (isRunning()) {
         finish = true;
@@ -393 +403 @@
     QMutexLocker locker(&mutex);
 
+    DEBUG(() << "WATCHER ADD" << paths);
+
     QStringList p = paths, pollerPaths;
     QMutableListIterator<QString> it(p);
@@ -459 +471 @@
     QMutexLocker locker(&mutex);
 
+    DEBUG(() << "WATCHER REMOVE" << paths);
+
     QStringList p = paths, pollerPaths;
     QMutableListIterator<QString> it(p);
@@ -504 +518 @@
     QMutexLocker locker(&mutex);
 
+    DEBUG(() << "WATCHER REMOVE" << engine);
+
     QStringList pollerPaths;
     foreach (const QString &normalPath, instance->watchedPaths.keys()) {
@@ -542 +558 @@
             foreach(const PathInfo &pi, variants) {
                 foreach(QOS2FileSystemWatcherEngine *e, pi.engines) {
-                    if (pi.type == File)
+                    if (pi.type == File) {
+                        DEBUG(() << "WATCHER EMIT FILE"  << pi.path);
                         e->doFileChanged(pi.path, false);
-                    else
+                    } else {
+                        DEBUG(() << "WATCHER EMIT DIR" << pi.path);
                         e->doDirectoryChanged(pi.path, false);
+                    }
                 }
             }
@@ -599 +618 @@
                 QString normalPath = QString::fromLocal8Bit(info->szName).toUpper();
 
+                //DEBUG(() << "WATCHER NOTIFY" << (int) info->bAction << normalPath);
+
                 switch (info->bAction) {
                 case RCNF_FILE_DELETED:
@@ -622 +643 @@
                             if (type == pi.type) {
                                 foreach(QOS2FileSystemWatcherEngine *e, pi.engines) {
-                                    if (type == File)
+                                    if (type == File) {
+                                        DEBUG(() << "WATCHER EMIT FILE"
+                                                 << (int) info->bAction << pi.path
+                                                 << deleted);
                                         e->doFileChanged(pi.path, deleted);
-                                    else
+                                    } else {
+                                        DEBUG(() << "WATCHER EMIT DIR"
+                                                << (int) info->bAction << pi.path
+                                                << deleted);
                                         e->doDirectoryChanged(pi.path, deleted);
+                                    }
                                 }
                             }
@@ -639 +667 @@
                     if (watchedPaths.contains(normalPath)) {
                         foreach(const PathInfo &pi, watchedPaths[normalPath]) {
-                            if (pi.type == Dir)
-                                foreach(QOS2FileSystemWatcherEngine *e, pi.engines)
+                            if (pi.type == Dir) {
+                                foreach(QOS2FileSystemWatcherEngine *e, pi.engines) {
+                                    DEBUG(() << "WATCHER EMIT DIR"
+                                             << (int) info->bAction << pi.path);
                                     e->doDirectoryChanged(pi.path, false);
+                                }
+                            }
                         }
                     }
@@ -661 +693 @@
 void QOS2FileSysWatcherThread::stop(QMutexLocker &locker)
 {
-    Q_ASSERT(locker.locked());
-
     if (isRunning()) {
         // stop the thread