X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=9b7f5b65965c5f2410cb22df72ac132fc83bff87;hp=77de257751375a66c5c845cc7eb8f07a479e234a;hb=3af9d3aeccfac1218ad3342434e5fda0c4ad1266;hpb=b1c606a9d153c5b501476551af3386b993f5635a diff --git a/src/core/core.cpp b/src/core/core.cpp index 77de2577..9b7f5b65 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include "core.h" @@ -35,7 +34,6 @@ #include "util.h" Core *Core::instanceptr = 0; -QMutex Core::mutex; Core *Core::instance() { if(instanceptr) return instanceptr; @@ -65,7 +63,7 @@ Core::Core() : storage(0) { exit(1); // TODO make this less brutal (especially for mono client -> popup) } connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); - _storageSyncTimer.start(10 * 60 * 1000); // in msecs + _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } void Core::init() { @@ -168,9 +166,7 @@ QString Core::setupCore(QVariantMap setupData) { CoreSettings s; s.setStorageSettings(setupData); quInfo() << qPrintable(tr("Creating admin user...")); - mutex.lock(); storage->addUser(user, password); - mutex.unlock(); startListening(); // TODO check when we need this return QString(); } @@ -225,23 +221,11 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { } void Core::syncStorage() { - QMutexLocker locker(&mutex); if(storage) storage->sync(); } /*** Storage Access ***/ -void Core::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) { - QMutexLocker locker(&mutex); - instance()->storage->setUserSetting(userId, settingName, data); -} - -QVariant Core::getUserSetting(UserId userId, const QString &settingName, const QVariant &data) { - QMutexLocker locker(&mutex); - return instance()->storage->getUserSetting(userId, settingName, data); -} - bool Core::createNetwork(UserId user, NetworkInfo &info) { - QMutexLocker locker(&mutex); NetworkId networkId = instance()->storage->createNetwork(user, info); if(!networkId.isValid()) return false; @@ -250,111 +234,6 @@ bool Core::createNetwork(UserId user, NetworkInfo &info) { return true; } -bool Core::updateNetwork(UserId user, const NetworkInfo &info) { - QMutexLocker locker(&mutex); - return instance()->storage->updateNetwork(user, info); -} - -bool Core::removeNetwork(UserId user, const NetworkId &networkId) { - QMutexLocker locker(&mutex); - return instance()->storage->removeNetwork(user, networkId); -} - -QList Core::networks(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->networks(user); -} - -NetworkId Core::networkId(UserId user, const QString &network) { - QMutexLocker locker(&mutex); - return instance()->storage->getNetworkId(user, network); -} - -QList Core::connectedNetworks(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->connectedNetworks(user); -} - -void Core::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) { - QMutexLocker locker(&mutex); - return instance()->storage->setNetworkConnected(user, networkId, isConnected); -} - -QHash Core::persistentChannels(UserId user, const NetworkId &networkId) { - QMutexLocker locker(&mutex); - return instance()->storage->persistentChannels(user, networkId); -} - -void Core::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) { - QMutexLocker locker(&mutex); - return instance()->storage->setChannelPersistent(user, networkId, channel, isJoined); -} - -void Core::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) { - QMutexLocker locker(&mutex); - return instance()->storage->setPersistentChannelKey(user, networkId, channel, key); -} - -BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) { - QMutexLocker locker(&mutex); - return instance()->storage->getBufferInfo(user, networkId, type, buffer); -} - -BufferInfo Core::getBufferInfo(UserId user, const BufferId &bufferId) { - QMutexLocker locker(&mutex); - return instance()->storage->getBufferInfo(user, bufferId); -} - -MsgId Core::storeMessage(const Message &message) { - QMutexLocker locker(&mutex); - return instance()->storage->logMessage(message); -} - -QList Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) { - QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset); -} - -QList Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) { - QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(user, buffer, since, offset); -} - -QList Core::requestMsgRange(UserId user, BufferId buffer, int first, int last) { - QMutexLocker locker(&mutex); - return instance()->storage->requestMsgRange(user, buffer, first, last); -} - -QList Core::requestBuffers(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->requestBuffers(user); -} - -QList Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) { - QMutexLocker locker(&mutex); - return instance()->storage->requestBufferIdsForNetwork(user, networkId); -} - -bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) { - QMutexLocker locker(&mutex); - return instance()->storage->removeBuffer(user, bufferId); -} - -BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) { - QMutexLocker locker(&mutex); - return instance()->storage->renameBuffer(user, networkId, newName, oldName); -} - -void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) { - QMutexLocker locker(&mutex); - return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId); -} - -QHash Core::bufferLastSeenMsgIds(UserId user) { - QMutexLocker locker(&mutex); - return instance()->storage->bufferLastSeenMsgIds(user); -} - /*** Network Management ***/ bool Core::startListening() { @@ -366,12 +245,12 @@ bool Core::startListening() { uint port = Quassel::optionValue("port").toUInt(); if(_server.listen(QHostAddress::Any, port)) { - quInfo() << "Listening for GUI clients on IPv6 port" << _server.serverPort() + quInfo() << "Listening for GUI clients on IPv4 port" << _server.serverPort() << "using protocol version" << Quassel::buildInfo().protocolVersion; success = true; } if(_v6server.listen(QHostAddress::AnyIPv6, port)) { - quInfo() << "Listening for GUI clients on IPv4 port" << _v6server.serverPort() + quInfo() << "Listening for GUI clients on IPv6 port" << _v6server.serverPort() << "using protocol version" << Quassel::buildInfo().protocolVersion; success = true; } @@ -545,9 +424,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { SignalProxy::writeDataToDevice(socket, reply); } else if(msg["MsgType"] == "ClientLogin") { QVariantMap reply; - mutex.lock(); UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); - mutex.unlock(); if(uid == 0) { reply["MsgType"] = "ClientLoginReject"; reply["Error"] = tr("Invalid username or password!
The username/password combination you supplied could not be found in the database."); @@ -581,17 +458,19 @@ void Core::clientDisconnected() { QHash::iterator blockSizeIter = blocksizes.begin(); while(blockSizeIter != blocksizes.end()) { if(blockSizeIter.key() == socket) { - blocksizes.erase(blockSizeIter); + blockSizeIter = blocksizes.erase(blockSizeIter); + } else { + blockSizeIter++; } - blockSizeIter++; } QHash::iterator clientInfoIter = clientInfo.begin(); while(clientInfoIter != clientInfo.end()) { if(clientInfoIter.key() == socket) { - clientInfo.erase(clientInfoIter); + clientInfoIter = clientInfo.erase(clientInfoIter); + } else { + clientInfoIter++; } - clientInfoIter++; } } @@ -627,9 +506,7 @@ void Core::setupInternalClientSession(SignalProxy *proxy) { setupCoreForInternalUsage(); } - mutex.lock(); UserId uid = storage->internalUser(); - mutex.unlock(); // Find or create session for validated user SessionThread *sess;