Changeset 141 for trunk/src/corelib

Timestamp:

Aug 29, 2009, 5:44:05 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

core: A bunch of fixes to QEventDispatcherPM which actually made Qt timers work. This enabled the I-beam cursor and other timer-dependent operations such as the async directory refresh in the file dialog.

File:

• trunk/src/corelib/kernel/qeventdispatcher_pm.cpp (modified) (12 diffs)

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -219 +219 @@
 
 // socket select notification (higher priority)
-#define WM_U_SEM_SELECT     WM_SEM1
+#define WM_U_SEM_SELECT     WM_
 // timer notification (lower priority)
-#define WM_U_SEM_TIMER      WM_SEM3 // scheduled right before WM_TIMER
+#define WM_U_SEM_TIMER      WM_TIMER
 
 // Internal operator functions for timevals
@@ -313 +313 @@
     int refcnt;
     QWaitCondition cond;
+
 
     // socket stuff
@@ -465 +466 @@
     instance->timers.insert(t->id, t);
     // QMap is sorted by key (timeval), which is exactly what we need
-    instance->timersByTimeout.insert(t->timeout, t);
+    instance->timersByTimeout.insert(t->timeout, t);
 
     instance->cancelSelectOrIdle();
@@ -573 +574 @@
     if (instance == 0) {
         instance = new QSelectThread();
-        instance->start();
-    }
-
-    ++instance->refcnt;
+    } else {
+        while (instance->finish) {
+            // the previous instance is still getting finished; let it go
+            locker.unlock();
+            QThread::yieldCurrentThread();
+            locker.relock();
+        }
+    }
+
+    // don't count on ourselves
+    if (instance != QThread::currentThread())
+        ++instance->refcnt;
 }
 
@@ -592 +601 @@
 {
     QMutexLocker locker(&mutex);
-    Q_ASSERT(instance);
+
+    // don't count on ourselves
+    if (instance == QThread::currentThread())
+        return;
 
     // remove socket notifiers owned by this thread
@@ -629 +641 @@
         instance->finish = true;
         instance->cancelSelectOrIdle();
+
+
         instance->wait();
+
         delete instance;
         instance = 0;
@@ -637 +652 @@
 }
 
-QSelectThread::QSelectThread() : finish(false), refcnt(0)
+QSelectThread::QSelectThread() : finish(false), refcnt(0)
 {
     // initialize socket stuff
@@ -681 +696 @@
 
     do {
-        while (!finish && sockets.isEmpty()) {
-            cond.wait(&mutex);
+        while (!finish && sockets.isEmpty() && timers.isEmpty()) {
+            if (!cancelWait)
+                cond.wait(&mutex);
+            cancelWait = false;
         }
 
@@ -735 +752 @@
             timeout = &wait_tm;
 
-        mutex.unlock();
-
-        // do select
-        int nsel = ::select(maxSockfd + 1, &readS, &writeS, &exS, timeout);
-        if (nsel > 0) {
-            for (Hwnds::const_iterator it = hwnds.constBegin();
-                  it != hwnds.constEnd(); ++it) {
-                int sockfd = toSocket(it.key());
-                bool isSet = false;
-                switch (toSockType(it.key())) {
-                    case QSocketNotifier::Read:
-                        isSet = FD_ISSET(sockfd, &readS); break;
-                    case QSocketNotifier::Write:
-                        isSet = FD_ISSET(sockfd, &writeS); break;
-                    case QSocketNotifier::Exception:
-                        isSet = FD_ISSET(sockfd, &exS); break;
+        // do select or simple wait
+        int nsel = 0;
+        if (maxSockfd >= 0) {
+            mutex.unlock();
+            nsel = ::select(maxSockfd + 1, &readS, &writeS, &exS, timeout);
+            if (nsel > 0) {
+                for (Hwnds::const_iterator it = hwnds.constBegin();
+                      it != hwnds.constEnd(); ++it) {
+                    int sockfd = toSocket(it.key());
+                    bool isSet = false;
+                    switch (toSockType(it.key())) {
+                        case QSocketNotifier::Read:
+                            isSet = FD_ISSET(sockfd, &readS); break;
+                        case QSocketNotifier::Write:
+                            isSet = FD_ISSET(sockfd, &writeS); break;
+                        case QSocketNotifier::Exception:
+                            isSet = FD_ISSET(sockfd, &exS); break;
+                    }
+                    if (isSet)
+                        WinPostMsg(it.value(), WM_U_SEM_SELECT, MPFROMLONG(it.key()), 0);
                 }
-                if (isSet)
-                    WinPostMsg(it.value(), WM_U_SEM_SELECT, MPFROMLONG(it.key()), 0);
             }
-        }
-
-        mutex.lock();
+            mutex.lock();
+        } else {
+            ulong msecs = timeout ?
+                timeout->tv_sec * 1000 + timeout->tv_usec / 1000 : ULONG_MAX;
+            if (!cancelWait) {
+                if (cond.wait(&mutex, msecs))
+                    nsel = -2; // avoid activation on when cancelled
+            } else {
+                nsel = -2; // same as above
+            }
+            cancelWait = false;
+        }
 
         if (nsel == 0 || (nsel == -1 && errno == EINTR)) {
@@ -775 +803 @@
         ::so_cancel(maxSockfd);
     } else {
-        // terminate the idle state
-        cond.wakeOne();
+        // terminate the idle or simple wait state
+        if (!cancelWait) {
+            cancelWait = true;
+            cond.wakeOne();
+        }
     }
 }
@@ -856 +887 @@
 {
     // repair all timers
+
     for (TimerInfoMap::iterator it = instance->timers.begin();
           it != instance->timers.end(); ++it) {
         register TimerInfo *t = it.value();
         t->timeout = t->timeout - diff;
+
     }
 }
@@ -920 +953 @@
 
         // reinsert timer (in proper sort order)
-        timersByTimeout.insert(t->timeout, t);
+        timersByTimeout.insert(t->timeout, t);
 
         // post the timer message