X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=ff35b54b6dce19b9635037067a79808cfe850929;hb=775144f839df8e3d37ec1cf52d0f7d3849ac7d46;hp=3999b77a9872ce961f511361a54ce2b551883cd9;hpb=b74a7373e768736dc12057e0ef9744dcc8a93443;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index 3999b77a..ff35b54b 100644 --- a/src/main.c +++ b/src/main.c @@ -17,7 +17,6 @@ */ #define _GNU_SOURCE -#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include #include @@ -54,6 +53,8 @@ #include "afb-hook.h" #include "sd-fds.h" #include "afb-debug.h" +#include "process-name.h" +#include "afb-supervision.h" /* if SELF_PGROUP == 0 the launched command is the group leader @@ -62,8 +63,8 @@ #define SELF_PGROUP 1 struct afb_apiset *main_apiset; +struct afb_config *main_config; -static struct afb_config *config; static pid_t childpid; /*---------------------------------------------------------- @@ -163,7 +164,7 @@ static void daemonize() int pid; // open /dev/console to redirect output messAFBes - consoleFD = open(config->console, O_WRONLY | O_APPEND | O_CREAT, 0640); + consoleFD = open(main_config->console, O_WRONLY | O_APPEND | O_CREAT, 0640); if (consoleFD < 0) { ERROR("AFB-daemon cannot open /dev/console (use --foreground)"); exit(1); @@ -182,7 +183,7 @@ static void daemonize() // son process get all data in standalone mode NOTICE("background mode [pid:%d console:%s]", getpid(), - config->console); + main_config->console); // redirect default I/O on console close(2); @@ -220,25 +221,25 @@ static int init_alias(void *closure, char *spec) static int init_http_server(struct afb_hsrv *hsrv) { if (!afb_hsrv_add_handler - (hsrv, config->rootapi, afb_hswitch_websocket_switch, main_apiset, 20)) + (hsrv, main_config->rootapi, afb_hswitch_websocket_switch, main_apiset, 20)) return 0; if (!afb_hsrv_add_handler - (hsrv, config->rootapi, afb_hswitch_apis, main_apiset, 10)) + (hsrv, main_config->rootapi, afb_hswitch_apis, main_apiset, 10)) return 0; - if (run_for_list(config->aliases, init_alias, hsrv)) + if (run_for_list(main_config->aliases, init_alias, hsrv)) return 0; - if (config->roothttp != NULL) { + if (main_config->roothttp != NULL) { if (!afb_hsrv_add_alias - (hsrv, "", afb_common_rootdir_get_fd(), config->roothttp, + (hsrv, "", afb_common_rootdir_get_fd(), main_config->roothttp, -10, 1)) return 0; } if (!afb_hsrv_add_handler - (hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL, + (hsrv, main_config->rootbase, afb_hswitch_one_page_api_redirect, NULL, -20)) return 0; @@ -250,8 +251,8 @@ static struct afb_hsrv *start_http_server() int rc; struct afb_hsrv *hsrv; - if (afb_hreq_init_download_path(config->uploaddir)) { - ERROR("unable to set the upload directory %s", config->uploaddir); + if (afb_hreq_init_download_path(main_config->uploaddir)) { + ERROR("unable to set the upload directory %s", main_config->uploaddir); return NULL; } @@ -261,17 +262,17 @@ static struct afb_hsrv *start_http_server() return NULL; } - if (!afb_hsrv_set_cache_timeout(hsrv, config->cacheTimeout) + if (!afb_hsrv_set_cache_timeout(hsrv, main_config->cacheTimeout) || !init_http_server(hsrv)) { ERROR("initialisation of httpd failed"); afb_hsrv_put(hsrv); return NULL; } - NOTICE("Waiting port=%d rootdir=%s", config->httpdPort, config->rootdir); - NOTICE("Browser URL= http://localhost:%d", config->httpdPort); + NOTICE("Waiting port=%d rootdir=%s", main_config->httpdPort, main_config->rootdir); + NOTICE("Browser URL= http://localhost:%d", main_config->httpdPort); - rc = afb_hsrv_start(hsrv, (uint16_t) config->httpdPort, 15); + rc = afb_hsrv_start(hsrv, (uint16_t) main_config->httpdPort, 15); if (!rc) { ERROR("starting of httpd failed"); afb_hsrv_put(hsrv); @@ -283,7 +284,6 @@ static struct afb_hsrv *start_http_server() /*--------------------------------------------------------- | execute_command - | +--------------------------------------------------------- */ static void on_sigchld(int signum, siginfo_t *info, void *uctx) @@ -383,11 +383,11 @@ static int instanciate_command_args(const char *port, const char *token) int i; /* instanciate the arguments */ - for (i = 0 ; config->exec[i] ; i++) { - repl = instanciate_string(config->exec[i], port, token); + for (i = 0 ; main_config->exec[i] ; i++) { + repl = instanciate_string(main_config->exec[i], port, token); if (!repl) return -1; - config->exec[i] = repl; + main_config->exec[i] = repl; } return 0; } @@ -396,10 +396,11 @@ static int execute_command() { struct sigaction siga; char port[20]; + const char *token; int rc; /* check whether a command is to execute or not */ - if (!config->exec || !config->exec[0]) + if (!main_config->exec || !main_config->exec[0]) return 0; if (SELF_PGROUP) @@ -417,8 +418,8 @@ static int execute_command() return 0; /* compute the string for port */ - if (config->httpdPort) - rc = snprintf(port, sizeof port, "%d", config->httpdPort); + if (main_config->httpdPort) + rc = snprintf(port, sizeof port, "%d", main_config->httpdPort); else rc = snprintf(port, sizeof port, "%cp", SUBST_CHAR); if (rc < 0 || rc >= (int)(sizeof port)) { @@ -426,13 +427,14 @@ static int execute_command() } else { /* instanciate arguments and environment */ - if (instanciate_command_args(port, config->token) >= 0 - && instanciate_environ(port, config->token) >= 0) { + token = afb_session_initial_token(); + if (instanciate_command_args(port, token) >= 0 + && instanciate_environ(port, token) >= 0) { /* run */ if (!SELF_PGROUP) setpgid(0, 0); - execv(config->exec[0], config->exec); - ERROR("can't launch %s: %m", config->exec[0]); + execv(main_config->exec[0], main_config->exec); + ERROR("can't launch %s: %m", main_config->exec[0]); } } exit(1); @@ -503,8 +505,8 @@ static void startup_call_current(struct startup_req *sreq) sreq->xreq.context.validated = 1; sreq->api = strndup(api, verb - api); sreq->verb = strndup(verb + 1, json - verb - 1); - sreq->xreq.api = sreq->api; - sreq->xreq.verb = sreq->verb; + sreq->xreq.request.api = sreq->api; + sreq->xreq.request.verb = sreq->verb; sreq->xreq.json = json_tokener_parse(json + 1); if (sreq->api && sreq->verb && sreq->xreq.json) { afb_xreq_process(&sreq->xreq, main_apiset); @@ -521,10 +523,10 @@ static void run_startup_calls() struct afb_config_list *list; struct startup_req *sreq; - list = config->calls; + list = main_config->calls; if (list) { sreq = calloc(1, sizeof *sreq); - sreq->session = afb_session_create("startup", 3600); + sreq->session = afb_session_create(3600); sreq->current = list; startup_call_current(sreq); } @@ -534,7 +536,7 @@ static void run_startup_calls() | job for starting the daemon +--------------------------------------------------------- */ -static void start(int signum) +static void start(int signum, void *arg) { struct afb_hsrv *hsrv; @@ -545,30 +547,23 @@ static void start(int signum) exit(1); } - // ------------------ sanity check ---------------------------------------- - if (config->httpdPort <= 0) { - ERROR("no port is defined"); - 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); + mkdir(main_config->workdir, S_IRWXU | S_IRGRP | S_IXGRP); + if (chdir(main_config->workdir) < 0) { + ERROR("Can't enter working dir %s", main_config->workdir); goto error; } - if (afb_common_rootdir_set(config->rootdir) < 0) { + if (afb_common_rootdir_set(main_config->rootdir) < 0) { ERROR("failed to set common root directory"); goto error; } /* configure the daemon */ - 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"); + if (afb_session_init(main_config->nbSessionMax, main_config->cntxTimeout, main_config->token)) { + ERROR("initialisation of session manager failed"); goto error; } - main_apiset = afb_apiset_create("main", config->apiTimeout); + main_apiset = afb_apiset_create("main", main_config->apiTimeout); if (!main_apiset) { ERROR("can't create main api set"); goto error; @@ -577,27 +572,31 @@ static void start(int signum) ERROR("failed to setup monitor"); goto error; } + if (afb_supervision_init() < 0) { + ERROR("failed to setup supervision"); + goto error; + } /* 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); - if (config->tracesvc) - afb_hook_create_svc(NULL, config->tracesvc, NULL, NULL); - if (config->traceevt) - afb_hook_create_evt(NULL, config->traceevt, NULL, NULL); + if (main_config->tracereq) + afb_hook_create_xreq(NULL, NULL, NULL, main_config->tracereq, NULL, NULL); + if (main_config->traceditf) + afb_hook_create_ditf(NULL, main_config->traceditf, NULL, NULL); + if (main_config->tracesvc) + afb_hook_create_svc(NULL, main_config->tracesvc, NULL, NULL); + if (main_config->traceevt) + afb_hook_create_evt(NULL, main_config->traceevt, NULL, NULL); /* load bindings */ afb_debug("start-load"); - apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client"); - apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client"); - apiset_start_list(config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set"); - apiset_start_list(config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set"); - apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding"); + apiset_start_list(main_config->so_bindings, afb_api_so_add_binding, "the binding"); + apiset_start_list(main_config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client"); + apiset_start_list(main_config->ws_clients, afb_api_ws_add_client_weak, "the afb-websocket client"); + apiset_start_list(main_config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set"); + apiset_start_list(main_config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set"); - apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service"); - apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service"); + apiset_start_list(main_config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service"); + apiset_start_list(main_config->ws_servers, afb_api_ws_add_server, "the afb-websocket service"); DEBUG("Init config done"); @@ -611,7 +610,17 @@ static void start(int signum) /* start the HTTP server */ afb_debug("start-http"); - if (!config->noHttpd) { + if (!main_config->noHttpd) { + if (main_config->httpdPort <= 0) { + ERROR("no port is defined"); + goto error; + } + + if (!afb_hreq_init_cookie(main_config->httpdPort, main_config->rootapi, main_config->cntxTimeout)) { + ERROR("initialisation of HTTP cookies failed"); + goto error; + } + hsrv = start_http_server(); if (hsrv == NULL) goto error; @@ -648,12 +657,16 @@ int main(int argc, char *argv[]) sd_fds_init(); // ------------- Build session handler & init config ------- - config = afb_config_parse_arguments(argc, argv); - + main_config = afb_config_parse_arguments(argc, argv); + if (main_config->name) { + verbose_set_name(main_config->name, 0); + process_name_set_name(main_config->name); + process_name_replace_cmdline(argv, main_config->name); + } afb_debug("main-args"); // --------- run ----------- - if (config->background) { + if (main_config->background) { // --------- in background mode ----------- INFO("entering background mode"); daemonize(); @@ -669,7 +682,7 @@ int main(int argc, char *argv[]) afb_debug("main-start"); /* enter job processing */ - jobs_start(3, 0, 50, start); + jobs_start(3, 0, 50, start, NULL); WARNING("hoops returned from jobs_enter! [report bug]"); return 1; }