Changeset 561 for trunk/src/network/kernel/qhostinfo.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/kernel/qhostinfo.cpp (modified) (13 diffs)

trunk/src/network/kernel/qhostinfo.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -43 +43 @@
 #include "qhostinfo_p.h"
 
+
 #include <qabstracteventdispatcher.h>
 #include <private/qunicodetables_p.h>
@@ -60 +61 @@
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QHostInfoAgent, theAgent)
-void QHostInfoAgent::staticCleanup()
-{
-    theAgent()->cleanup();
-}
+#ifndef QT_NO_THREAD
+Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager)
+#endif
 
 //#define QHOSTINFO_DEBUG
@@ -74 +73 @@
     \reentrant
     \inmodule QtNetwork
-    \ingroup io
+    \ingroup 
 
     QHostInfo uses the lookup mechanisms provided by the operating
@@ -142 +141 @@
 
     \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 4
+
+
+
 
     \sa abortHostLookup(), addresses(), error(), fromName()
@@ -159 +161 @@
     qRegisterMetaType<QHostInfo>("QHostInfo");
 
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
-    QWindowsSockInit bust; // makes sure WSAStartup was callled
+    int id = theIdCounter.fetchAndAddRelaxed(1); // generate unique ID
+
+    if (name.isEmpty()) {
+        QHostInfo hostInfo(id);
+        hostInfo.setError(QHostInfo::HostNotFound);
+        hostInfo.setErrorString(QObject::tr("No host name given"));
+        QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
+        QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
+                         receiver, member, Qt::QueuedConnection);
+        result.data()->emitResultsReady(hostInfo);
+        return id;
+    }
+
+#ifdef QT_NO_THREAD
+    QHostInfo hostInfo = QHostInfoAgent::fromName(name);
+    hostInfo.setLookupId(id);
+    QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
+    QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
+                     receiver, member, Qt::QueuedConnection);
+    result.data()->emitResultsReady(hostInfo);
+#else
+    QHostInfoRunnable* runnable = new QHostInfoRunnable(name, id);
+    QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection);
+    theHostInfoLookupManager()->scheduleLookup(runnable);
 #endif
 
-    // Support for IDNA
-    QString lookup = QString::fromLatin1(QUrl::toAce(name));
-
-    QHostInfoResult *result = new QHostInfoResult;
-    result->autoDelete = false;
-    QObject::connect(result, SIGNAL(resultsReady(QHostInfo)),
-                     receiver, member);
-    int id = result->lookupId = theIdCounter.fetchAndAddRelaxed(1);
-
-    if (lookup.isEmpty()) {
-        QHostInfo info(id);
-        info.setError(QHostInfo::HostNotFound);
-        info.setErrorString(QObject::tr("No host name given"));
-        QMetaObject::invokeMethod(result, "emitResultsReady", Qt::QueuedConnection,
-                                  Q_ARG(QHostInfo, info));
-        result->autoDelete = true;
-        return id;
-    }
-
-    QHostInfoAgent *agent = theAgent();
-    agent->addHostName(lookup, result);
-
-#if !defined QT_NO_THREAD
-    if (!agent->isRunning())
-        agent->start();
+    return id;
+}
+
+/*!
+    Aborts the host lookup with the ID \a id, as returned by lookupHost().
+
+    \sa lookupHost(), lookupId()
+*/
+void QHostInfo::abortHostLookup(int id)
+{
+#ifndef QT_NO_THREAD
+    theHostInfoLookupManager()->abortLookup(id);
 #else
-//    if (!agent->isRunning())
-        agent->run();
-//    else
-//      agent->wakeOne();
+    // we cannot abort if it was non threaded.. the result signal has already been posted
+    Q_UNUSED(id);
 #endif
-    return id;
-}
-
-/*!
-    Aborts the host lookup with the ID \a id, as returned by lookupHost().
-
-    \sa lookupHost(), lookupId()
-*/
-void QHostInfo::abortHostLookup(int id)
-{
-    QHostInfoAgent *agent = theAgent();
-    agent->abortLookup(id);
 }
 
@@ -227 +224 @@
 #endif
 
-    if (!name.isEmpty())
-        return QHostInfoAgent::fromName(QLatin1String(QUrl::toAce(name)));
-
-    QHostInfo retval;
-    retval.d->err = HostNotFound;
-    retval.d->errorStr = QObject::tr("No host name given");
-    return retval;
-}
-
-/*!
-    \internal
-    Pops a query off the queries list, performs a blocking call to
-    QHostInfoAgent::lookupHost(), and emits the resultsReady()
-    signal. This process repeats until the queries list is empty.
-*/
-void QHostInfoAgent::run()
-{
-#ifndef QT_NO_THREAD
-    // Dont' allow thread termination during event delivery, but allow it
-    // during the actual blocking host lookup stage.
-    setTerminationEnabled(false);
-    forever
-#endif
-    {
-        QHostInfoQuery *query;
-        {
-#ifndef QT_NO_THREAD
-            // the queries list is shared between threads. lock all
-            // access to it.
-            QMutexLocker locker(&mutex);
-            if (!quit && queries.isEmpty())
-                cond.wait(&mutex);
-            if (quit) {
-                // Reset the quit variable in case QCoreApplication is
-                // destroyed and recreated.
-                quit = false;
-                break;
-            }
-            if (queries.isEmpty())
-                continue;
-#else
-            if (queries.isEmpty())
-                return;
-#endif
-            query = queries.takeFirst();
-            pendingQueryId = query->object->lookupId;
-        }
-
-#if defined(QHOSTINFO_DEBUG)
-        qDebug("QHostInfoAgent::run(%p): looking up \"%s\"", this,
-               query->hostName.toLatin1().constData());
-#endif
-
-#ifndef QT_NO_THREAD
-        // Start query - allow termination at this point, but not outside. We
-        // don't want to all termination during event delivery, but we don't
-        // want the lookup to prevent the app from quitting (the agent
-        // destructor terminates the thread).
-        setTerminationEnabled(true);
-#endif
-        QHostInfo info = fromName(query->hostName);
-#ifndef QT_NO_THREAD
-        setTerminationEnabled(false);
-#endif
-
-        int id = query->object->lookupId;
-        info.setLookupId(id);
-        if (pendingQueryId == id)
-            query->object->emitResultsReady(info);
-        delete query;
-    }
+    return QHostInfoAgent::fromName(name);
 }
 
@@ -328 +255 @@
 */
 QHostInfo::QHostInfo(const QHostInfo &other)
-    : d(new QHostInfoPrivate(*other.d))
+    : d(new QHostInfoPrivate(*other.d))
 {
 }
@@ -338 +265 @@
 QHostInfo &QHostInfo::operator=(const QHostInfo &other)
 {
-    *d = *other.d;
+    *d;
     return *this;
 }
@@ -347 +274 @@
 QHostInfo::~QHostInfo()
 {
-    delete d;
 }
 
@@ -477 +403 @@
 */
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE