Ticket #231: qfilesystemwatcher_os2.diff

qfilesystemwatcher_os2.cpp

@@ -96 +96 @@
 QOS2FileSystemWatcherEngine::QOS2FileSystemWatcherEngine()
     : notifyPipe(NULLHANDLE), eventSem(NULLHANDLE), isRunning(false)
 {
-    ULONG dummy;
-    APIRET arc = DosOpen(PIPE_CHANGENOTIFY, &notifyPipe, &dummy, 0, FILE_OPEN,
-                         OPEN_ACTION_OPEN_IF_EXISTS,
-                         OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, NULL);
-    if (arc == NO_ERROR) {
-        // make sure the pipe is non-blocking so that we can get ERROR_NO_DATA
-        arc = DosSetNPHState(notifyPipe, NP_NOWAIT);
-        Q_ASSERT(arc == NO_ERROR);
-        // connect the pipe to the semaphore
-        arc = DosCreateEventSem(NULL, &eventSem,
+    APIRET arc;
+    ULONG dummy, retries = 3;
+
+    do {
+        arc = DosOpen(PIPE_CHANGENOTIFY, &notifyPipe, &dummy,
+                      0, FILE_OPEN, OPEN_ACTION_OPEN_IF_EXISTS,
+                      OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY | OPEN_FLAGS_NOINHERIT, NULL);
+        if (arc == NO_ERROR) {
+            // make sure the pipe is non-blocking so that we can get ERROR_NO_DATA
+            arc = DosSetNPHState(notifyPipe, NP_NOWAIT);
+            Q_ASSERT(arc == NO_ERROR);
+            // connect the pipe to the semaphore
+            arc = DosCreateEventSem(NULL, &eventSem,
                                 DC_SEM_SHARED | DCE_AUTORESET | DCE_POSTONE,
                                 FALSE);
-        Q_ASSERT(arc == NO_ERROR);
-        arc = DosSetNPipeSem(notifyPipe, (HSEM)eventSem, 0);
-        Q_ASSERT(arc == NO_ERROR);
-    } else {
-        notifyPipe = NULLHANDLE; // sanity (used by isOk())
-        if (arc != ERROR_FILE_NOT_FOUND &&
-            arc != ERROR_PATH_NOT_FOUND)
-            qWarning("QOS2FileSystemWatcherEngine:: "
-                     "DosOpen("PIPE_CHANGENOTIFY") returned %lu", arc);
-    }
+            Q_ASSERT(arc == NO_ERROR);
+            arc = DosSetNPipeSem(notifyPipe, (HSEM)eventSem, 0);
+            Q_ASSERT(arc == NO_ERROR);
+
+            retries = 0;
+        } else {
+            notifyPipe = NULLHANDLE; // sanity (used by isOk())
+
+            if (arc == ERROR_PIPE_BUSY && --retries)
+                DosSleep(100);
+            else if (arc != ERROR_FILE_NOT_FOUND &&
+                     arc != ERROR_PATH_NOT_FOUND)
+                qWarning("QOS2FileSystemWatcherEngine:: "
+                         "DosOpen("PIPE_CHANGENOTIFY") returned %lu", arc);
+        }
+    } while (arc == ERROR_PIPE_BUSY && retries);
 }
 
 QOS2FileSystemWatcherEngine::~QOS2FileSystemWatcherEngine()