X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=4908ba85422e9fad8e03ef70bed3c757eb36dd80;hb=c9ba2ce49808a19a4ef982280a46256797b830ae;hp=e31216e0004382473a6024688a8cffeaea7163cf;hpb=68a8eaafe5f43480f29308bfd2ec12ad54da43f1;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index e31216e0..4908ba85 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -1,287 +1,139 @@ /* - * Copyright (C) 2016 "IoT.bzh" + * Copyright (C) 2016, 2017 "IoT.bzh" * Author José Bollo * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * Contain all generic part to handle REST/API - * - * https://www.gnu.org/software/libmicrohttpd/tutorial.html [search 'largepost.c'] + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #define _GNU_SOURCE +#define NO_BINDING_VERBOSE_MACRO #include -#include +#include #include #include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include - -#include "afb-plugin.h" -#include "afb-req-itf.h" -#include "afb-poll-itf.h" -#include "session.h" -#include "afb-apis.h" #include "afb-api-so.h" +#include "afb-api-so-v1.h" +#include "afb-api-so-v2.h" #include "verbose.h" -#include "utils-upoll.h" - -struct api_so_desc { - struct AFB_plugin *plugin; /* descriptor */ - void *handle; /* context of dlopen */ - struct AFB_interface interface; -}; - -static int api_timeout = 15; -static const char plugin_register_function[] = "pluginRegister"; +int afb_api_so_timeout = 15; -static const struct afb_pollitf upollitf = { - .wait = (void*)upoll_wait, - .open = (void*)upoll_open, - .on_readable = (void*)upoll_on_readable, - .on_writable = (void*)upoll_on_writable, - .on_hangup = (void*)upoll_on_hangup, - .close = (void*)upoll_close -}; - -static void free_context(struct api_so_desc *desc, void *context) +void afb_api_so_set_timeout(int to) { - void (*cb)(void*); - - cb = desc->plugin->freeCtxCB; - if (cb) - cb(context); - else - free(context); + afb_api_so_timeout = to; } - -// Check of apiurl is declare in this plugin and call it -extern __thread sigjmp_buf *error_handler; -static void trapping_call(struct afb_req req, void(*cb)(struct afb_req)) +static int load_binding(const char *path, int force) { - volatile int signum, timerset; - timer_t timerid; - sigjmp_buf jmpbuf, *older; - struct sigevent sevp; - struct itimerspec its; - - // save context before calling the API - 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; -} - -static void call_check(struct afb_req req, const struct AFB_restapi *verb) -{ - switch(verb->session) { - case AFB_SESSION_CREATE: - if (!afb_req_session_create(req)) - return; - break; - case AFB_SESSION_RENEW: - if (!afb_req_session_check(req, 1)) - return; - break; - case AFB_SESSION_CLOSE: - case AFB_SESSION_CHECK: - if (!afb_req_session_check(req, 0)) - return; - break; - case AFB_SESSION_NONE: - default: - break; - } - trapping_call(req, verb->callback); - - if (verb->session == AFB_SESSION_CLOSE) - afb_req_session_close(req); -} - -static void call(struct api_so_desc *desc, struct afb_req req, const char *verb, size_t lenverb) -{ - const struct AFB_restapi *v; - - v = desc->plugin->apis; - while (v->name && (strncasecmp(v->name, verb, lenverb) || v->name[lenverb])) - v++; - if (v->name) - call_check(req, v); - else - afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, desc->plugin->prefix); -} - - - -int afb_api_so_add_plugin(const char *path) -{ - struct api_so_desc *desc; - struct AFB_plugin *(*pluginRegisterFct) (const struct AFB_interface *interface); - - desc = calloc(1, sizeof *desc); - if (desc == NULL) { - fprintf(stderr, "[%s] out of memory\n", path); + int rc; + void *handle; + + // This is a loadable library let's check if it's a binding + rc = -!!force; + handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); + if (handle == NULL) { + if (force) + ERROR("binding [%s] not loadable: %s", path, dlerror()); + else + INFO("binding [%s] not loadable: %s", path, dlerror()); 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); - 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); - goto error3; - } - if (verbosity) - fprintf(stderr, "[%s] is a valid AFB plugin\n", path); - - /* init the interface */ - desc->interface.verbosity = 0; - desc->interface.mode = AFB_MODE_LOCAL; - desc->interface.pollitf = &upollitf; - desc->interface.pollclosure = NULL; - - /* init the plugin */ - desc->plugin = pluginRegisterFct(&desc->interface); - if (desc->plugin == NULL) { - fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", 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); - goto error3; - } - if (desc->plugin->prefix == NULL || *desc->plugin->prefix == 0) { - fprintf(stderr, "ERROR: plugin [%s] bad prefix...\n", path); - goto error3; - } - if (desc->plugin->info == NULL || *desc->plugin->info == 0) { - fprintf(stderr, "ERROR: plugin [%s] bad description...\n", path); - goto error3; + rc = afb_api_so_v2_add(path, handle); + if (rc < 0) { + /* error when loading a valid v2 binding */ + goto error2; } - if (desc->plugin->apis == NULL) { - fprintf(stderr, "ERROR: plugin [%s] no APIs...\n", path); - goto error3; + rc = afb_api_so_v1_add(path, handle); + if (rc < 0) { + /* error when loading a valid v1 binding */ + goto error2; } - - /* records the plugin */ - if (afb_apis_add(desc->plugin->prefix, (struct afb_api){ - .closure = desc, - .call = (void*)call, - .free_context = (void*)free_context}) < 0) { - fprintf(stderr, "ERROR: plugin [%s] can't be registered...\n", path); - goto error3; + if (rc == 0) { + /* not a v1 binding */ + if (force) + ERROR("binding [%s] is not an AFB binding", path); + else + INFO("binding [%s] is not an AFB binding", path); + goto error2; } - return 0; -error3: - dlclose(desc->handle); error2: - free(desc); + dlclose(handle); error: - return -1; + return rc; +} + + +int afb_api_so_add_binding(const char *path) +{ + return load_binding(path, 1); } static int adddirs(char path[PATH_MAX], size_t end) { DIR *dir; - struct dirent ent, *result; + struct dirent *dent; size_t len; /* 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 binding directory %s, %m", path); return -1; } - if (verbosity) - fprintf(stderr, "Scanning dir=[%s] for plugins\n", path); + INFO("Scanning dir=[%s] for bindings", path); /* scan each entry */ if (end) path[end++] = '/'; for (;;) { - readdir_r(dir, &ent, &result); - if (result == NULL) + errno = 0; + dent = readdir(dir); + if (dent == NULL) { + if (errno != 0) + ERROR("read error while scanning directory %.*s: %m", (int)(end - 1), path); break; + } - len = strlen(ent.d_name); + len = strlen(dent->d_name); if (len + end >= PATH_MAX) { - fprintf(stderr, "path too long for %s\n", ent.d_name); + ERROR("path too long while scanning bindings for %s", dent->d_name); continue; } - memcpy(&path[end], ent.d_name, len+1); - if (ent.d_type == DT_DIR) { + if (dent->d_type == DT_DIR) { /* case of directories */ - if (ent.d_name[0] == '.') { + if (dent->d_name[0] == '.') { if (len == 1) continue; - if (ent.d_name[1] == '.' && len == 2) + if (dent->d_name[1] == '.' && len == 2) continue; } + memcpy(&path[end], dent->d_name, len+1); adddirs(path, end+len);; - } else if (ent.d_type == DT_REG) { + } else if (dent->d_type == DT_REG) { /* case of files */ - if (!strstr(ent.d_name, ".so")) + if (memcmp(&dent->d_name[len - 3], ".so", 4)) continue; - afb_api_so_add_plugin(path); + memcpy(&path[end], dent->d_name, len+1); + if (load_binding(path, 0) < 0) + return -1; } } closedir(dir); @@ -295,7 +147,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; } @@ -310,11 +162,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 binding path [%s]: %m", path); else if (S_ISDIR(st.st_mode)) rc = afb_api_so_add_directory(path); + else if (strstr(path, ".so")) + rc = load_binding(path, 0); else - rc = afb_api_so_add_plugin(path); + INFO("not a binding [%s], skipped", path); return rc; } @@ -328,27 +182,8 @@ int afb_api_so_add_pathset(const char *pathset) p = strsep(&ps, sep); if (!p) return 0; - afb_api_so_add_path(p); - }; + if (afb_api_so_add_path(p) < 0) + return -1; + } } - - - - - - - - - - - - - - - - - - - -