#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <signal.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <glib.h>
#include <dbus/dbus-glib.h>
#include "browser-switchboard.h"
struct swb_context ctx;
+static void read_config(void);
+
+/* Wait for zombies on SIGCHLD */
static void waitforzombies(int signalnum) {
- while (waitpid(-1, NULL, WNOHANG) > 0)
- log_msg("Waited for a zombie\n");
+ while (waitpid(-1, NULL, WNOHANG) > 0);
+}
+
+/* Handle other signals in event loop by writing signal number to pipe */
+int eventpipe[2];
+static void handle_signal(int signalnum) {
+ write(eventpipe[1], &signalnum, sizeof signalnum);
+}
+
+/* Callbacks for polling the event pipe in the GLib event loop */
+static GPollFD fdevents_pfd;
+/* Called before entering the poll() */
+static gboolean fdevents_prepare(GSource *source, gint *timeout) {
+ /* No timeout for poll() */
+ *timeout = -1;
+ return FALSE;
+}
+/* Check to see whether a handled event has happened */
+static gboolean fdevents_check(GSource *source) {
+ return !!(fdevents_pfd.revents & G_IO_IN);
}
+/* Read the event from the pipe and handle it */
+static gboolean fdevents_dispatch(GSource *source,
+ GSourceFunc callback, gpointer user_data) {
+ int eventnum;
+
+ if (read(eventpipe[0], &eventnum, sizeof eventnum) == (sizeof eventnum)) {
+ /* Handle the event passed to us */
+ switch (eventnum) {
+ /* SIGHUP received -- reread config file */
+ case SIGHUP:
+ read_config();
+ break;
+ default:
+ return FALSE;
+ }
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+}
+static GSourceFuncs fdevents_funcs = {
+ .prepare = fdevents_prepare,
+ .check = fdevents_check,
+ .dispatch = fdevents_dispatch,
+ .finalize = NULL,
+};
+
-static void read_config(int signalnum) {
+static void read_config(void) {
struct swb_config cfg;
swb_config_init(&cfg);
/* continuous mode is required on Fremantle */
ctx.continuous_mode = 1;
if (!cfg.continuous_mode)
- log_msg("WARNING: continuous_mode = 0 operation no longer supported, ignoring config setting");
+ log_msg("continuous_mode = 0 operation no longer supported, ignoring config setting\n");
#else
ctx.continuous_mode = cfg.continuous_mode;
#endif
} else
ctx.other_browser_cmd = NULL;
update_default_browser(&ctx, cfg.default_browser);
+#ifdef FREMANTLE
+ ctx.autostart_microb = cfg.autostart_microb;
+#endif
log_msg("continuous_mode: %d\n", cfg.continuous_mode);
log_msg("default_browser: '%s'\n", cfg.default_browser);
}
int main() {
- OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
- OssoBrowser *obj_osso_browser_sys, *obj_osso_browser_sys_req;
+ OssoBrowser *obj_osso_browser, *obj_osso_browser_sys;
+ OssoBrowser *obj_osso_browser_req, *obj_osso_browser_sys_req;
+ OssoBrowser *obj_osso_browser_root, *obj_osso_browser_sys_root;
GMainLoop *mainloop;
GError *error = NULL;
int reqname_result;
+ GSource *fdevents;
- read_config(0);
+ read_config();
if (ctx.continuous_mode) {
/* Install signal handlers */
return 1;
}
- /* SIGHUP -- reread config file */
- act.sa_handler = read_config;
+ /* All other signals are handled via the GLib main loop */
+ if (pipe(eventpipe) == -1) {
+ log_perror(errno, "Creating event pipe failed");
+ return 1;
+ }
+ act.sa_handler = handle_signal;
if (sigaction(SIGHUP, &act, NULL) == -1) {
log_msg("Installing signal handler failed\n");
return 1;
error->message);
return 1;
}
- if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
log_msg("Another browser-switchboard already running\n");
return 1;
}
/* Register ourselves to handle the osso_browser D-Bus methods */
obj_osso_browser = g_object_new(OSSO_BROWSER_TYPE, NULL);
obj_osso_browser_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
+ obj_osso_browser_root = g_object_new(OSSO_BROWSER_TYPE, NULL);
obj_osso_browser_sys = g_object_new(OSSO_BROWSER_TYPE, NULL);
obj_osso_browser_sys_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
+ obj_osso_browser_sys_root = g_object_new(OSSO_BROWSER_TYPE, NULL);
dbus_g_connection_register_g_object(ctx.session_bus,
"/com/nokia/osso_browser", G_OBJECT(obj_osso_browser));
dbus_g_connection_register_g_object(ctx.session_bus,
"/com/nokia/osso_browser/request",
G_OBJECT(obj_osso_browser_req));
+ dbus_g_connection_register_g_object(ctx.session_bus,
+ "/", G_OBJECT(obj_osso_browser_root));
dbus_g_connection_register_g_object(ctx.system_bus,
"/com/nokia/osso_browser",
G_OBJECT(obj_osso_browser_sys));
dbus_g_connection_register_g_object(ctx.system_bus,
"/com/nokia/osso_browser/request",
G_OBJECT(obj_osso_browser_sys_req));
+ dbus_g_connection_register_g_object(ctx.system_bus,
+ "/", G_OBJECT(obj_osso_browser_sys_root));
mainloop = g_main_loop_new(NULL, FALSE);
+
+ /* Hook up event pipe to the main loop */
+ if (ctx.continuous_mode) {
+ fdevents = g_source_new(&fdevents_funcs, sizeof(GSource));
+ g_source_set_priority(fdevents, G_PRIORITY_HIGH);
+ fdevents_pfd.fd = eventpipe[0];
+ fdevents_pfd.events = G_IO_IN;
+ fdevents_pfd.revents = 0;
+ g_source_add_poll(fdevents, &fdevents_pfd);
+ g_source_attach(fdevents, NULL);
+ }
+
log_msg("Starting main loop\n");
g_main_loop_run(mainloop);
log_msg("Main loop completed\n");
projects / browser-switch / blobdiff