X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=6ac5070f3f1aa4d1b4579fba53caa7c1d326f193;hb=36a165503297903204be32a07e0440ca56dac7f0;hp=38621ecf32f97cec301f3c51d469215f54f40867;hpb=f1b901ed676b2d45ec8e6ae3d6ef2f94d79f9ee6;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index 38621ecf..6ac5070f 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -26,10 +26,6 @@ #include #include #include -#include -#include -#include -#include #include "afb-plugin.h" #include "afb-req-itf.h" @@ -40,10 +36,9 @@ #include "afb-context.h" #include "afb-apis.h" #include "afb-api-so.h" +#include "afb-sig-handler.h" #include "verbose.h" -extern __thread sigjmp_buf *error_handler; - struct api_so_desc { struct AFB_plugin *plugin; /* descriptor */ size_t apilength; @@ -85,50 +80,23 @@ static const struct afb_daemon_itf daemon_itf = { .get_system_bus = (void*)afb_common_get_system_bus }; +struct monitoring { + struct afb_req req; + void (*action)(struct afb_req); +}; -static void trapping_call(struct afb_req req, void(*cb)(struct afb_req)) +static void monitored_call(int signum, struct monitoring *data) { - volatile int signum, timerset; - timer_t timerid; - sigjmp_buf jmpbuf, *older; - struct sigevent sevp; - struct itimerspec its; - - timerset = 0; - older = error_handler; - signum = setjmp(jmpbuf); - if (signum != 0) { - afb_req_fail_f(req, "aborted", "signal %d caught", signum); - } - else { - error_handler = &jmpbuf; - if (api_timeout > 0) { - timerset = 1; /* TODO: check statuses */ - sevp.sigev_notify = SIGEV_THREAD_ID; - sevp.sigev_signo = SIGALRM; - sevp.sigev_value.sival_ptr = NULL; -#if defined(sigev_notify_thread_id) - sevp.sigev_notify_thread_id = (pid_t)syscall(SYS_gettid); -#else - sevp._sigev_un._tid = (pid_t)syscall(SYS_gettid); -#endif - timer_create(CLOCK_THREAD_CPUTIME_ID, &sevp, &timerid); - its.it_interval.tv_sec = 0; - its.it_interval.tv_nsec = 0; - its.it_value.tv_sec = api_timeout; - its.it_value.tv_nsec = 0; - timer_settime(timerid, 0, &its, NULL); - } - - cb(req); - } - if (timerset) - timer_delete(timerid); - error_handler = older; + if (signum != 0) + afb_req_fail_f(data->req, "aborted", "signal %s(%d) caught", strsignal(signum), signum); + else + data->action(data->req); } static void call_check(struct afb_req req, struct afb_context *context, const struct AFB_restapi *verb) { + struct monitoring data; + int stag = (int)(verb->session & AFB_SESSION_MASK); if (stag != AFB_SESSION_NONE) { @@ -153,7 +121,9 @@ static void call_check(struct afb_req req, struct afb_context *context, const st if ((stag & AFB_SESSION_CLOSE) != 0) afb_context_close(context); - trapping_call(req, verb->callback); + data.req = req; + data.action = verb->callback; + afb_sig_monitor((void*)monitored_call, &data, api_timeout); } static void call(struct api_so_desc *desc, struct afb_req req, struct afb_context *context, const char *verb, size_t lenverb) @@ -176,25 +146,24 @@ int afb_api_so_add_plugin(const char *path) desc = calloc(1, sizeof *desc); if (desc == NULL) { - fprintf(stderr, "[%s] out of memory\n", path); + ERROR("out of memory"); goto error; } // This is a loadable library let's check if it's a plugin desc->handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); if (desc->handle == NULL) { - fprintf(stderr, "[%s] not loadable, continuing...\n", path); + ERROR("plugin [%s] not loadable", path); goto error2; } /* retrieves the register function */ pluginRegisterFct = dlsym(desc->handle, plugin_register_function); if (!pluginRegisterFct) { - fprintf(stderr, "[%s] not an AFB plugin, continuing...\n", path); + ERROR("plugin [%s] is not an AFB plugin", path); goto error3; } - if (verbosity) - fprintf(stderr, "[%s] is a valid AFB plugin\n", path); + INFO("plugin [%s] is a valid AFB plugin", path); /* init the interface */ desc->interface.verbosity = 0; @@ -205,25 +174,25 @@ int afb_api_so_add_plugin(const char *path) /* init the plugin */ desc->plugin = pluginRegisterFct(&desc->interface); if (desc->plugin == NULL) { - fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", path); + ERROR("plugin [%s] register function failed. continuing...", path); goto error3; } /* check the returned structure */ if (desc->plugin->type != AFB_PLUGIN_JSON) { - fprintf(stderr, "ERROR: plugin [%s] invalid type %d...\n", path, desc->plugin->type); + ERROR("plugin [%s] invalid type %d...", path, desc->plugin->type); goto error3; } if (desc->plugin->prefix == NULL || *desc->plugin->prefix == 0) { - fprintf(stderr, "ERROR: plugin [%s] bad prefix...\n", path); + ERROR("plugin [%s] bad prefix...", path); goto error3; } if (desc->plugin->info == NULL || *desc->plugin->info == 0) { - fprintf(stderr, "ERROR: plugin [%s] bad description...\n", path); + ERROR("plugin [%s] bad description...", path); goto error3; } if (desc->plugin->apis == NULL) { - fprintf(stderr, "ERROR: plugin [%s] no APIs...\n", path); + ERROR("plugin [%s] no APIs...", path); goto error3; } @@ -232,10 +201,10 @@ int afb_api_so_add_plugin(const char *path) if (afb_apis_add(desc->plugin->prefix, (struct afb_api){ .closure = desc, .call = (void*)call}) < 0) { - fprintf(stderr, "ERROR: plugin [%s] can't be registered...\n", path); + ERROR("plugin [%s] can't be registered...", path); goto error3; } - + NOTICE("plugin %s loaded with API prefix %s", path, desc->plugin->prefix); return 0; error3: @@ -255,11 +224,10 @@ static int adddirs(char path[PATH_MAX], size_t end) /* open the DIR now */ dir = opendir(path); if (dir == NULL) { - fprintf(stderr, "ERROR in scanning plugin directory %s, %m\n", path); + ERROR("can't scan plugin directory %s, %m", path); return -1; } - if (verbosity) - fprintf(stderr, "Scanning dir=[%s] for plugins\n", path); + INFO("Scanning dir=[%s] for plugins", path); /* scan each entry */ if (end) @@ -271,7 +239,7 @@ static int adddirs(char path[PATH_MAX], size_t end) len = strlen(ent.d_name); if (len + end >= PATH_MAX) { - fprintf(stderr, "path too long for %s\n", ent.d_name); + ERROR("path too long while scanning plugins for %s", ent.d_name); continue; } memcpy(&path[end], ent.d_name, len+1); @@ -302,7 +270,7 @@ int afb_api_so_add_directory(const char *path) length = strlen(path); if (length >= sizeof(buffer)) { - fprintf(stderr, "path too long %lu [%.99s...]\n", (unsigned long)length, path); + ERROR("path too long %lu [%.99s...]", (unsigned long)length, path); return -1; } @@ -317,11 +285,13 @@ int afb_api_so_add_path(const char *path) rc = stat(path, &st); if (rc < 0) - fprintf(stderr, "Invalid plugin path [%s]: %m\n", path); + ERROR("Invalid plugin path [%s]: %m", path); else if (S_ISDIR(st.st_mode)) rc = afb_api_so_add_directory(path); - else + else if (strstr(path, ".so")) rc = afb_api_so_add_plugin(path); + else + INFO("not a plugin [%s], skipped", path); return rc; }