X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=88246b58c33758d914e35c9d9ae32cf9b85511ae;hb=9e3afb8aa598f3e69e2c3723335507c12b4cd1f1;hp=093a8a93bc9e6524685e3d28a7cafe4530a00b9e;hpb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 093a8a93..88246b58 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -33,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"
@@ -41,17 +42,20 @@
 #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 = {
+static const struct afb_pollmgr_itf pollmgr_itf = {
 	.wait = (void*)upoll_wait,
 	.open = (void*)upoll_open,
 	.on_readable = (void*)upoll_on_readable,
@@ -60,20 +64,39 @@ static const struct afb_pollitf upollitf = {
 	.close = (void*)upoll_close
 };
 
-static void free_context(struct api_so_desc *desc, void *context)
+static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object)
 {
-	void (*cb)(void*);
+	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);
+}
 
-	cb = desc->plugin->freeCtxCB;
-	if (cb)
-		cb(context);
-	else
-		free(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)
+{
+	return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc };
+}
+
+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;
@@ -82,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);
@@ -137,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);
 }
@@ -155,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;
@@ -187,8 +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.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 +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;
 	}
@@ -327,23 +346,3 @@ int afb_api_so_add_pathset(const char *pathset)
 	};
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-