From: Marcus Eggenberger Date: Tue, 25 Nov 2008 23:09:46 +0000 (+0100) Subject: inlining starge calls X-Git-Tag: 0.4.0~401 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=4bb7c6540eb44dc47b2b93051a46c5bdc9a7f5ba inlining starge calls --- diff --git a/src/core/core.cpp b/src/core/core.cpp index e30264be..830a79b1 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; @@ -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 limit, int offset) { - // QMutexLocker locker(&mutex); - return instance()->storage->requestMsgs(user, buffer, limit, 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() { @@ -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."); @@ -627,9 +504,7 @@ void Core::setupInternalClientSession(SignalProxy *proxy) { setupCoreForInternalUsage(); } - // mutex.lock(); UserId uid = storage->internalUser(); - // mutex.unlock(); // Find or create session for validated user SessionThread *sess; diff --git a/src/core/core.h b/src/core/core.h index 2b63646d..1c2e0db0 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -18,11 +18,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _CORE_H_ -#define _CORE_H_ +#ifndef CORE_H +#define CORE_H #include -#include #include #include #include @@ -35,6 +34,7 @@ # include #endif +#include "storage.h" #include "bufferinfo.h" #include "message.h" #include "sessionthread.h" @@ -43,293 +43,336 @@ class CoreSession; class SessionThread; class SignalProxy; -class Storage; struct NetworkInfo; class Core : public QObject { Q_OBJECT public: - static Core * instance(); - static void destroy(); - - static void saveState(); - static void restoreState(); - - /*** Storage access ***/ - // These methods are threadsafe. - - //! Store a user setting persistently - /** - * \param userId The users Id - * \param settingName The Name of the Setting - * \param data The Value - */ - static void setUserSetting(UserId userId, const QString &settingName, const QVariant &data); - - //! Retrieve a persistent user setting - /** - * \param userId The users Id - * \param settingName The Name of the Setting - * \param default Value to return in case it's unset. - * \return the Value of the Setting or the default value if it is unset. - */ - static QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &data = QVariant()); - - - //! Create a Network in the Storage and store it's Id in the given NetworkInfo - /** \note This method is thredsafe. - * - * \param user The core user - * \param networkInfo a NetworkInfo definition to store the newly created ID in - * \return true if successfull. - */ - static bool createNetwork(UserId user, NetworkInfo &info); - - //! Apply the changes to NetworkInfo info to the storage engine - /** \note This method is thredsafe. - * - * \param user The core user - * \param networkInfo The Updated NetworkInfo - * \return true if successfull. - */ - static bool updateNetwork(UserId user, const NetworkInfo &info); - - //! Permanently remove a Network and all the data associated with it. - /** \note This method is thredsafe. - * - * \param user The core user - * \param networkId The network to delete - * \return true if successfull. - */ - static bool removeNetwork(UserId user, const NetworkId &networkId); - - //! Returns a list of all NetworkInfos for the given UserId user - /** \note This method is thredsafe. - * - * \param user The core user - * \return QList. - */ - static QList networks(UserId user); - - //! Get the NetworkId for a network name. - /** \note This method is threadsafe. - * - * \param user The core user - * \param network The name of the network - * \return The NetworkId corresponding to the given network. - */ - static NetworkId networkId(UserId user, const QString &network); - - //! Get a list of Networks to restore - /** Return a list of networks the user was connected at the time of core shutdown - * \note This method is threadsafe. - * - * \param user The User Id in question - */ - static QList connectedNetworks(UserId user); - - //! Update the connected state of a network - /** \note This method is threadsafe - * - * \param user The Id of the networks owner - * \param networkId The Id of the network - * \param isConnected whether the network is connected or not - */ - static void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected); - - //! Get a hash of channels with their channel keys for a given network - /** The keys are channel names and values are passwords (possibly empty) - * \note This method is threadsafe - * - * \param user The id of the networks owner - * \param networkId The Id of the network - */ - static QHash persistentChannels(UserId user, const NetworkId &networkId); - - //! Update the connected state of a channel - /** \note This method is threadsafe - * - * \param user The Id of the networks owner - * \param networkId The Id of the network - * \param channel The name of the channel - * \param isJoined whether the channel is connected or not - */ - static void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined); - - //! Update the key of a channel - /** \note This method is threadsafe - * - * \param user The Id of the networks owner - * \param networkId The Id of the network - * \param channel The name of the channel - * \param key The key of the channel (possibly empty) - */ - static void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key); - - //! Get the unique BufferInfo for the given combination of network and buffername for a user. - /** \note This method is threadsafe. - * - * \param user The core user who owns this buffername - * \param networkId The network id - * \param type The type of the buffer (StatusBuffer, Channel, etc.) - * \param buffer The buffer name (if empty, the net's status buffer is returned) - * \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found - */ - static BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type, const QString &buffer = ""); - - //! Get the unique BufferInfo for a bufferId - /** \note This method is threadsafe - * \param user The core user who owns this buffername - * \param bufferId The id of the buffer - * \return The BufferInfo corresponding to the given buffer id, or an invalid BufferInfo if not found. - */ - static BufferInfo getBufferInfo(UserId user, const BufferId &bufferId); - - - //! Store a Message in the backlog. - /** \note This method is threadsafe. - * - * \param msg The message object to be stored - * \return The globally unique id for the stored message - */ - static MsgId storeMessage(const Message &message); - - //! Request a certain number (or all) messages stored in a given buffer. - /** \note This method is threadsafe. - * - * \param buffer The buffer we request messages from - * \param limit The number of messages we would like to receive, or -1 if we'd like all messages from that buffername - * \param offset Do not return (but DO count) messages with MsgId >= offset, if offset >= 0 - * \return The requested list of messages - */ - static QList requestMsgs(UserId user, BufferId buffer, int limit = -1, int offset = -1); - - //! Request messages stored in a given buffer since a certain point in time. - /** \note This method is threadsafe. - * - * \param buffer The buffer we request messages from - * \param since Only return messages newer than this point in time - * \param offset Do not return messages with MsgId >= offset, if offset >= 0 - * \return The requested list of messages - */ - static QList requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset = -1); - - //! Request a range of messages stored in a given buffer. - /** \note This method is threadsafe. - * - * \param buffer The buffer we request messages from - * \param first Return messages with first <= MsgId <= last - * \param last Return messages with first <= MsgId <= last - * \return The requested list of messages - */ - static QList requestMsgRange(UserId user, BufferId buffer, int first, int last); - - //! Request a list of all buffers known to a user. - /** This method is used to get a list of all buffers we have stored a backlog from. - * \note This method is threadsafe. - * - * \param user The user whose buffers we request - * \return A list of the BufferInfos for all buffers as requested - */ - static QList requestBuffers(UserId user); - - - //! Request a list of BufferIds for a given NetworkId - /** \note This method is threadsafe. - * - * \param user The user whose buffers we request - * \param networkId The NetworkId of the network in question - * \return List of BufferIds belonging to the Network - */ - static QList requestBufferIdsForNetwork(UserId user, NetworkId networkId); - - //! Remove permanently a buffer and it's content from the storage backend - /** This call cannot be reverted! - * \note This method is threadsafe. - * - * \param user The user who is the owner of the buffer - * \param bufferId The bufferId - * \return true if successfull - */ - static bool removeBuffer(const UserId &user, const BufferId &bufferId); - - //! Rename a Buffer - /** \note This method is threadsafe. - * \param user The id of the buffer owner - * \param networkId The id of the network the buffer belongs to - * \param newName The new name of the buffer - * \param oldName The previous name of the buffer - * \return the BufferId of the affected buffer or an invalid BufferId if not successfull - */ - static BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName); - - //! Update the LastSeenDate for a Buffer - /** This Method is used to make the LastSeenDate of a Buffer persistent - * \note This method is threadsafe. - * - * \param user The Owner of that Buffer - * \param bufferId The buffer id - * \param MsgId The Message id of the message that has been just seen - */ - static void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); - - //! Get a Hash of all last seen message ids - /** This Method is called when the Quassel Core is started to restore the lastSeenMsgIds - * \note This method is threadsafe. - * - * \param user The Owner of the buffers - */ - static QHash bufferLastSeenMsgIds(UserId user); + static Core * instance(); + static void destroy(); + + static void saveState(); + static void restoreState(); + + /*** Storage access ***/ + // These methods are threadsafe. + + //! Store a user setting persistently + /** + * \param userId The users Id + * \param settingName The Name of the Setting + * \param data The Value + */ + static inline void setUserSetting(UserId userId, const QString &settingName, const QVariant &data) { + instance()->storage->setUserSetting(userId, settingName, data); + } + + //! Retrieve a persistent user setting + /** + * \param userId The users Id + * \param settingName The Name of the Setting + * \param default Value to return in case it's unset. + * \return the Value of the Setting or the default value if it is unset. + */ + static inline QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &data = QVariant()) { + return instance()->storage->getUserSetting(userId, settingName, data); + } + + + //! Create a Network in the Storage and store it's Id in the given NetworkInfo + /** \note This method is thredsafe. + * + * \param user The core user + * \param networkInfo a NetworkInfo definition to store the newly created ID in + * \return true if successfull. + */ + static bool createNetwork(UserId user, NetworkInfo &info); + + //! Apply the changes to NetworkInfo info to the storage engine + /** \note This method is thredsafe. + * + * \param user The core user + * \param networkInfo The Updated NetworkInfo + * \return true if successfull. + */ + static inline bool updateNetwork(UserId user, const NetworkInfo &info) { + return instance()->storage->updateNetwork(user, info); + } + + //! Permanently remove a Network and all the data associated with it. + /** \note This method is thredsafe. + * + * \param user The core user + * \param networkId The network to delete + * \return true if successfull. + */ + static inline bool removeNetwork(UserId user, const NetworkId &networkId) { + return instance()->storage->removeNetwork(user, networkId); + } + + //! Returns a list of all NetworkInfos for the given UserId user + /** \note This method is thredsafe. + * + * \param user The core user + * \return QList. + */ + static inline QList networks(UserId user) { + return instance()->storage->networks(user); + } + + //! Get the NetworkId for a network name. + /** \note This method is threadsafe. + * + * \param user The core user + * \param network The name of the network + * \return The NetworkId corresponding to the given network. + */ + static inline NetworkId networkId(UserId user, const QString &network) { + return instance()->storage->getNetworkId(user, network); + } + + //! Get a list of Networks to restore + /** Return a list of networks the user was connected at the time of core shutdown + * \note This method is threadsafe. + * + * \param user The User Id in question + */ + static inline QList connectedNetworks(UserId user) { + return instance()->storage->connectedNetworks(user); + } + + //! Update the connected state of a network + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param isConnected whether the network is connected or not + */ + static inline void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) { + return instance()->storage->setNetworkConnected(user, networkId, isConnected); + } + + //! Get a hash of channels with their channel keys for a given network + /** The keys are channel names and values are passwords (possibly empty) + * \note This method is threadsafe + * + * \param user The id of the networks owner + * \param networkId The Id of the network + */ + static inline QHash persistentChannels(UserId user, const NetworkId &networkId) { + return instance()->storage->persistentChannels(user, networkId); + } + + //! Update the connected state of a channel + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param channel The name of the channel + * \param isJoined whether the channel is connected or not + */ + static inline void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) { + return instance()->storage->setChannelPersistent(user, networkId, channel, isJoined); + } + + //! Update the key of a channel + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param channel The name of the channel + * \param key The key of the channel (possibly empty) + */ + static inline void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) { + return instance()->storage->setPersistentChannelKey(user, networkId, channel, key); + } + + //! Get the unique BufferInfo for the given combination of network and buffername for a user. + /** \note This method is threadsafe. + * + * \param user The core user who owns this buffername + * \param networkId The network id + * \param type The type of the buffer (StatusBuffer, Channel, etc.) + * \param buffer The buffer name (if empty, the net's status buffer is returned) + * \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found + */ + static inline BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "") { + return instance()->storage->getBufferInfo(user, networkId, type, buffer); + } + + //! Get the unique BufferInfo for a bufferId + /** \note This method is threadsafe + * \param user The core user who owns this buffername + * \param bufferId The id of the buffer + * \return The BufferInfo corresponding to the given buffer id, or an invalid BufferInfo if not found. + */ + static inline BufferInfo getBufferInfo(UserId user, const BufferId &bufferId) { + return instance()->storage->getBufferInfo(user, bufferId); + } + + //! Store a Message in the backlog. + /** \note This method is threadsafe. + * + * \param msg The message object to be stored + * \return The globally unique id for the stored message + */ + static inline MsgId storeMessage(const Message &message) { + return instance()->storage->logMessage(message); + } + + //! Request a certain number (or all) messages stored in a given buffer. + /** \note This method is threadsafe. + * + * \param buffer The buffer we request messages from + * \param limit The number of messages we would like to receive, or -1 if we'd like all messages from that buffername + * \param offset Do not return (but DO count) messages with MsgId >= offset, if offset >= 0 + * \return The requested list of messages + */ + static inline QList requestMsgs(UserId user, BufferId buffer, int limit = -1, int offset = -1) { + return instance()->storage->requestMsgs(user, buffer, limit, offset); + } + + //! Request messages stored in a given buffer since a certain point in time. + /** \note This method is threadsafe. + * + * \param buffer The buffer we request messages from + * \param since Only return messages newer than this point in time + * \param offset Do not return messages with MsgId >= offset, if offset >= 0 + * \return The requested list of messages + */ + static inline QList requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset = -1) { + return instance()->storage->requestMsgs(user, buffer, since, offset); + } + + //! Request a range of messages stored in a given buffer. + /** \note This method is threadsafe. + * + * \param buffer The buffer we request messages from + * \param first Return messages with first <= MsgId <= last + * \param last Return messages with first <= MsgId <= last + * \return The requested list of messages + */ + static inline QList requestMsgRange(UserId user, BufferId buffer, int first, int last) { + return instance()->storage->requestMsgRange(user, buffer, first, last); + } + + //! Request a list of all buffers known to a user. + /** This method is used to get a list of all buffers we have stored a backlog from. + * \note This method is threadsafe. + * + * \param user The user whose buffers we request + * \return A list of the BufferInfos for all buffers as requested + */ + static inline QList requestBuffers(UserId user) { + return instance()->storage->requestBuffers(user); + } + + //! Request a list of BufferIds for a given NetworkId + /** \note This method is threadsafe. + * + * \param user The user whose buffers we request + * \param networkId The NetworkId of the network in question + * \return List of BufferIds belonging to the Network + */ + static inline QList requestBufferIdsForNetwork(UserId user, NetworkId networkId) { + return instance()->storage->requestBufferIdsForNetwork(user, networkId); + } + + //! Remove permanently a buffer and it's content from the storage backend + /** This call cannot be reverted! + * \note This method is threadsafe. + * + * \param user The user who is the owner of the buffer + * \param bufferId The bufferId + * \return true if successfull + */ + static inline bool removeBuffer(const UserId &user, const BufferId &bufferId) { + return instance()->storage->removeBuffer(user, bufferId); + } + + //! Rename a Buffer + /** \note This method is threadsafe. + * \param user The id of the buffer owner + * \param networkId The id of the network the buffer belongs to + * \param newName The new name of the buffer + * \param oldName The previous name of the buffer + * \return the BufferId of the affected buffer or an invalid BufferId if not successfull + */ + static inline BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) { + return instance()->storage->renameBuffer(user, networkId, newName, oldName); + } + + //! Update the LastSeenDate for a Buffer + /** This Method is used to make the LastSeenDate of a Buffer persistent + * \note This method is threadsafe. + * + * \param user The Owner of that Buffer + * \param bufferId The buffer id + * \param MsgId The Message id of the message that has been just seen + */ + static inline void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) { + return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId); + } + + //! Get a Hash of all last seen message ids + /** This Method is called when the Quassel Core is started to restore the lastSeenMsgIds + * \note This method is threadsafe. + * + * \param user The Owner of the buffers + */ + static inline QHash bufferLastSeenMsgIds(UserId user) { + return instance()->storage->bufferLastSeenMsgIds(user); + } const QDateTime &startTime() const { return _startTime; } - public slots: - //! Make storage data persistent - /** \note This method is threadsafe. - */ - void syncStorage(); - void setupInternalClientSession(SignalProxy *proxy); - signals: - //! Sent when a BufferInfo is updated in storage. - void bufferInfoUpdated(UserId user, const BufferInfo &info); +public slots: + //! Make storage data persistent + /** \note This method is threadsafe. + */ + void syncStorage(); + void setupInternalClientSession(SignalProxy *proxy); +signals: + //! Sent when a BufferInfo is updated in storage. + void bufferInfoUpdated(UserId user, const BufferInfo &info); //! Relay From CoreSession::sessionState(const QVariant &). Used for internal connection only void sessionState(const QVariant &); - private slots: - bool startListening(); - void stopListening(const QString &msg = QString()); - void incomingConnection(); - void clientHasData(); - void clientDisconnected(); +private slots: + bool startListening(); + void stopListening(const QString &msg = QString()); + void incomingConnection(); + void clientHasData(); + void clientDisconnected(); - bool initStorage(QVariantMap dbSettings, bool setup = false); + bool initStorage(QVariantMap dbSettings, bool setup = false); #ifdef HAVE_SSL - void sslErrors(const QList &errors); + void sslErrors(const QList &errors); #endif - void socketError(QAbstractSocket::SocketError); + void socketError(QAbstractSocket::SocketError); - private: - Core(); - ~Core(); - void init(); - static Core *instanceptr; +private: + Core(); + ~Core(); + void init(); + static Core *instanceptr; - SessionThread *createSession(UserId userId, bool restoreState = false); - void setupClientSession(QTcpSocket *socket, UserId uid); - void processClientMessage(QTcpSocket *socket, const QVariantMap &msg); - //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg); - QString setupCoreForInternalUsage(); - QString setupCore(QVariantMap setupData); + SessionThread *createSession(UserId userId, bool restoreState = false); + void setupClientSession(QTcpSocket *socket, UserId uid); + void processClientMessage(QTcpSocket *socket, const QVariantMap &msg); + //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg); + QString setupCoreForInternalUsage(); + QString setupCore(QVariantMap setupData); - bool registerStorageBackend(Storage *); - void unregisterStorageBackend(Storage *); + bool registerStorageBackend(Storage *); + void unregisterStorageBackend(Storage *); - QHash sessions; - Storage *storage; - QTimer _storageSyncTimer; + QHash sessions; + Storage *storage; + QTimer _storageSyncTimer; #ifdef HAVE_SSL SslServer _server, _v6server; @@ -337,16 +380,14 @@ class Core : public QObject { QTcpServer _server, _v6server; #endif - QHash blocksizes; - QHash clientInfo; + QHash blocksizes; + QHash clientInfo; - QHash _storageBackends; + QHash _storageBackends; - QDateTime _startTime; + QDateTime _startTime; - bool configured; - - static QMutex mutex; + bool configured; }; #endif