X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=a3b38cff984ac9edc23821590a463b07e133d383;hb=5dbf544a08ef96a933d61ffa3b7bc711ebdab244;hp=5fd5bdcfe4cd56be2fd78b401187ca1d4938add8;hpb=4988547cbb3c35016872a4ed8dbcc1376473ad80;p=quassel.git diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 5fd5bdcf..a3b38cff 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -137,7 +137,47 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) CoreSession::~CoreSession() { saveSessionState(); + + /* Why partially duplicate CoreNetwork destructor? When each CoreNetwork quits in the + * destructor, disconnections are processed in sequence for each object. For many IRC servers + * on a slow network, this could significantly delay core shutdown [msecs wait * network count]. + * + * Here, CoreSession first calls disconnect on all networks, letting them all start + * disconnecting before beginning to sequentially wait for each network. Ideally, after the + * first network is disconnected, the other networks will have already closed. Worst-case may + * still wait [msecs wait time * num. of networks], but the risk should be much lower. + * + * CoreNetwork should still do cleanup in its own destructor in case a network is deleted + * outside of deleting the whole CoreSession. + * + * If this proves to be problematic in the future, there's an alternative Qt signal-based system + * implemented in another pull request that guarentees a maximum amount of time to disconnect, + * but at the cost of more complex code. + * + * See https://github.com/quassel/quassel/pull/203 + */ + + foreach(CoreNetwork *net, _networks.values()) { + // Request each network properly disconnect, but don't count as user-requested disconnect + if (net->socketConnected()) { + // Only try if the socket's fully connected (not initializing or disconnecting). + // Force an immediate disconnect, jumping the command queue. Ensures the proper QUIT is + // shown even if other messages are queued. + net->disconnectFromIrc(false, QString(), false, true); + } + } + + // Process the putCmd events that trigger the quit. Without this, shutting down the core + // results in abrubtly closing the socket rather than sending the QUIT as expected. + QCoreApplication::processEvents(); + foreach(CoreNetwork *net, _networks.values()) { + // Wait briefly for each network to disconnect. Sometimes it takes a little while to send. + if (!net->forceDisconnect()) { + qWarning() << "Timed out quitting network" << net->networkName() << + "(user ID " << net->userId() << ")"; + } + // Delete the network now that it's closed delete net; } } @@ -175,7 +215,7 @@ void CoreSession::loadSettings() networkIter = networkInfos.erase(networkIter); } else { - networkIter++; + ++networkIter; } } s.removeIdentity(id); @@ -548,7 +588,7 @@ void CoreSession::destroyNetwork(NetworkId id) messageIter = _messageQueue.erase(messageIter); } else { - messageIter++; + ++messageIter; } } // remove buffers from syncer @@ -578,7 +618,7 @@ void CoreSession::clientsConnected() IrcUser *me = 0; while (netIter != _networks.end()) { net = *netIter; - netIter++; + ++netIter; if (!net->isConnected()) continue; @@ -605,7 +645,7 @@ void CoreSession::clientsDisconnected() QString awayReason; while (netIter != _networks.end()) { net = *netIter; - netIter++; + ++netIter; if (!net->isConnected()) continue; @@ -633,7 +673,7 @@ void CoreSession::globalAway(const QString &msg) CoreNetwork *net = 0; while (netIter != _networks.end()) { net = *netIter; - netIter++; + ++netIter; if (!net->isConnected()) continue;