Make implementation multithread

[src/app-framework-binder.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 9c2f3c5..18f5e5e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -41,7 +41,6 @@
 #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"
@@ -100,11 +99,49 @@ static void start_list(struct afb_config_list *list,
  +--------------------------------------------------------- */
 static void exit_handler()
 {
-       /* TODO: check whether using SIGHUP isn't better */
+       struct sigaction siga;
+
+       memset(&siga, 0, sizeof siga);
+       siga.sa_handler = SIG_IGN;
+       sigaction(SIGTERM, &siga, NULL);
+
        if (SELF_PGROUP)
-               killpg(0, SIGKILL);
+               killpg(0, SIGTERM);
        else if (childpid > 0)
-               killpg(childpid, SIGKILL);
+               killpg(childpid, SIGTERM);
+}
+
+static void on_sigterm(int signum, siginfo_t *info, void *uctx)
+{
+       NOTICE("Received SIGTERM");
+       exit(0);
+}
+
+static void on_sighup(int signum, siginfo_t *info, void *uctx)
+{
+       NOTICE("Received SIGHUP");
+       /* TODO */
+}
+
+static void setup_daemon()
+{
+       struct sigaction siga;
+
+       /* install signal handlers */
+       memset(&siga, 0, sizeof siga);
+       siga.sa_flags = SA_SIGINFO;
+
+       siga.sa_sigaction = on_sigterm;
+       sigaction(SIGTERM, &siga, NULL);
+
+       siga.sa_sigaction = on_sighup;
+       sigaction(SIGHUP, &siga, NULL);
+
+       /* handle groups */
+       atexit(exit_handler);
+
+       /* ignore any SIGPIPE */
+       signal(SIGPIPE, SIG_IGN);
 }
 
 /*----------------------------------------------------------
@@ -223,7 +260,7 @@ static struct afb_hsrv *start_http_server()
        }
 
        NOTICE("Waiting port=%d rootdir=%s", config->httpdPort, config->rootdir);
-       NOTICE("Browser URL= http:/*localhost:%d", config->httpdPort);
+       NOTICE("Browser URL= http://localhost:%d", config->httpdPort);
 
        rc = afb_hsrv_start(hsrv, (uint16_t) config->httpdPort, 15);
        if (!rc) {
@@ -397,7 +434,7 @@ static int execute_command()
  | job for starting the daemon
  +--------------------------------------------------------- */
 
-static void start(int signum)
+static void start()
 {
        struct afb_hsrv *hsrv;
 
@@ -407,40 +444,42 @@ static void start(int signum)
                goto error;
        }
 
+       /* set the directories */
        mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
        if (chdir(config->workdir) < 0) {
                ERROR("Can't enter working dir %s", config->workdir);
                goto error;
        }
+       if (afb_common_rootdir_set(config->rootdir) < 0) {
+               ERROR("failed to set common root directory");
+               goto error;
+       }
+
+       /* configure the daemon */
+       afb_apis_set_timeout(config->apiTimeout);
+       afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
+       if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
+               ERROR("initialisation of cookies failed");
+               goto error;
+       }
 
-       afb_api_so_set_timeout(config->apiTimeout);
+       /* install hooks */
+       if (config->tracereq)
+               afb_hook_create_xreq(NULL, NULL, NULL, config->tracereq, NULL, NULL);
+       if (config->traceditf)
+               afb_hook_create_ditf(NULL, config->traceditf, NULL, NULL);
+
+       /* load bindings */
        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");
        start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
 
-       afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
-
        start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
        start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
 
-       if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
-               ERROR("initialisation of cookies failed");
-               goto error;
-       }
-
-       // set the root dir
-       if (afb_common_rootdir_set(config->rootdir) < 0) {
-               ERROR("failed to set common root directory");
-               goto error;
-       }
-
        DEBUG("Init config done");
 
-       /* install trace of requests */
-       if (config->tracereq)
-               afb_hook_req_create(NULL, NULL, NULL, config->tracereq, NULL, NULL);
-
        /* start the services */
        if (afb_apis_start_all_services(1) < 0)
                goto error;
@@ -462,6 +501,7 @@ static void start(int signum)
 error:
        exit(1);
 }
+
 /*---------------------------------------------------------
  | main
  |   Parse option and launch action
@@ -472,12 +512,11 @@ int main(int argc, char *argv[])
        // let's run this program with a low priority
        nice(20);
 
-       LOGAUTH("afb-daemon");
-
        sd_fds_init();
 
        // ------------- Build session handler & init config -------
        config = afb_config_parse_arguments(argc, argv);
+       INFO("running with pid %d", getpid());
 
        // --------- run -----------
        if (config->background) {
@@ -489,33 +528,12 @@ int main(int argc, char *argv[])
                INFO("entering foreground mode");
        }
 
-       /* handle groups */
-       atexit(exit_handler);
-
-       /* ignore any SIGPIPE */
-       signal(SIGPIPE, SIG_IGN);
-
-       /* start */
-       if (sig_monitor_init() < 0) {
-               ERROR("failed to initialise signal handlers");
-               return 1;
-       }
+       /* set the daemon environment */
+       setup_daemon();
 
-       /* init job processing */
-       if (jobs_init(3, 1, 20) < 0) {
-               ERROR("failed to initialise threading");
-               return 1;
-       }
-
-       /* queue the start job */
-       if (jobs_queue0(NULL, 0, start) < 0) {
-               ERROR("failed to start runnning jobs");
-               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;
 }