Events: refactoring

[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 abe100b..84f6975 100644 (file)
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -30,7 +30,7 @@
 
 #include <afb/afb-plugin.h>
 #include <afb/afb-req-itf.h>
-#include <afb/afb-event-sender-itf.h>
+#include <afb/afb-event-itf.h>
 
 #include "session.h"
 #include "afb-common.h"
@@ -38,6 +38,7 @@
 #include "afb-apis.h"
 #include "afb-api-so.h"
 #include "afb-sig-handler.h"
+#include "afb-evt.h"
 #include "verbose.h"
 
 /*
@@ -54,27 +55,42 @@ static int api_timeout = 15;
 
 static const char plugin_register_function_v1[] = "pluginAfbV1Register";
 
-static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object)
+void afb_api_so_set_timeout(int to)
+{
+       api_timeout = to;
+}
+
+static struct afb_event afb_api_so_event_make(struct api_so_desc *desc, const char *name)
 {
        size_t length;
        char *event;
 
+       /* makes the event name */
        assert(desc->plugin != NULL);
        length = strlen(name);
        event = alloca(length + 2 + desc->apilength);
        memcpy(event, desc->plugin->v1.prefix, desc->apilength);
        event[desc->apilength] = '/';
        memcpy(event + desc->apilength + 1, name, length + 1);
-       ctxClientEventSend(NULL, event, object);
-}
 
-static const struct afb_event_sender_itf event_sender_itf = {
-       .push = (void*)afb_api_so_event_sender_push
-};
+       /* crate the event */
+       return afb_evt_create_event(event);
+}
 
-static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *desc)
+static int afb_api_so_event_broadcast(struct api_so_desc *desc, const char *name, struct json_object *object)
 {
-       return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc };
+       size_t length;
+       char *event;
+
+       /* makes the event name */
+       assert(desc->plugin != NULL);
+       length = strlen(name);
+       event = alloca(length + 2 + desc->apilength);
+       memcpy(event, desc->plugin->v1.prefix, desc->apilength);
+       event[desc->apilength] = '/';
+       memcpy(event + desc->apilength + 1, name, length + 1);
+
+       return afb_evt_broadcast(event, object);
 }
 
 static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char *file, int line, const char *fmt, va_list args)
@@ -90,11 +106,12 @@ static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char
 }
 
 static const struct afb_daemon_itf daemon_itf = {
-       .get_event_sender = (void*)afb_api_so_get_event_sender,
+       .event_broadcast = (void*)afb_api_so_event_broadcast,
        .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,
-       .vverbose = (void*)afb_api_so_vverbose
+       .vverbose = (void*)afb_api_so_vverbose,
+       .event_make = (void*)afb_api_so_event_make
 };
 
 struct monitoring {