Changeset 664

Timestamp:

Mar 10, 2010, 1:27:13 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Sockets: Don't call select() on a temporarily disabled socket.

File:

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

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -443 +443 @@
                 // add the socket back to the set
                 int sockfd = notifier->socket();
-                fd_set *set = instance->setForType(notifier->type());
-                FD_SET(sockfd, set);
+                FD_SET(sockfd, instance->setForType(notifier->type()));
                 instance->updateMaxSockFd(sockfd, Add);
                 // inform the select thread that this socket may be included
@@ -745 +744 @@
                 for (Sockets::const_iterator it = sockets.constBegin();
                       it != sockets.constEnd(); ++it) {
-                    maxSockfd = qMax(toSocket(it.key()), maxSockfd);
+                    int fd = toSocket(it.key());
+                    if (FD_ISSET(fd, &readS) || FD_ISSET(fd, &writeS) ||
+                        FD_ISSET(fd, &exS))
+                        maxSockfd = qMax(fd, maxSockfd);
                 }
             }
@@ -812 +814 @@
                     }
                     if (isSet) {
-                        fd_set *set = setForType(type);
-                        FD_CLR(sockfd, set);
+                        FD_CLR(sockfd, setForType(type));
                         updateMaxSockFd(sockfd, Remove);
                         WinPostMsg(it.value().second, WM_U_SEM_SELECT, MPFROMLONG(it.key()), 0);