X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=735649cac5f0399ccd9689d231eddc7a67ac2242;hb=11d36a9f7e16aa9992835f8ce06f0e1e5297b131;hp=effef8a968791167a5f8357e4f698776ac4ae03e;hpb=bbe18a624f4961165cf52d7f4c25de6f3a7ec012;p=src%2Fapp-framework-binder.git diff --git a/src/afb-apis.c b/src/afb-apis.c index effef8a9..735649ca 100644 --- a/src/afb-apis.c +++ b/src/afb-apis.c @@ -37,18 +37,22 @@ #include #include -#include "../include/local-def.h" +#include "local-def.h" +#include "afb-plugin.h" #include "afb-req-itf.h" +#include "session.h" #include "afb-apis.h" struct api_desc { - AFB_plugin *plugin; /* descriptor */ + struct AFB_plugin *plugin; /* descriptor */ size_t prefixlen; const char *prefix; void *handle; /* context of dlopen */ + struct AFB_interface *interface; }; +static int api_timeout = 15; static struct api_desc *apis_array = NULL; static int apis_count = 0; @@ -71,48 +75,14 @@ void afb_apis_free_context(int apiidx, void *context) free(context); } -const struct AFB_restapi *afb_apis_get(int apiidx, int verbidx) -{ - assert(0 <= apiidx && apiidx < apis_count); - return &apis_array[apiidx].plugin->apis[verbidx]; -} - -int afb_apis_get_verbidx(int apiidx, const char *name) -{ - const struct AFB_restapi *apis; - int idx; - - assert(0 <= apiidx && apiidx < apis_count); - apis = apis_array[apiidx].plugin->apis; - for (idx = 0 ; apis[idx].name ; idx++) - if (!strcasecmp(apis[idx].name, name)) - return idx; - return -1; -} - -int afb_apis_get_apiidx(const char *prefix, size_t length) -{ - int i; - const struct api_desc *a; - - if (!length) - length = strlen(prefix); - - for (i = 0 ; i < apis_count ; i++) { - a = &apis_array[i]; - if (a->prefixlen == length && !strcasecmp(a->prefix, prefix)) - return i; - } - return -1; -} - int afb_apis_add_plugin(const char *path) { struct api_desc *apis; - AFB_plugin *plugin; - AFB_plugin *(*pluginRegisterFct) (void); + struct AFB_plugin *plugin; + struct AFB_plugin *(*pluginRegisterFct) (const struct AFB_interface *interface); + struct AFB_interface *interface; void *handle; - size_t len; + int i; // This is a loadable library let's check if it's a plugin handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); @@ -138,36 +108,46 @@ int afb_apis_add_plugin(const char *path) } apis_array = apis; + /* allocates the interface */ + interface = calloc(1, sizeof *interface); + if (interface == NULL) { + fprintf(stderr, "ERROR: plugin [%s] memory missing. continuing...\n", path); + goto error2; + } + interface->verbose = 0; + interface->mode = AFB_MODE_LOCAL; + /* init the plugin */ - plugin = pluginRegisterFct(); + plugin = pluginRegisterFct(interface); if (plugin == NULL) { fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", path); - goto error2; + goto error3; } /* check the returned structure */ if (plugin->type != AFB_PLUGIN_JSON) { fprintf(stderr, "ERROR: plugin [%s] invalid type %d...\n", path, plugin->type); - goto error2; + goto error3; } if (plugin->prefix == NULL || *plugin->prefix == 0) { fprintf(stderr, "ERROR: plugin [%s] bad prefix...\n", path); - goto error2; + goto error3; } if (plugin->info == NULL || *plugin->info == 0) { fprintf(stderr, "ERROR: plugin [%s] bad description...\n", path); - goto error2; + goto error3; } if (plugin->apis == NULL) { fprintf(stderr, "ERROR: plugin [%s] no APIs...\n", path); - goto error2; + goto error3; } /* check previously existing plugin */ - len = strlen(plugin->prefix); - if (afb_apis_get_apiidx(plugin->prefix, len) >= 0) { - fprintf(stderr, "ERROR: plugin [%s] prefix %s duplicated...\n", path, plugin->prefix); - goto error2; + for (i = 0 ; i < apis_count ; i++) { + if (!strcasecmp(apis_array[i].prefix, plugin->prefix)) { + fprintf(stderr, "ERROR: plugin [%s] prefix %s duplicated...\n", path, plugin->prefix); + goto error2; + } } /* record the plugin */ @@ -175,13 +155,16 @@ int afb_apis_add_plugin(const char *path) fprintf(stderr, "Loading plugin[%lu] prefix=[%s] info=%s\n", (unsigned long)apis_count, plugin->prefix, plugin->info); apis = &apis_array[apis_count]; apis->plugin = plugin; - apis->prefixlen = len; + apis->prefixlen = strlen(plugin->prefix); apis->prefix = plugin->prefix; apis->handle = handle; + apis->interface = interface; apis_count++; return 0; +error3: + free(interface); error2: dlclose(handle); error: @@ -285,9 +268,9 @@ int afb_apis_add_pathset(const char *pathset) // Check of apiurl is declare in this plugin and call it extern __thread sigjmp_buf *error_handler; -static int callPluginApi(AFB_request * request) +static void trapping_handle(struct afb_req req, void(*cb)(struct afb_req)) { - volatile int status, timerset; + volatile int signum, timerset; timer_t timerid; sigjmp_buf jmpbuf, *older; struct sigevent sevp; @@ -296,93 +279,82 @@ static int callPluginApi(AFB_request * request) // save context before calling the API timerset = 0; older = error_handler; - status = setjmp(jmpbuf); - if (status != 0) { - status = 0; + signum = setjmp(jmpbuf); + if (signum != 0) { + afb_req_fail_f(req, "aborted", "signal %d caught", signum); } else { error_handler = &jmpbuf; - if (request->config->apiTimeout > 0) { + if (api_timeout > 0) { timerset = 1; /* TODO: check statuses */ sevp.sigev_notify = SIGEV_THREAD_ID; sevp.sigev_signo = SIGALRM; #if defined(sigev_notify_thread_id) - sevp.sigev_notify_thread_id = syscall(SYS_gettid); + sevp.sigev_notify_thread_id = (pid_t)syscall(SYS_gettid); #else - sevp._sigev_un._tid = syscall(SYS_gettid); + 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 = 15; + its.it_value.tv_sec = api_timeout; its.it_value.tv_nsec = 0; timer_settime(timerid, 0, &its, NULL); } - //doCallPluginApi(request, apiidx, verbidx, context); - status = 1; + cb(req); } if (timerset) timer_delete(timerid); error_handler = older; - - return status; } -static void handle(struct afb_req req, const struct api_desc *api, const struct AFB_restapi *verb) +static void handle(struct afb_req req, const struct AFB_restapi *verb) { - json_object *jresp, *jcall, *jreqt; - - AFB_request request; - - request.uuid = request.url = "fake"; - request.prefix = api->prefix; - request.method = verb->name; - request.context = NULL; - request.restfull = 0; - request.errcode = 0; - request.config = NULL; - request.areq = &req; - switch(verb->session) { case AFB_SESSION_CREATE: + if (!afb_req_session_create(req)) + return; + break; case AFB_SESSION_RENEW: - /*if (check) new*/ + if (!afb_req_session_check(req, 1)) + return; break; case AFB_SESSION_CLOSE: case AFB_SESSION_CHECK: - /*check*/ + if (!afb_req_session_check(req, 0)) + return; break; case AFB_SESSION_NONE: default: break; } - verb->callback(&request, NULL); + trapping_handle(req, verb->callback); if (verb->session == AFB_SESSION_CLOSE) - /*close*/; + afb_req_session_close(req); } -int afb_apis_handle(struct afb_req req, const char *api, size_t lenapi, const char *verb, size_t lenverb) +int afb_apis_handle(struct afb_req req, struct AFB_clientCtx *context, const char *api, size_t lenapi, const char *verb, size_t lenverb) { int i, j; const struct api_desc *a; const struct AFB_restapi *v; -//fprintf(stderr,"afb_apis_handle prefix:%.*s verb:%.*s\n",(int)lenapi,api,(int)lenverb,verb); a = apis_array; for (i = 0 ; i < apis_count ; i++, a++) { if (a->prefixlen == lenapi && !strncasecmp(a->prefix, api, lenapi)) { -//fprintf(stderr,"afb_apis_handle found prefix:%.*s -> %s\n",(int)lenapi,api,a->prefix); v = a->plugin->apis; for (j = 0 ; v->name ; j++, v++) { if (!strncasecmp(v->name, verb, lenverb) && !v->name[lenverb]) { -//fprintf(stderr,"afb_apis_handle found prefix:%.*s verb:%.*s -> %s/%s\n",(int)lenapi,api,(int)lenverb,verb,a->prefix,v->name); - handle(req, a, v); + req.context = context->contexts[i]; + handle(req, v); + context->contexts[i] = req.context; return 1; } } - break; + afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, a->prefix); + return 1; } } return 0;