X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=main.c;h=877ab8b2b681a96bca99d0195803f07012104251;hp=30361c866563a6fbe3f14429d1611224abadc419;hb=e3ec5ec543a7a76d230d3102666a6a33ae20c496;hpb=ec8b58af1b1cf22f34478faf476047e7ce996245 diff --git a/main.c b/main.c index 30361c8..877ab8b 100644 --- a/main.c +++ b/main.c @@ -22,10 +22,12 @@ #include #include +#include #include #include #include #include +#include #include #include "browser-switchboard.h" @@ -36,12 +38,60 @@ 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); @@ -49,7 +99,15 @@ static void read_config(int signalnum) { swb_config_load(&cfg); log_config(cfg.logging); +#ifdef FREMANTLE + /* continuous mode is required on Fremantle */ + ctx.continuous_mode = 1; + if (!cfg.continuous_mode) + log_msg("continuous_mode = 0 operation no longer supported, ignoring config setting\n"); +#else ctx.continuous_mode = cfg.continuous_mode; +#endif + free(ctx.other_browser_cmd); if (cfg.other_browser_cmd) { if (!(ctx.other_browser_cmd = strdup(cfg.other_browser_cmd))) { log_perror(errno, "Failed to set other_browser_cmd"); @@ -58,6 +116,9 @@ static void read_config(int signalnum) { } 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); @@ -70,12 +131,15 @@ static void read_config(int signalnum) { } int main() { - OssoBrowser *obj_osso_browser, *obj_osso_browser_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 */ @@ -90,8 +154,12 @@ int main() { 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; @@ -133,23 +201,63 @@ int main() { 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; } + /* Get a connection to the D-Bus system bus */ + ctx.system_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); + if (!ctx.system_bus) { + log_msg("Couldn't get a D-Bus system bus connection\n"); + return 1; + } + ctx.dbus_system_proxy = dbus_g_proxy_new_for_name(ctx.system_bus, + "org.freedesktop.DBus", "/org/freedesktop/DBus", + "org.freedesktop.DBus"); + if (!ctx.dbus_system_proxy) { + log_msg("Couldn't get an org.freedesktop.DBus proxy\n"); + return 1; + } + dbus_request_osso_browser_name(&ctx); /* 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");