Review inspired changes to Symbian file system watcher

- Added retry to failed notification request.
- Removed superfluous New method.
- Cosmetic changes.

Reviewed-by: Janne Koskinen

2 files changed, 58 insertions, 55 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 72b8b836e..45bb752a1 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian.cpp
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -51,22 +51,17 @@
 
 QT_BEGIN_NAMESPACE
 
-CNotifyChangeEvent* CNotifyChangeEvent::New(RFs &fs, const TDesC& file,
-        QSymbianFileSystemWatcherEngine* e, bool aIsDir)
-{
-    CNotifyChangeEvent* self = new CNotifyChangeEvent(fs, file, e, aIsDir);
-    return self;
-}
-
-CNotifyChangeEvent::CNotifyChangeEvent(RFs &fs, const TDesC& file,
-    QSymbianFileSystemWatcherEngine* e, bool aIsDir, TInt aPriority) :
+QNotifyChangeEvent::QNotifyChangeEvent(RFs &fs, const TDesC &file,
+                                       QSymbianFileSystemWatcherEngine *e, bool aIsDir,
+									   TInt aPriority) :
         CActive(aPriority),
         isDir(aIsDir),
         fsSession(fs),
         watchedPath(file),
-        engine(e)
+        engine(e),
+        failureCount(0)
 {
-    if(isDir) {
+    if (isDir) {
         fsSession.NotifyChange(ENotifyEntry, iStatus, file);
     } else {
         fsSession.NotifyChange(ENotifyAll, iStatus, file);
@@ -75,33 +70,43 @@ CNotifyChangeEvent::CNotifyChangeEvent(RFs &fs, const TDesC& file,
     SetActive();
 }
 
-CNotifyChangeEvent::~CNotifyChangeEvent()
+QNotifyChangeEvent::~QNotifyChangeEvent()
 {
     Cancel();
 }
 
-void CNotifyChangeEvent::RunL()
+void QNotifyChangeEvent::RunL()
 {
-    if (iStatus.Int() == KErrNone) {
-        if(isDir) {
+    if(iStatus.Int() == KErrNone) {
+        failureCount = 0;
+    } else {
+        qWarning("QNotifyChangeEvent::RunL() - Failed to order change notifications: %d", iStatus.Int());
+        failureCount++;
+    }
+
+    // Re-request failed notification once, but if it won't start working,
+    // we can't do much besides just not request any more notifications.
+    if (failureCount < 2) {
+        if (isDir) {
             fsSession.NotifyChange(ENotifyEntry, iStatus, watchedPath);
         } else {
             fsSession.NotifyChange(ENotifyAll, iStatus, watchedPath);
         }
         SetActive();
-        QT_TRYCATCH_LEAVING(engine->emitPathChanged(this));
-    } else {
-        qWarning("CNotifyChangeEvent::RunL() - Failed to order change notifications: %d", iStatus.Int());
+
+        if (!failureCount) {
+            QT_TRYCATCH_LEAVING(engine->emitPathChanged(this));
+        }
     }
 }
 
-void CNotifyChangeEvent::DoCancel()
+void QNotifyChangeEvent::DoCancel()
 {
     fsSession.NotifyChangeCancel(iStatus);
 }
 
 QSymbianFileSystemWatcherEngine::QSymbianFileSystemWatcherEngine() :
-    watcherStarted(false)
+        watcherStarted(false)
 {
     moveToThread(this);
 }
@@ -111,8 +116,8 @@ QSymbianFileSystemWatcherEngine::~QSymbianFileSystemWatcherEngine()
     stop();
 }
 
-QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
-        QStringList *files, QStringList *directories)
+QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths, QStringList *files,
+        QStringList *directories)
 {
     QMutexLocker locker(&mutex);
     QStringList p = paths;
@@ -141,15 +146,15 @@ QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
 
         // Use absolute filepath as relative paths seem to have some issues.
         QString filePath = fi.absoluteFilePath();
-        if(isDir && filePath.at(filePath.size()-1) != QChar(L'/')) {
+        if (isDir && filePath.at(filePath.size() - 1) != QChar(L'/')) {
             filePath += QChar(L'/');
         }
 
         currentEvent = NULL;
         QMetaObject::invokeMethod(this,
-                "addNativeListener",
-                Qt::QueuedConnection,
-                Q_ARG(QString, filePath));
+                                  "addNativeListener",
+                                  Qt::QueuedConnection,
+                                  Q_ARG(QString, filePath));
 
         syncCondition.wait(&mutex);
 
@@ -160,9 +165,9 @@ QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
             it.remove();
 
             if (isDir)
-                 directories->append(path);
-             else
-                 files->append(path);
+                directories->append(path);
+            else
+                files->append(path);
         }
     }
 
@@ -170,7 +175,8 @@ QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
 }
 
 QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &paths,
-        QStringList *files, QStringList *directories)
+                                                         QStringList *files,
+                                                         QStringList *directories)
 {
     QMutexLocker locker(&mutex);
 
@@ -185,8 +191,8 @@ QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &path
         activeObjectToPath.remove(currentEvent);
 
         QMetaObject::invokeMethod(this,
-                "removeNativeListener",
-                Qt::QueuedConnection);
+                                  "removeNativeListener",
+                                  Qt::QueuedConnection);
 
         syncCondition.wait(&mutex);
 
@@ -202,18 +208,17 @@ QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &path
     return p;
 }
 
-void QSymbianFileSystemWatcherEngine::emitPathChanged(CNotifyChangeEvent *e)
+void QSymbianFileSystemWatcherEngine::emitPathChanged(QNotifyChangeEvent *e)
 {
     QMutexLocker locker(&mutex);
 
     QString path = activeObjectToPath.value(e);
     QFileInfo fi(path);
 
-    if (e->isDir) {
+    if (e->isDir)
         emit directoryChanged(path, !fi.exists());
-    } else {
+    else
         emit fileChanged(path, !fi.exists());
-    }
 }
 
 void QSymbianFileSystemWatcherEngine::stop()
@@ -228,9 +233,7 @@ bool QSymbianFileSystemWatcherEngine::startWatcher()
     bool retval = true;
 
     if (!watcherStarted) {
-#if defined(Q_OS_SYMBIAN)
         setStackSize(0x5000);
-#endif
         start();
         syncCondition.wait(&mutex);
 
@@ -257,7 +260,7 @@ void QSymbianFileSystemWatcherEngine::run()
     if (errorCode == KErrNone) {
         exec();
 
-        foreach(CNotifyChangeEvent* e, activeObjectToPath.keys()) {
+        foreach(QNotifyChangeEvent *e, activeObjectToPath.keys()) {
             e->Cancel();
             delete e;
         }
@@ -273,7 +276,7 @@ void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directory
     QMutexLocker locker(&mutex);
     QString nativeDir(QDir::toNativeSeparators(directoryPath));
     TPtrC ptr(qt_QString2TPtrC(nativeDir));
-    currentEvent = CNotifyChangeEvent::New(fsSession, ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
+    currentEvent = new QNotifyChangeEvent(fsSession, ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
     syncCondition.wakeOne();
 }
 
diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h
index a1bd6078f..2b75bed54 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian_p.h
+++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h
@@ -54,12 +54,13 @@
 //
 
 #include "qfilesystemwatcher_p.h"
+
+#ifndef QT_NO_FILESYSTEMWATCHER
+
 #include "qhash.h"
 #include "qmutex.h"
 #include "qwaitcondition.h"
 
-#ifndef QT_NO_FILESYSTEMWATCHER
-
 #include <e32base.h>
 #include <f32file.h>
 
@@ -67,14 +68,12 @@ QT_BEGIN_NAMESPACE
 
 class QSymbianFileSystemWatcherEngine;
 
-class CNotifyChangeEvent : public CActive
+class QNotifyChangeEvent : public CActive
 {
 public:
-    CNotifyChangeEvent(RFs &fsSession, const TDesC& file, QSymbianFileSystemWatcherEngine* engine,
-            bool aIsDir, TInt aPriority = EPriorityStandard);
-    ~CNotifyChangeEvent();
-    static CNotifyChangeEvent* New(RFs &fsSession, const TDesC& file,
-            QSymbianFileSystemWatcherEngine* engine, bool aIsDir);
+    QNotifyChangeEvent(RFs &fsSession, const TDesC &file, QSymbianFileSystemWatcherEngine *engine,
+                       bool aIsDir, TInt aPriority = EPriorityStandard);
+    ~QNotifyChangeEvent();
 
     bool isDir;
 
@@ -85,6 +84,8 @@ private:
     RFs &fsSession;
     TPath watchedPath;
     QSymbianFileSystemWatcherEngine *engine;
+
+    int failureCount;
 };
 
 class QSymbianFileSystemWatcherEngine : public QFileSystemWatcherEngine
@@ -95,10 +96,9 @@ public:
     QSymbianFileSystemWatcherEngine();
     ~QSymbianFileSystemWatcherEngine();
 
-    QStringList addPaths(const QStringList &paths, QStringList *files,
-            QStringList *directories);
+    QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories);
     QStringList removePaths(const QStringList &paths, QStringList *files,
-            QStringList *directories);
+                            QStringList *directories);
 
     void stop();
 
@@ -110,18 +110,18 @@ public Q_SLOTS:
     void removeNativeListener();
 
 private:
-    friend class CNotifyChangeEvent;
-    void emitPathChanged(CNotifyChangeEvent *e);
+    friend class QNotifyChangeEvent;
+    void emitPathChanged(QNotifyChangeEvent *e);
 
     bool startWatcher();
 
     RFs fsSession;
-    QHash<CNotifyChangeEvent*, QString> activeObjectToPath;
+    QHash<QNotifyChangeEvent*, QString> activeObjectToPath;
     QMutex mutex;
     QWaitCondition syncCondition;
     int errorCode;
     bool watcherStarted;
-    CNotifyChangeEvent *currentEvent;
+    QNotifyChangeEvent *currentEvent;
 };
 
 #endif // QT_NO_FILESYSTEMWATCHER