Changeset 82 for trunk/src/corelib/thread

Timestamp:

Jul 11, 2009, 1:51:36 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

QMutex: OS/2: Use an event semaphore since the rest is done through atomic ops (a copy/paste bug from Qt3).

Location:

trunk/src/corelib/thread

Files:

• qmutex_os2.cpp (modified) (3 diffs)
• qmutex_p.h (modified) (1 diff)

trunk/src/corelib/thread/qmutex_os2.cpp

@@ -51 +51 @@
     : recursive(mode == QMutex::Recursive), contenders(0), lastSpinCount(0), owner(0), count(0)
 {
-    APIRET rc = DosCreateMutexSem(NULL, &mtx, 0, FALSE);
+    APIRET rc = DosCreate, FALSE);
     if (rc != NO_ERROR) {
-        mtx = NULLHANDLE;
-        qWarning("QMutexPrivate::QMutexPrivate: DosCreateMutexSem returned %lu", rc);
+         = NULLHANDLE;
+        qWarning("QMutexPrivate::QMutexPrivate: DosCreateSem returned %lu", rc);
     }
 }
@@ -60 +60 @@
 QMutexPrivate::~QMutexPrivate()
 {
-    APIRET rc = DosCloseMutexSem(mtx);
+    APIRET rc = DosClose);
     if (rc != NO_ERROR)
-        qWarning("QMutexPrivate::QMutexPrivate: DosCloseMutexSem returned %lu", rc);
-    mtx = NULLHANDLE;
+        qWarning("QMutexPrivate::QMutexPrivate: DosCloseSem returned %lu", rc);
+     = NULLHANDLE;
 }
 
 bool QMutexPrivate::wait(int timeout)
 {
-    APIRET rc = DosRequestMutexSem(mtx, timeout < 0 ? SEM_INDEFINITE_WAIT : timeout);
+    APIRET rc = Dos, timeout < 0 ? SEM_INDEFINITE_WAIT : timeout);
     switch (rc) {
         case NO_ERROR:
             return true;
-        case ERROR_SEM_OWNER_DIED:
-            qWarning("QMutexPrivate::wait: mutex owner terminated while holding it!");
+        case ERROR_TIMEOUT:
             break;
         default:
-            qWarning("QMutexPrivate::wait: DosRequestMutexSem returned %lu", rc);
+            qWarning("QMutexPrivate::wait: DosSem returned %lu", rc);
             break;
     }
@@ -85 +84 @@
 void QMutexPrivate::wakeUp()
 {
-    APIRET rc = DosReleaseMutexSem(mtx);
+    APIRET rc = Dos);
     if (rc != NO_ERROR) {
-        qWarning("QMutexPrivate::wait: DosReleaseMutexSem returned %lu", rc);
+        qWarning("QMutexPrivate::wait: DosSem returned %lu", rc);
     }
 }

trunk/src/corelib/thread/qmutex_p.h

@@ -86 +86 @@
     HANDLE event;
 #elif defined(Q_OS_OS2)
-    HMTX mtx;
+    H;
 #endif
 };