diff options
author | José Bollo <jose.bollo@iot.bzh> | 2016-06-09 07:54:31 +0200 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2016-06-09 08:39:02 +0200 |
commit | 7e0abe76db7b90369429bf387d7aad0fb5a42328 (patch) | |
tree | eedf5609a588f0d9d743fb941bc8727ff1356b21 /src/afb-api-so.c | |
parent | c37c8e6291c36665dd23601a8ce1449afd43e6df (diff) |
Events: refactoring
This new version allows to subscribe a client for
an event.
The event should first be created for the API
(the API's prefix is added) using 'afb_daemon_make_event'.
After that, plugins can subscribe or unsubscribe their
clients (identified through requests) to the events that
it generates. See 'afb_req_subscribe' and 'afb_req_unsubscribe'.
Events created by 'afb_daemon_make_event' can be widely
broadcasted using 'afb_event_broadcast' or pushed only to
suscribers using 'afb_event_push'.
Events can be destroyed using 'afb_event_drop'.
Change-Id: I7c0bed5e625c2052dcd81c6bfe960def1fa032f3
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-api-so.c')
-rw-r--r-- | src/afb-api-so.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/afb-api-so.c b/src/afb-api-so.c index b741b13a..84f69753 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -30,6 +30,7 @@ #include <afb/afb-plugin.h> #include <afb/afb-req-itf.h> +#include <afb/afb-event-itf.h> #include "session.h" #include "afb-common.h" @@ -37,6 +38,7 @@ #include "afb-apis.h" #include "afb-api-so.h" #include "afb-sig-handler.h" +#include "afb-evt.h" #include "verbose.h" /* @@ -58,18 +60,37 @@ 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); + + /* crate the event */ + return afb_evt_create_event(event); +} + static int afb_api_so_event_broadcast(struct api_so_desc *desc, const char *name, struct json_object *object) { 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 ctxClientEventSend(NULL, event, object); + + 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) @@ -89,7 +110,8 @@ static const struct afb_daemon_itf daemon_itf = { .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 { |