X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=aa94725ea5d0bd7c44230a47a475e1867c047bb5;hp=7da4f2272cfd7cd4f4d28d0d42327f6a15a0cd62;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=9451580d19875b23ec52af64585496efb7268e0f

diff --git a/src/core/core.h b/src/core/core.h
index 7da4f227..aa94725e 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "core-export.h"
+
 #include <memory>
 #include <vector>
 
@@ -40,12 +42,13 @@
 #include "authenticator.h"
 #include "bufferinfo.h"
 #include "deferredptr.h"
+#include "identserver.h"
 #include "message.h"
 #include "oidentdconfiggenerator.h"
 #include "sessionthread.h"
+#include "singleton.h"
 #include "storage.h"
 #include "types.h"
-#include "identserver.h"
 
 class CoreAuthHandler;
 class CoreSession;
@@ -58,16 +61,22 @@ struct NetworkInfo;
 class AbstractSqlMigrationReader;
 class AbstractSqlMigrationWriter;
 
-class Core : public QObject
+class CORE_EXPORT Core : public QObject, public Singleton<Core>
 {
     Q_OBJECT
 
 public:
-    static Core *instance();
-
     Core();
     ~Core() override;
 
+    void init();
+
+    /**
+     * Shuts down active core sessions, saves state and emits the shutdownComplete() signal afterwards.
+     */
+    void shutdown();
+
+
     /*** Storage access ***/
     // These methods are threadsafe.
 
@@ -554,13 +563,6 @@ public:
         return instance()->_storage->setBufferLastSeenMsg(user, bufferId, msgId);
     }
 
-    //! Get the auth username associated with a userId
-    /** \param user  The user to retrieve the username for
-     *  \return      The username for the user
-     */
-    static inline QString getAuthUserName(UserId user) {
-        return instance()->_storage->getAuthUserName(user);
-    }
 
     //! Get a usable sysident for the given user in oidentd-strict mode
     /** \param user    The user to retrieve the sysident for
@@ -702,13 +704,19 @@ signals:
     void bufferInfoUpdated(UserId user, const BufferInfo &info);
 
     //! Relay from CoreSession::sessionState(). Used for internal connection only
-    void sessionState(const Protocol::SessionState &sessionState);
+    void sessionStateReceived(const Protocol::SessionState &sessionState);
 
     //! Emitted when database schema upgrade starts or ends
     void dbUpgradeInProgress(bool inProgress);
 
+    //! Emitted when a fatal error was encountered during async initialization
+    void exitRequested(int exitCode, const QString &reason);
+
+    //! Emitted once core shutdown is complete
+    void shutdownComplete();
+
 public slots:
-    bool init();
+    void initAsync();
 
     /** Persist storage.
      *
@@ -750,6 +758,8 @@ private slots:
 
     bool changeUserPass(const QString &username);
 
+    void onSessionShutdown(SessionThread *session);
+
 private:
     SessionThread *sessionForUser(UserId userId, bool restoreState = false);
     void addClientHelper(RemotePeer *peer, UserId uid);
@@ -807,7 +817,7 @@ private:
     QDateTime _startTime;
 
     IdentServer *_identServer {nullptr};
-    
+
     bool _initialized{false};
     bool _configured{false};