Changeset 161 for trunk/src

Timestamp:

Sep 7, 2009, 3:25:07 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed a number of socket notifier bugs in the event dispatcher code; this made the network classes actually work.

File:

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

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -497 +497 @@
 {
     QMutexLocker locker(&mutex);
-    Q_ASSERT(instance);
+    // it is possible that QEventDispatcherPM::unregisterTimers() is called
+    // after detaching the last thread with detachThread() which means all
+    // timers are already removed and the select thread is stopped and deleted.
+    if (!instance)
+        return false;
 
     if (instance->timers.isEmpty())
@@ -696 +700 @@
 
     do {
-        while (!finish && sockets.isEmpty() && timers.isEmpty()) {
-            if (!cancelWait)
-                cond.wait(&mutex);
-            cancelWait = false;
-        }
-
-        if (finish)
-            break;
-
         // process pending socket operations
         while (!pendingSockets.isEmpty()) {
@@ -733 +728 @@
                     if (maxSockfd == p.sockfd) {
                         // find the new hignest socket
-                        if (hwnds.isEmpty()) {
-                            maxSockfd = -1;
-                        } else {
+                        maxSockfd = -1;
+                        if (!hwnds.isEmpty()) {
                             for (Hwnds::const_iterator it = hwnds.constBegin();
                                   it != hwnds.constEnd(); ++it) {
@@ -755 +749 @@
         int nsel = 0;
         if (maxSockfd >= 0) {
+
             mutex.unlock();
-            nsel = ::select(maxSockfd + 1, &readS, &writeS, &exS, timeout);
+            nsel = ::select(maxSockfd + 1, &, timeout);
             if (nsel > 0) {
                 for (Hwnds::const_iterator it = hwnds.constBegin();
@@ -764 +759 @@
                     switch (toSockType(it.key())) {
                         case QSocketNotifier::Read:
-                            isSet = FD_ISSET(sockfd, &readS); break;
+                            isSet = FD_ISSET(sockfd, &); break;
                         case QSocketNotifier::Write:
-                            isSet = FD_ISSET(sockfd, &writeS); break;
+                            isSet = FD_ISSET(sockfd, &); break;
                         case QSocketNotifier::Exception:
-                            isSet = FD_ISSET(sockfd, &exS); break;
+                            isSet = FD_ISSET(sockfd, &); break;
                     }
                     if (isSet)
@@ -778 +773 @@
             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
+                if (!cond.wait(&mutex, msecs))
+                    nsel = 0; // indicate timeout
             }
             cancelWait = false;
         }
 
-        if (nsel == 0 || (nsel == -1 && errno == EINTR)) {
+        if (nsel == 0) {
             // timeout, check if there are expired timers
             activateTimers();
         }
-    } while(true);
+
+    } while(!finish);
 
     mutex.unlock();