projects
/
systembsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(4) move on_name_acquired functionality to on_bus_acquired
[systembsd.git]
/
src
/
interfaces
/
timedated
/
timedated.c
diff --git
a/src/interfaces/timedated/timedated.c
b/src/interfaces/timedated/timedated.c
index 53a3a3cb76265a1ae72e6f576bbbc8bc2bea398b..3df5fc6e3e1fd956ef15894741f2896eb154680b 100644
(file)
--- a/
src/interfaces/timedated/timedated.c
+++ b/
src/interfaces/timedated/timedated.c
@@
-16,6
+16,7
@@
#include <unistd.h>
#include <limits.h>
#include <unistd.h>
#include <limits.h>
+#include <signal.h>
#include <sys/param.h>
#include <string.h>
#include <sys/param.h>
#include <string.h>
@@
-24,10
+25,16
@@
#include <glib-unix.h>
#include "timedated-gen.h"
#include <glib-unix.h>
#include "timedated-gen.h"
+#include "timedated.h"
GPtrArray *timedated_freeable;
Timedate1 *timedated_interf;
GPtrArray *timedated_freeable;
Timedate1 *timedated_interf;
+GMainLoop *timedated_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
/* --- begin method/property/dbus signal code --- */
/*static gboolean
/* --- begin method/property/dbus signal code --- */
/*static gboolean
@@
-63,15
+70,7
@@
static void timedated_on_bus_acquired(GDBusConnection *conn,
const gchar *name,
gpointer user_data) {
const gchar *name,
gpointer user_data) {
- g_print("got bus, name: %s\n", name);
-
-}
-
-static void timedated_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);
timedated_interf = timedate1_skeleton_new();
timedated_interf = timedate1_skeleton_new();
@@
-86,36
+85,50
@@
static void timedated_on_name_acquired(GDBusConnection *conn,
"/org/freedesktop/timedate1",
NULL)) {
"/org/freedesktop/timedate1",
NULL)) {
- g_printf("
Failed to export Timedate1's interface!"
);
- }
+ g_printf("
failed to export %s's interface!\n", name
);
+ timedated_mem_clean();
-}
+ } else {
-/* --- end bus/name handlers, begin misc functions --- */
+ dbus_interface_exported = TRUE;
+ g_printf("exported %s's interface on the system bus...\n", name);
+ }
+}
-/* free()'s */
-void timedated_mem_clean() {
+static void timedated_on_name_acquired(GDBusConnection *conn,
+ const gchar *name,
+ gpointer user_data) {
- g_ptr_array_foreach(timedated_freeable, (GFunc) g_free, NULL);
- g_ptr_array_free(timedated_freeable, TRUE);
+ g_printf("success!\n");
}
static void timedated_on_name_lost(GDBusConnection *conn,
const gchar *name,
gpointer user_data) {
}
static void timedated_on_name_lost(GDBusConnection *conn,
const gchar *name,
gpointer user_data) {
- g_print("lost name %s, exiting...", name);
+ if(!conn) {
+
+ 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);
+ timedated_mem_clean();
+ }
+
+ g_print("lost name %s, exiting...\n", name);
timedated_mem_clean();
timedated_mem_clean();
- g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(timedated_interf));
+}
+
+/* --- end bus/name handlers, begin misc unix functions --- */
+
+/* safe call to clean and then exit
+ * this stops our GMainLoop safely before letting main() return */
+void timedated_mem_clean() {
+ g_ptr_array_foreach(timedated_freeable, (GFunc) g_free, NULL);
+ g_ptr_array_free(timedated_freeable, TRUE);
}
int main() {
}
int main() {
- guint bus_descriptor;
- GMainLoop *timedated_loop;
-
timedated_loop = g_main_loop_new(NULL, TRUE);
timedated_freeable = g_ptr_array_new();
timedated_loop = g_main_loop_new(NULL, TRUE);
timedated_freeable = g_ptr_array_new();