X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=df35d88dbdf14ce172ae0d1760359856da37fff3;hb=f1b9dde05e420a06ee4a3f53d8bbd2739e255fb3;hp=351824132466fe9c388ea832d801035c71b776af;hpb=4be084408c6d3d7b7f90a2493829c8ce0cebb397;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index 35182413..df35d88d 100644 --- a/src/main.c +++ b/src/main.c @@ -17,9 +17,9 @@ */ #define _GNU_SOURCE -#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include +#include #include #include #include @@ -28,6 +28,10 @@ #include #include +#if !defined(NO_CALL_PERSONALITY) +#include +#endif + #include #include @@ -48,6 +52,8 @@ #include "afb-monitor.h" #include "afb-hook.h" #include "sd-fds.h" +#include "afb-debug.h" +#include "process-name.h" /* if SELF_PGROUP == 0 the launched command is the group leader @@ -112,7 +118,6 @@ static void exit_handler() killpg(0, SIGTERM); else if (childpid > 0) killpg(childpid, SIGTERM); - exit(0); } static void on_sigterm(int signum, siginfo_t *info, void *uctx) @@ -278,7 +283,6 @@ static struct afb_hsrv *start_http_server() /*--------------------------------------------------------- | execute_command - | +--------------------------------------------------------- */ static void on_sigchld(int signum, siginfo_t *info, void *uctx) @@ -346,7 +350,7 @@ static char *instanciate_string(char *arg, const char *port, const char *token) switch(*++it) { case 'p': wr = stpcpy(wr, port); break; case 't': wr = stpcpy(wr, token); break; - default: *wr++ = SUBST_CHAR; + default: *wr++ = SUBST_CHAR; /*@fallthrough@*/ case SUBST_CHAR: *wr++ = *it; } arg = ++it; @@ -391,6 +395,7 @@ static int execute_command() { struct sigaction siga; char port[20]; + const char *token; int rc; /* check whether a command is to execute or not */ @@ -421,8 +426,9 @@ 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); @@ -447,11 +453,11 @@ struct startup_req struct afb_session *session; }; -static void startup_call_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj) +static void startup_call_reply(struct afb_xreq *xreq, int status, struct json_object *obj) { struct startup_req *sreq = CONTAINER_OF_XREQ(struct startup_req, xreq); - if (!iserror) + if (status >= 0) NOTICE("startup call %s returned %s", sreq->current->value, json_object_get_string(obj)); else { ERROR("startup call %s ERROR! %s", sreq->current->value, json_object_get_string(obj)); @@ -498,8 +504,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); @@ -519,7 +525,7 @@ static void run_startup_calls() list = 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); } @@ -529,10 +535,17 @@ static void run_startup_calls() | job for starting the daemon +--------------------------------------------------------- */ -static void start() +static void start(int signum) { struct afb_hsrv *hsrv; + afb_debug("start-entry"); + + if (signum) { + ERROR("start aborted: received signal %s", strsignal(signum)); + exit(1); + } + // ------------------ sanity check ---------------------------------------- if (config->httpdPort <= 0) { ERROR("no port is defined"); @@ -571,12 +584,18 @@ static void start() 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); /* load bindings */ - 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, "the binding path set"); + afb_debug("start-load"); apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding"); + 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_weak, "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->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"); @@ -584,25 +603,32 @@ static void start() DEBUG("Init config done"); /* start the services */ + afb_debug("start-start"); +#if !defined(NO_CALL_PERSONALITY) + personality((unsigned long)-1L); +#endif if (afb_apiset_start_all_services(main_apiset, 1) < 0) goto error; /* start the HTTP server */ + afb_debug("start-http"); if (!config->noHttpd) { hsrv = start_http_server(); if (hsrv == NULL) goto error; } + /* run the startup calls */ + afb_debug("start-call"); + run_startup_calls(); + /* run the command */ + afb_debug("start-exec"); if (execute_command() < 0) goto error; /* ready */ sd_notify(1, "READY=1"); - - /* run the startup calls */ - run_startup_calls(); return; error: exit(1); @@ -615,6 +641,8 @@ error: int main(int argc, char *argv[]) { + afb_debug("main-entry"); + // let's run this program with a low priority nice(20); @@ -622,7 +650,12 @@ int main(int argc, char *argv[]) // ------------- Build session handler & init config ------- config = afb_config_parse_arguments(argc, argv); - INFO("running with pid %d", getpid()); + if (config->name) { + verbose_set_name(config->name, 0); + process_name_set_name(config->name); + process_name_replace_cmdline(argv, config->name); + } + afb_debug("main-args"); // --------- run ----------- if (config->background) { @@ -633,10 +666,13 @@ int main(int argc, char *argv[]) // ---- in foreground mode -------------------- INFO("entering foreground mode"); } + INFO("running with pid %d", getpid()); /* set the daemon environment */ setup_daemon(); + afb_debug("main-start"); + /* enter job processing */ jobs_start(3, 0, 50, start); WARNING("hoops returned from jobs_enter! [report bug]");