Fix concurrency issues on event manager

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

diff --git a/src/main.c b/src/main.c
index 3929674..9c2f3c5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -394,33 +394,23 @@ static int execute_command()
 }
 
 /*---------------------------------------------------------
- | main
- |   Parse option and launch action
+ | job for starting the daemon
  +--------------------------------------------------------- */
 
-int main(int argc, char *argv[])
+static void start(int signum)
 {
        struct afb_hsrv *hsrv;
-       struct sd_event *eventloop;
-
-       LOGAUTH("afb-daemon");
-
-       sd_fds_init();
-
-       // ------------- Build session handler & init config -------
-       config = afb_config_parse_arguments(argc, argv);
-       atexit(exit_handler);
 
        // ------------------ sanity check ----------------------------------------
        if (config->httpdPort <= 0) {
                ERROR("no port is defined");
-               exit(1);
+               goto error;
        }
 
        mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
        if (chdir(config->workdir) < 0) {
                ERROR("Can't enter working dir %s", config->workdir);
-               exit(1);
+               goto error;
        }
 
        afb_api_so_set_timeout(config->apiTimeout);
@@ -436,32 +426,58 @@ int main(int argc, char *argv[])
 
        if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
                ERROR("initialisation of cookies failed");
-               exit(1);
-       }
-
-       if (sig_monitor_init() < 0) {
-               ERROR("failed to initialise signal handlers");
-               return 1;
+               goto error;
        }
 
        // set the root dir
        if (afb_common_rootdir_set(config->rootdir) < 0) {
                ERROR("failed to set common root directory");
-               return 1;
+               goto error;
        }
 
-       if (jobs_init(3, 1, 20) < 0) {
-               ERROR("failed to initialise threading");
-               return 1;
+       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;
+
+       /* start the HTTP server */
+       if (!config->noHttpd) {
+               hsrv = start_http_server();
+               if (hsrv == NULL)
+                       goto error;
        }
+
+       /* run the command */
+       if (execute_command() < 0)
+               goto error;
+
+       /* ready */
+       sd_notify(1, "READY=1");
+       return;
+error:
+       exit(1);
+}
+/*---------------------------------------------------------
+ | main
+ |   Parse option and launch action
+ +--------------------------------------------------------- */
+
+int main(int argc, char *argv[])
+{
        // let's run this program with a low priority
        nice(20);
 
-       // ------------------ Finaly Process Commands -----------------------------
-       // let's not take the risk to run as ROOT
-       //if (getuid() == 0)  goto errorNoRoot;
+       LOGAUTH("afb-daemon");
 
-       DEBUG("Init config done");
+       sd_fds_init();
+
+       // ------------- Build session handler & init config -------
+       config = afb_config_parse_arguments(argc, argv);
 
        // --------- run -----------
        if (config->background) {
@@ -473,42 +489,33 @@ int main(int argc, char *argv[])
                INFO("entering foreground mode");
        }
 
+       /* handle groups */
+       atexit(exit_handler);
+
        /* ignore any SIGPIPE */
        signal(SIGPIPE, SIG_IGN);
 
-       /* 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)
-               exit(1);
-
-       /* start the HTTP server */
-       if (!config->noHttpd) {
-               hsrv = start_http_server();
-               if (hsrv == NULL)
-                       exit(1);
+       /* start */
+       if (sig_monitor_init() < 0) {
+               ERROR("failed to initialise signal handlers");
+               return 1;
        }
 
-       /* run the command */
-       if (execute_command() < 0)
-               exit(1);
-
-       /* signal that ready */
-       if (config->readyfd != 0) {
-               static const char readystr[] = "READY=1";
-               write(config->readyfd, readystr, sizeof(readystr) - 1);
-               close(config->readyfd);
+       /* init job processing */
+       if (jobs_init(3, 1, 20) < 0) {
+               ERROR("failed to initialise threading");
+               return 1;
        }
 
-       // infinite loop
-       eventloop = afb_common_get_event_loop();
-       sd_notify(1, "READY=1");
-       for (;;)
-               sd_event_run(eventloop, 30000000);
-
-       WARNING("hoops returned from infinite loop [report bug]");
+       /* 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;
 }
+