(8) [final] modify main() to call correct clean sequence

[systembsd.git] / src / interfaces / logind / logind.c

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index 3b9cab68686c73dcc592e1e45043e5c581a62c41..274bf16aa14da40ec78d71372351ab11be2d9c5f 100644 (file)
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -70,15 +70,7 @@ static void logind_on_bus_acquired(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void logind_on_name_acquired(GDBusConnection *conn,
-                                       const gchar *name,
-                                    gpointer user_data) {
-
-    g_print("got '%s' on system bus\n", name);
+    g_print("got bus/name, exporting %s's interface...\n", name);
 
     logind_interf = login1_manager_skeleton_new();
 
@@ -93,33 +85,75 @@ static void logind_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/login1_manager",
                                          NULL)) {
 
-        g_printf("Failed to export Login1Manager's interface!");
+        g_printf("failed to export %s's interface!\n", name);
+        logind_mem_clean();
+
+    } else {
+
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
     }
+}
+
+static void logind_on_name_acquired(GDBusConnection *conn,
+                                       const gchar *name,
+                                    gpointer user_data) {
 
+   g_printf("success!\n");
 }
 
 static void logind_on_name_lost(GDBusConnection *conn,
                                 const gchar *name,
                                 gpointer user_data) {
 
-    g_print("lost name %s, exiting...", name);
+    if(!conn) {
 
-    logind_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(logind_interf));
+        g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
+
+    }
+
+    g_print("lost name %s, exiting...\n", name);
 
+    logind_mem_clean();
 }
 
 /* --- end bus/name handlers, begin misc unix functions --- */
 
-/* free()'s */
+/* safe call to clean and then exit
+ * this stops our GMainLoop sfaely before letting main() return */
 void logind_mem_clean() {
 
-    g_ptr_array_foreach(logind_freeable, (GFunc) g_free, NULL);
-       g_ptr_array_free(logind_freeable, TRUE);
+    g_printf("exiting...\n");
+
+    if(dbus_interface_exported)
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(logind_interf));
+
+    if(g_main_loop_is_running(logind_loop))
+        g_main_loop_quit(logind_loop);
+
+}
+
+/* wrapper for glib's unix signal handling; called only once if terminating signal is raised against us */
+gboolean unix_sig_terminate_handler(gpointer data) {
+
+    g_printf("caught SIGINT/HUP/TERM, exiting\n");
+
+    logind_mem_clean();
+    return G_SOURCE_REMOVE;
+}
+
+void set_signal_handlers() {
+
+    /* we don't care about its descriptor, we never need to unregister these */
+    g_unix_signal_add(SIGINT,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGHUP,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGTERM, unix_sig_terminate_handler, NULL);
 }
 
 int main() {
 
+    set_signal_handlers();
+
        logind_loop = g_main_loop_new(NULL, TRUE);
        logind_freeable = g_ptr_array_new();
 
@@ -133,11 +167,15 @@ int main() {
                                     NULL);
 
        g_main_loop_run(logind_loop);
+    /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
        g_main_loop_unref(logind_loop);
 
+    /* guaranteed unownable */
        g_bus_unown_name(bus_descriptor);
 
-       logind_mem_clean();
+    /* at this point no operations can occur with our data, it is safe to free it + its container */
+     g_ptr_array_free(logind_freeable, TRUE);
+
 
        return 0;
 }