Changeset 83

Timestamp:

Jul 24, 2009, 2:31:38 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Implemented socket notifiers (#24).

File:

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

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -46 +46 @@
 #include "qcoreapplication.h"
 #include "qhash.h"
-#include "qlibrary.h"
-#include "qpair.h"
-#include "qset.h"
 #include "qsocketnotifier.h"
-#include "qvarlengtharray.h"
+#include "qmutex.h"
+#include "qwaitcondition.h"
 
 #include "qabstracteventdispatcher_p.h"
@@ -59 +57 @@
 
 #include <Qt/qwindowdefs_pm.h> // for QPMObjectWindow declaration
+
+
 
 QT_BEGIN_NAMESPACE
@@ -152 +152 @@
 */
 
-/// @todo remove?
-// returns HMQ of the current thread or NULL if no event queue has been created
-static HMQ qt_WinQueryQueue(HAB hab)
-{
-    PTIB ptib;
-    PPIB ppib;
-    DosGetInfoBlocks(&ptib, &ppib);
-    return WinQueueFromID(hab, ppib->pib_ulpid, ptib->tib_ptib2->tib2_ultid);
-}
-
 /*!
     Constructs a new object window for the current thread.
@@ -263 +253 @@
 
 /*!
-  \fn QPMObjectWindow::send(ULONG msg, MPARAM mp1, MPARAM mp2) const
-
-  Synchronously sends a message \a msg with the given parameters \a mp1 and
-  \a mp2 to this window handle and returns a reply from the message() function.
-
-  \note Must be called on the same thread that cosnstructed this instance.
+  \fn QPMObjectWindow::send(ULONG msg, MPARAM mp1, MPARAM mp2) const
+
+  Synchronously sends a message \a msg with the given parameters \a mp1 and
+  \a mp2 to this window handle and returns a reply from the message() function.
+
+  \note Must be called on the same thread that cosnstructed this instance.
 */
 
 /*!
-  \fn QPMObjectWindow::post(ULONG msg, MPARAM mp1, MPARAM mp2) const
-
-  Asynchronously posts a message \a msg with the given parameters \a mp1 and
-  \a mp2 to this window handle. Returns \c TRUE on success and \c FALSE
-  otherwise.
-
-  \note Can be called on any thread.
+  \fn QPMObjectWindow::post(ULONG msg, MPARAM mp1, MPARAM mp2) const
+
+  Asynchronously posts a message \a msg with the given parameters \a mp1 and
+  
+  otherwise.
+
+  \note Can be called on any thread.
 */
+
 
 // socket select notification (highest priority)
@@ -285 +276 @@
 // zero timer notification (lowest priority)
 #define WM_U_SEM_ZEROTIMER  WM_SEM4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 class QEventDispatcherPMPrivate : public QAbstractEventDispatcherPrivate
@@ -318 +615 @@
 
 // @todo later
-//  DWORD threadId;
-//
-//  bool interrupt;
-//
-//  // internal window handle used for socketnotifiers/timers/etc
-//  HWND internalHwnd;
 //
 //  // timers
@@ -331 +622 @@
 //  void unregisterTimer(WinTimerInfo *t);
 //  void sendTimerEvent(int timerId);
-//
-//  // socket notifiers
-//  QSNDict sn_read;
-//  QSNDict sn_write;
-//  QSNDict sn_except;
-//  void doWsaAsyncSelect(int socket);
 //
 //  QList<QMSG> queuedUserInputEvents;
@@ -399 +684 @@
     switch (msg) {
         case WM_U_SEM_SELECT: {
-// @todo later
-//          if (eventLoop)
-//              eventLoop->activateSocketNotifiers();
+            QSocketNotifier *notifier =
+                QSockSelectThread::getSocketNotifier(LONGFROMMP(mp1));
+                if (notifier) {
+                    QEvent event(QEvent::SockAct);
+                    QCoreApplication::sendEvent(notifier, &event);
+                }
             break;
         }
@@ -575 +863 @@
 }
 
-void QEventDispatcherPMPrivate::doWsaAsyncSelect(int socket)
-{
-    Q_ASSERT(internalHwnd);
-    int sn_event = 0;
-    if (sn_read.contains(socket))
-        sn_event |= FD_READ | FD_CLOSE | FD_ACCEPT;
-    if (sn_write.contains(socket))
-        sn_event |= FD_WRITE | FD_CONNECT;
-    if (sn_except.contains(socket))
-        sn_event |= FD_OOB;
-    // BoundsChecker may emit a warning for WSAAsyncSelect when sn_event == 0
-    // This is a BoundsChecker bug and not a Qt bug
-    WSAAsyncSelect(socket, internalHwnd, sn_event ? WM_USER : 0, sn_event);
-}
-
 void QEventDispatcherPM::createInternalHwnd()
 {
@@ -624 +897 @@
 bool QEventDispatcherPM::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
-    Q_D(QEventDispatcherPM);
-
 // @todo later
 #if 0
+
+
     if (!d->internalHwnd)
         createInternalHwnd();
@@ -732 +1005 @@
 void QEventDispatcherPM::registerSocketNotifier(QSocketNotifier *notifier)
 {
-// @todo later
-#if 0
     Q_ASSERT(notifier);
+
     int sockfd = notifier->socket();
-    int type = notifier->type();
-#ifndef QT_NO_DEBUG
-    if (sockfd < 0) {
+    if (sockfd < 0
+        || unsigned(sockfd) >= FD_SETSIZE) {
         qWarning("QSocketNotifier: Internal error");
         return;
-    } else if (notifier->thread() != thread() || thread() != QThread::currentThread()) {
+    } else if (notifier->thread() != thread()
+               || thread() != QThread::currentThread()) {
         qWarning("QSocketNotifier: socket notifiers cannot be enabled from another thread");
         return;
@@ -748 +1020 @@
 
     Q_D(QEventDispatcherPM);
-    QSNDict *sn_vec[3] = { &d->sn_read, &d->sn_write, &d->sn_except };
-    QSNDict *dict = sn_vec[type];
-
-    if (QCoreApplication::closingDown()) // ### d->exitloop?
-        return; // after sn_cleanup, don't reinitialize.
-
-    if (dict->contains(sockfd)) {
-        const char *t[] = { "Read", "Write", "Exception" };
-    /* Variable "socket" below is a function pointer. */
-        qWarning("QSocketNotifier: Multiple socket notifiers for "
-                 "same socket %d and type %s", sockfd, t[type]);
-    }
-
-    QSockNot *sn = new QSockNot;
-    sn->obj = notifier;
-    sn->fd  = sockfd;
-    dict->insert(sn->fd, sn);
-
-    if (d->internalHwnd)
-        d->doWsaAsyncSelect(sockfd);
-#endif
+    d->createAuxWnd();
+
+    QSockSelectThread::addSelect(notifier, d->auxWnd.hwnd());
 }
 
 void QEventDispatcherPM::unregisterSocketNotifier(QSocketNotifier *notifier)
 {
-// @todo later
-#if 0
     Q_ASSERT(notifier);
+
     int sockfd = notifier->socket();
-    int type = notifier->type();
-#ifndef QT_NO_DEBUG
-    if (sockfd < 0) {
+    if (sockfd < 0
+        || unsigned(sockfd) >= FD_SETSIZE) {
         qWarning("QSocketNotifier: Internal error");
         return;
-    } else if (notifier->thread() != thread() || thread() != QThread::currentThread()) {
+    } else if (notifier->thread() != thread()
+               || thread() != QThread::currentThread()) {
         qWarning("QSocketNotifier: socket notifiers cannot be disabled from another thread");
         return;
@@ -788 +1041 @@
 #endif
 
-    Q_D(QEventDispatcherPM);
-    QSNDict *sn_vec[3] = { &d->sn_read, &d->sn_write, &d->sn_except };
-    QSNDict *dict = sn_vec[type];
-    QSockNot *sn = dict->value(sockfd);
-    if (!sn)
-        return;
-
-    dict->remove(sockfd);
-    delete sn;
-
-    if (d->internalHwnd)
-        d->doWsaAsyncSelect(sockfd);
-#endif
+    QSockSelectThread::removeSelect(notifier);
 }
 
@@ -944 +1185 @@
 void QEventDispatcherPM::startingUp()
 {
+
 }
 
 void QEventDispatcherPM::closingDown()
 {
-    Q_D(QEventDispatcherPM);
+    Q);
 
 // @todo remove later
 #if 0
-    // clean up any socketnotifiers
-    while (!d->sn_read.isEmpty())
-        unregisterSocketNotifier((*(d->sn_read.begin()))->obj);
-    while (!d->sn_write.isEmpty())
-        unregisterSocketNotifier((*(d->sn_write.begin()))->obj);
-    while (!d->sn_except.isEmpty())
-        unregisterSocketNotifier((*(d->sn_except.begin()))->obj);
+    Q_D(QEventDispatcherPM);
 
     // clean up any timers