Have a single global instance of `sessiond_context`

This is the de facto state of affairs
and makes the plugin interface cleaner.

Change-Id: I24cb1625945fae2ef4a7dbb5b4e5e232edb6c911

diff --git a/src/service/src/main.cpp b/src/service/src/main.cpp
index 6be66415a4d930c0ab913b0effdfb2dfa9e5831b..19a0c73da4b20ee5932e9ddced71865a5feb8dd6 100644 (file)
--- a/src/service/src/main.cpp
+++ b/src/service/src/main.cpp
@@ -23,8 +23,11 @@
 #include "main_context.hpp"
 #include <stdexcept>
 
+std::unique_ptr <sessiond_context> g_sessiond_context;
+
 int main() try {
-       sessiond_context().run();
+       g_sessiond_context = std::make_unique <sessiond_context> ();
+       g_sessiond_context->run();
 } catch (const std::exception &ex) {
        LOGE("Exception %s caught in top scope! Bailing out...", ex.what());
        return EXIT_FAILURE;

diff --git a/src/service/src/main_context.hpp b/src/service/src/main_context.hpp
index 7ab23d6be9363ac412f140194fdec9b9b7bc7300..eee6751ed7219d9c34701702b220b7f541f4c2f7 100644 (file)
--- a/src/service/src/main_context.hpp
+++ b/src/service/src/main_context.hpp
@@ -27,6 +27,7 @@
 #include <dlog.h>
 
 #include <algorithm>
+#include <memory>
 #include <unordered_map>
 
 #include <gio/gio.h>
@@ -616,3 +617,7 @@ struct sessiond_context {
        main_loop loop;
        GDBusConnection *connection = nullptr;
 };
+
+/* The struct is effectively a singleton, but all the usual code (getter etc)
+ * are missing because this was a change late in development. */
+extern std::unique_ptr <sessiond_context> g_sessiond_context;