#include "afb-hsrv.h"
#include "afb-context.h"
#include "afb-hreq.h"
-#include "sig-monitor.h"
#include "jobs.h"
#include "afb-session.h"
#include "verbose.h"
+--------------------------------------------------------- */
static void exit_handler()
{
- /* TODO: check whether using SIGHUP isn't better */
if (SELF_PGROUP)
- killpg(0, SIGKILL);
+ killpg(0, SIGHUP);
else if (childpid > 0)
- killpg(childpid, SIGKILL);
+ killpg(childpid, SIGHUP);
}
/*----------------------------------------------------------
return -1;
}
-/*---------------------------------------------------------
- | main event processing
- +--------------------------------------------------------- */
-
-static void main_event_wait_and_dispatch(int signum, void *closure)
-{
- struct sd_event *event = closure;
- if (signum == 0)
- sd_event_run(event, 30000000);
-}
-
/*---------------------------------------------------------
| job for starting the daemon
+--------------------------------------------------------- */
-static void start(int signum)
+static void start()
{
struct afb_hsrv *hsrv;
goto error;
}
- afb_api_so_set_timeout(config->apiTimeout);
+ afb_apis_set_timeout(config->apiTimeout);
start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set");
/* ignore any SIGPIPE */
signal(SIGPIPE, SIG_IGN);
- /* start */
- if (sig_monitor_init() < 0) {
- ERROR("failed to initialise signal handlers");
- return 1;
- }
-
- /* init job processing */
- if (jobs_init(3, 1, 20) < 0) {
- ERROR("failed to initialise threading");
- return 1;
- }
-
- /* records the loop */
- if (jobs_add_events(NULL, 0, main_event_wait_and_dispatch, afb_common_get_event_loop()) < 0) {
- ERROR("failed to set main_event_wait_and_dispatch");
- return 1;
- }
-
- /* queue the start job */
- if (jobs_queue0(NULL, 0, start) < 0) {
- ERROR("failed to set main_event_wait_and_dispatch");
- return 1;
- }
-
- /* turn as processing thread */
- jobs_add_me();
- WARNING("hoops returned from jobs_add_me! [report bug]");
- return 0;
+ /* enter job processing */
+ jobs_start(3, 0, 50, start);
+ WARNING("hoops returned from jobs_enter! [report bug]");
+ return 1;
}