X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=88246b58c33758d914e35c9d9ae32cf9b85511ae;hb=9e3afb8aa598f3e69e2c3723335507c12b4cd1f1;hp=32d097fae9fc6f4523db269d6d5b43d34679e6b0;hpb=83ce3b29a598141f8f28afde655beb07ec78c312;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index 32d097fa..88246b58 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -1,24 +1,18 @@ /* * Copyright (C) 2016 "IoT.bzh" - * Author "Fulup Ar Foll" * 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 @@ -39,7 +33,8 @@ #include "afb-plugin.h" #include "afb-req-itf.h" -#include "afb-poll-itf.h" +#include "afb-pollmgr-itf.h" +#include "afb-evmgr-itf.h" #include "session.h" #include "afb-apis.h" @@ -47,45 +42,61 @@ #include "verbose.h" #include "utils-upoll.h" +extern __thread sigjmp_buf *error_handler; + struct api_so_desc { - struct AFB_plugin *plugin; /* descriptor */ - void *handle; /* context of dlopen */ - struct AFB_interface interface; + struct AFB_plugin *plugin; /* descriptor */ + size_t apilength; + void *handle; /* context of dlopen */ + struct AFB_interface interface; /* interface */ }; static int api_timeout = 15; static const char plugin_register_function[] = "pluginRegister"; -static const struct afb_poll_itf upoll_itf = { +static const struct afb_pollmgr_itf pollmgr_itf = { + .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 struct afb_poll itf_poll_open(int fd, void *closure) +static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object) { - struct afb_poll result; - result.data = upoll_open(fd, closure); - result.itf = result.data ? &upoll_itf : NULL; - return result; + size_t length; + char *event; + + assert(desc->plugin != NULL); + length = strlen(name); + event = alloca(length + 2 + desc->apilength); + memcpy(event, desc->plugin->prefix, desc->apilength); + event[desc->apilength] = '/'; + memcpy(event + desc->apilength + 1, name, length + 1); + ctxClientEventSend(NULL, event, object); } -static void free_context(struct api_so_desc *desc, void *context) +static const struct afb_evmgr_itf evmgr_itf = { + .push = (void*)afb_api_so_evmgr_push +}; + +static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc) { - void (*cb)(void*); + return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc }; +} - cb = desc->plugin->freeCtxCB; - if (cb) - cb(context); - else - free(context); +static struct afb_pollmgr afb_api_so_get_pollmgr(struct api_so_desc *desc) +{ + return (struct afb_pollmgr){ .itf = &pollmgr_itf, .closure = NULL }; } +static const struct afb_daemon_itf daemon_itf = { + .get_evmgr = (void*)afb_api_so_get_evmgr, + .get_pollmgr = (void*)afb_api_so_get_pollmgr +}; -// 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)) { volatile int signum, timerset; @@ -94,7 +105,6 @@ static void trapping_call(struct afb_req req, void(*cb)(struct afb_req)) struct sigevent sevp; struct itimerspec its; - // save context before calling the API timerset = 0; older = error_handler; signum = setjmp(jmpbuf); @@ -149,7 +159,6 @@ static void call_check(struct afb_req req, const struct AFB_restapi *verb) break; } trapping_call(req, verb->callback); - if (verb->session == AFB_SESSION_CLOSE) afb_req_session_close(req); } @@ -167,8 +176,6 @@ static void call(struct api_so_desc *desc, struct afb_req req, const char *verb, 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; @@ -199,7 +206,8 @@ int afb_api_so_add_plugin(const char *path) /* init the interface */ desc->interface.verbosity = 0; desc->interface.mode = AFB_MODE_LOCAL; - desc->interface.poll_open = itf_poll_open; + desc->interface.daemon.itf = &daemon_itf; + desc->interface.daemon.closure = desc; /* init the plugin */ desc->plugin = pluginRegisterFct(&desc->interface); @@ -227,10 +235,10 @@ int afb_api_so_add_plugin(const char *path) } /* records the plugin */ + desc->apilength = strlen(desc->plugin->prefix); if (afb_apis_add(desc->plugin->prefix, (struct afb_api){ .closure = desc, - .call = (void*)call, - .free_context = (void*)free_context}) < 0) { + .call = (void*)call}) < 0) { fprintf(stderr, "ERROR: plugin [%s] can't be registered...\n", path); goto error3; } @@ -338,23 +346,3 @@ int afb_api_so_add_pathset(const char *pathset) }; } - - - - - - - - - - - - - - - - - - - -