Changeset 66 for trunk

Timestamp:

Jun 29, 2009, 11:49:20 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: OS/2: Ported QWaitCondition.

File:

• trunk/src/corelib/thread/qwaitcondition_os2.cpp (copied) (copied from trunk/src/corelib/thread/qwaitcondition_win.cpp ) (10 diffs)

trunk/src/corelib/thread/qwaitcondition_os2.cpp

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information ([email protected])
+
+
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -46 +48 @@
 #include "qlist.h"
 #include "qalgorithms.h"
-#include "qt_windows.h"
+#include "qt_.h"
 
 #ifndef QT_NO_THREAD
 
-#define Q_MUTEX_T void*
 #include <private/qmutex_p.h>
 #include <private/qreadwritelock_p.h>
@@ -65 +66 @@
     inline QWaitConditionEvent() : priority(0), wokenUp(false)
     {
-        QT_WA ({
-            event = CreateEvent(NULL, TRUE, FALSE, NULL);
-        }, {
-            event = CreateEventA(NULL, TRUE, FALSE, NULL);
-        });
-    }
-    inline ~QWaitConditionEvent() { CloseHandle(event); }
+        event = NULLHANDLE;
+        DosCreateEventSem(NULL, &event, 0, FALSE);
+    }
+    inline ~QWaitConditionEvent() { DosCloseEventSem(event); }
     int priority;
     bool wokenUp;
-    HANDLE event;
+    H event;
 };
 
@@ -96 +94 @@
     QWaitConditionEvent *wce =
         freeQueue.isEmpty() ? new QWaitConditionEvent : freeQueue.takeFirst();
-    wce->priority = GetThreadPriority(GetCurrentThread());
+
+    PTIB ptib;
+    DosGetInfoBlocks(&ptib, NULL);
+    wce->priority = ptib->tib_ptib2->tib2_ulpri;
+
     wce->wokenUp = false;
 
@@ -116 +118 @@
     // wait for the event
     bool ret = false;
-    switch (WaitForSingleObject(wce->event, time)) {
-    default: break;
-
-    case WAIT_OBJECT_0:
+    APIRET rc = DosWaitEventSem(wce->event, time);
+    if (rc == NO_ERROR)
         ret = true;
-        break;
-    }
+
     return ret;
 }
@@ -132 +131 @@
     // remove 'wce' from the queue
     queue.removeAll(wce);
-    ResetEvent(wce->event);
+    ULONG posts;
+    DosResetEventSem(wce->event, &posts);
     freeQueue.append(wce);
 
@@ -138 +138 @@
     if (!ret && wce->wokenUp && !queue.isEmpty()) {
         QWaitConditionEvent *other = queue.first();
-        SetEvent(other->event);
+        (other->event);
         other->wokenUp = true;
     }
@@ -217 +217 @@
         if (current->wokenUp)
             continue;
-        SetEvent(current->event);
+        (current->event);
         current->wokenUp = true;
         break;
@@ -229 +229 @@
     for (int i = 0; i < d->queue.size(); ++i) {
         QWaitConditionEvent *current = d->queue.at(i);
-        SetEvent(current->event);
+        (current->event);
         current->wokenUp = true;
     }
@@ -235 +235 @@
 
 QT_END_NAMESPACE
+
 #endif // QT_NO_THREAD