Changeset 195 for trunk/src/corelib

Timestamp:

Sep 26, 2009, 2:34:55 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Don't break waiting on sync primitives because of ERROR_INTERRUPT that we get as a result of handling Posix signals (SIGCHILD at the moment).

Location:

trunk/src/corelib

Files:

• global/qt_os2.h (modified) (1 diff)
• io/qprocess_os2.cpp (modified) (4 diffs)
• thread/qmutex_os2.cpp (modified) (1 diff)
• thread/qthread_os2.cpp (modified) (4 diffs)
• thread/qwaitcondition_os2.cpp (modified) (1 diff)

trunk/src/corelib/global/qt_os2.h

@@ -69 +69 @@
 #endif
 
+
+
+
+
+
+
+
 #endif // defined(Q_CC_GNU) && defined(__INNOTEK_LIBC__)
 

trunk/src/corelib/io/qprocess_os2.cpp

@@ -332 +332 @@
     do {
         locker.unlock();
-        arc = DosWaitEventSem(eventSem, SEM_INDEFINITE_WAIT);
+        );
         locker.relock();
         if (finish)
@@ -941 +941 @@
                 }
             } else {
-                APIRET arc = DosWaitEventSem(waitSem, (ULONG)timeout);
+                APIRET arc;
+                qDosNI(arc = DosWaitEventSem(waitSem, (ULONG)timeout));
                 if (arc == ERROR_TIMEOUT) {
                     timedOut = true;
@@ -1035 +1036 @@
                 }
             } else {
-                APIRET arc = DosWaitEventSem(waitSem, (ULONG)timeout);
+                APIRET arc;
+                qDosNI(arc = DosWaitEventSem(waitSem, (ULONG)timeout));
                 if (arc == ERROR_TIMEOUT) {
                     timedOut = true;
@@ -1132 +1134 @@
                 }
             } else {
-                APIRET arc = DosWaitEventSem(waitSem, (ULONG)timeout);
+                APIRET arc;
+                qDosNI(arc = DosWaitEventSem(waitSem, (ULONG)timeout));
                 if (arc == ERROR_TIMEOUT) {
                     timedOut = true;

trunk/src/corelib/thread/qmutex_os2.cpp

@@ -68 +68 @@
 bool QMutexPrivate::wait(int timeout)
 {
-    APIRET rc = DosWaitEventSem(sem, timeout < 0 ? SEM_INDEFINITE_WAIT : timeout);
+    APIRET rc;
+    qDosNI(rc = DosWaitEventSem(sem, timeout < 0 ? SEM_INDEFINITE_WAIT : timeout));
     switch (rc) {
         case NO_ERROR:

trunk/src/corelib/thread/qthread_os2.cpp

@@ -190 +190 @@
         for (int i = 0; i < qt_adopted_thread_tids.size();) {
             tid = qt_adopted_thread_tids.at(i);
-            rc = DosWaitThread(&tid, DCWW_NOWAIT);
+            );
             if (rc != ERROR_THREAD_NOT_TERMINATED) {
                 if (rc == NO_ERROR || rc == ERROR_INVALID_THREADID) {
@@ -206 +206 @@
         qt_adopted_thread_watcher_mutex.unlock();
 
-        rc = DosWaitEventSem(qt_adopted_thread_wakeup, 300);
+        );
         if (rc != NO_ERROR && rc != ERROR_TIMEOUT) {
             qWarning("qt_adopted_thread_watcher_function: DosWaitEventSem returned %lu", rc);
@@ -437 +437 @@
     APIRET rc = NO_ERROR;
     if (time == ULONG_MAX) {
-        rc = DosWaitThread(&tid, DCWW_WAIT);
+        );
     } else {
         ULONG sleep;
@@ -447 +447 @@
             sleep = time > THREAD_WAIT_INTERVAL ? THREAD_WAIT_INTERVAL : time;
             DosSleep(sleep);
-            rc = DosWaitThread(&tid, DCWW_NOWAIT);
+            );
             if (rc != ERROR_THREAD_NOT_TERMINATED)
                 break;

trunk/src/corelib/thread/qwaitcondition_os2.cpp

@@ -118 +118 @@
     // wait for the event
     bool ret = false;
-    APIRET rc = DosWaitEventSem(wce->event, time);
+    APIRET rc;
+    qDosNI(rc = DosWaitEventSem(wce->event, time));
     if (rc == NO_ERROR)
         ret = true;