Switch to libsystemd events

[src/app-framework-binder.git] / src / afb-api-so.c

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 093a8a9..89418fb 100644 (file)
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -33,47 +33,58 @@
 
 #include "afb-plugin.h"
 #include "afb-req-itf.h"
-#include "afb-poll-itf.h"
+#include "afb-evmgr-itf.h"
 
 #include "session.h"
+#include "afb-common.h"
 #include "afb-apis.h"
 #include "afb-api-so.h"
 #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_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 afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object)
+{
+       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 const struct afb_evmgr_itf evmgr_itf = {
+       .push = (void*)afb_api_so_evmgr_push
 };
 
-static void free_context(struct api_so_desc *desc, void *context)
+static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc)
 {
-       void (*cb)(void*);
-
-       cb = desc->plugin->freeCtxCB;
-       if (cb)
-               cb(context);
-       else
-               free(context);
+       return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc };
 }
 
+static const struct afb_daemon_itf daemon_itf = {
+       .get_evmgr = (void*)afb_api_so_get_evmgr,
+       .get_event_loop = (void*)afb_common_get_event_loop,
+       .get_user_bus = (void*)afb_common_get_user_bus,
+       .get_system_bus = (void*)afb_common_get_system_bus
+};
+
 
-// 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;
@@ -82,7 +93,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);
@@ -137,7 +147,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);
 }
@@ -155,8 +164,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;
@@ -187,8 +194,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.pollitf = &upollitf;
-       desc->interface.pollclosure = NULL;
+       desc->interface.daemon.itf = &daemon_itf;
+       desc->interface.daemon.closure = desc;
 
        /* init the plugin */
        desc->plugin = pluginRegisterFct(&desc->interface);
@@ -216,10 +223,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;
        }
@@ -327,23 +334,3 @@ int afb_api_so_add_pathset(const char *pathset)
        };
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-