Changeset 2759

Timestamp:

Aug 13, 2006, 12:52:32 AM (19 years ago)

Author:

bird

Message:

Can't use DCE_POSTONE or DCE_AUTORESET with MUX. too bad.

File:

• trunk/synergy/lib/arch/CArchMultithreadOS2.cpp (modified) (4 diffs)

trunk/synergy/lib/arch/CArchMultithreadOS2.cpp

@@ -152 +152 @@
 {
         CArchCondImpl* cond                       = new CArchCondImpl;
-        APIRET rc = DosCreateEventSem(NULL, &cond->m_events[CArchCondImpl::kSignal], DCE_AUTORESET, FALSE);
+        APIRET rc = DosCreateEventSem(NULL, &cond->m_events[CArchCondImpl::kSignal], /*DCE_AUTORESET*/0, FALSE);
         assert(rc == NO_ERROR);
         rc = DosCreateEventSem(NULL, &cond->m_events[CArchCondImpl::kBroadcast], 0, FALSE);
@@ -175 +175 @@
         // is anybody waiting?
         lockMutex(cond->m_waitCountMutex);
-        const bool hasWaiter = (cond->m_waitCount > 0);
+        if (cond->m_waitCount > 0)
+                DosPostEventSem(cond->m_events[CArchCondImpl::kSignal]);
         unlockMutex(cond->m_waitCountMutex);
-
-        // wake one thread if anybody is waiting
-        if (hasWaiter) {
-                DosPostEventSem(cond->m_events[CArchCondImpl::kSignal]);
-        }
 }
 
@@ -189 +185 @@
         // is anybody waiting?
         lockMutex(cond->m_waitCountMutex);
-        const bool hasWaiter = (cond->m_waitCount > 0);
+        if (cond->m_waitCount > 0)
+                DosPostEventSem(cond->m_events[CArchCondImpl::kBroadcast]);
         unlockMutex(cond->m_waitCountMutex);
-
-        // wake all threads if anybody is waiting
-        if (hasWaiter) {
-                DosPostEventSem(cond->m_events[CArchCondImpl::kBroadcast]);
-        }
 }
 
@@ -236 +228 @@
 
         // wait for a signal or broadcast
+    // we're using a a manual reset semaphore, that complicates matters.
         ULONG iSem = ~0UL;
-        rc = DosWaitMuxWaitSem(hmux, os2Timeout, &iSem);
-        if (rc != NO_ERROR) {
-                iSem = ~0UL;
-        }
+    for (;;) {
+            rc = DosWaitMuxWaitSem(hmux, os2Timeout, &iSem);
+        lockMutex(cond->m_waitCountMutex);
+        if (rc != NO_ERROR) {
+            iSem = ~0UL;
+            break;
+        }
+
+        // cancel takes priority
+        if (   iSem != 2
+            && DosWaitEventSem((HEV)handles[2].hsemCur, 0) == NO_ERROR)
+            iSem = 2;
+        
+        // see if we got here first.
+        if (iSem != 0)
+            break;
+        ULONG cPosts = 0;
+        rc = DosResetEventSem((HEV)handles[0].hsemCur, &cPosts);
+        if (rc == NO_ERROR && cPosts > 0) {
+            while (--cPosts > 0)
+                DosPostEventSem((HEV)handles[0].hsemCur);
+            break;
+        }
+    }
         DosCloseMuxWaitSem(hmux);
 
-        // cancel takes priority
-        if (   rc == NO_ERROR 
-                && iSem != 2
-                && DosWaitEventSem((HEV)handles[2].hsemCur, 0) == NO_ERROR) {
-                iSem = 2;
-        }
-
-        // update the waiter count and check if we're the last waiter
-        lockMutex(cond->m_waitCountMutex);
-        --cond->m_waitCount;
-        const bool last = (iSem == 1 && cond->m_waitCount == 0);
-        unlockMutex(cond->m_waitCountMutex);
-
-        // reset the broadcast event if we're the last waiter
-        if (last) {
+        // update the waiter count and reset the broadcast event if we're the last waiter
+        if ((iSem == 1 && cond->m_waitCount == 0)) {
                 ULONG ulIgnore;
                 DosResetEventSem(cond->m_events[CArchCondImpl::kBroadcast], &ulIgnore);
         }
+        unlockMutex(cond->m_waitCountMutex);
 
         // reacquire the mutex