Provide conversions for afb_event and afb_req

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

diff --git a/src/afb-trace.c b/src/afb-trace.c
index 0de501a..4869d9a 100644 (file)
--- a/src/afb-trace.c
+++ b/src/afb-trace.c
@@ -27,7 +27,8 @@
 #include <pthread.h>
 
 #include <json-c/json.h>
-#include <afb/afb-binding-v2.h>
+#define AFB_BINDING_VERSION 0
+#include <afb/afb-binding.h>
 
 #include "afb-hook.h"
 #include "afb-cred.h"
@@ -71,7 +72,7 @@ struct tag {
 /* struct for events */
 struct event {
        struct event *next;             /* link to the next event */
-       struct afb_event event;         /* the event */
+       struct afb_evtid *evtid;                /* the event */
 };
 
 /* struct for sessions */
@@ -206,7 +207,7 @@ static void emit(void *closure, const struct afb_hookid *hookid, const char *typ
                                        type, data1,
                                        "data", data2);
 
-       afb_evt_unhooked_push(hook->event->event, data);
+       afb_evt_evtid_push(hook->event->evtid, data);
 }
 
 /*******************************************************************************/
@@ -361,21 +362,21 @@ static void hook_xreq_session_set_LOA(void *closure, const struct afb_hookid *ho
                                        "result", result);
 }
 
-static void hook_xreq_subscribe(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_subscribe(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_eventid *eventid, int result)
 {
        hook_xreq(closure, hookid, xreq, "subscribe", "{s{ss si} si}",
                                        "event",
-                                               "name", afb_evt_event_fullname(event),
-                                               "id", afb_evt_event_id(event),
+                                               "name", afb_evt_event_fullname(eventid),
+                                               "id", afb_evt_event_id(eventid),
                                        "result", result);
 }
 
-static void hook_xreq_unsubscribe(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_unsubscribe(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_eventid *eventid, int result)
 {
        hook_xreq(closure, hookid, xreq, "unsubscribe", "{s{ss? si} si}",
                                        "event",
-                                               "name", afb_evt_event_fullname(event),
-                                               "id", afb_evt_event_id(event),
+                                               "name", afb_evt_event_fullname(eventid),
+                                               "id", afb_evt_event_id(eventid),
                                        "result", result);
 }
 
@@ -611,7 +612,7 @@ static void hook_ditf_vverbose(void *closure, const struct afb_hookid *hookid, c
        free(msg);
 }
 
-static void hook_ditf_event_make(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, struct afb_event result)
+static void hook_ditf_event_make(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, struct afb_eventid *result)
 {
        hook_ditf(closure, hookid, export, "event_make", "{ss ss si}",
                        "name", name, "event", afb_evt_event_fullname(result), "id", afb_evt_event_id(result));
@@ -727,16 +728,16 @@ static void hook_svc_start_after(void *closure, const struct afb_hookid *hookid,
        hook_svc(closure, hookid, export, "start_after", "{si}", "result", status);
 }
 
-static void hook_svc_on_event_before(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int eventid, struct json_object *object)
+static void hook_svc_on_event_before(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int evtid, struct json_object *object)
 {
        hook_svc(closure, hookid, export, "on_event_before", "{ss si sO*}",
-                       "event", event, "id", eventid, "data", object);
+                       "event", event, "id", evtid, "data", object);
 }
 
-static void hook_svc_on_event_after(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int eventid, struct json_object *object)
+static void hook_svc_on_event_after(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int evtid, struct json_object *object)
 {
        hook_svc(closure, hookid, export, "on_event_after", "{ss si sO*}",
-                       "event", event, "id", eventid, "data", object);
+                       "event", event, "id", evtid, "data", object);
 }
 
 static void hook_svc_call(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
@@ -785,7 +786,6 @@ static struct flag evt_flags[] = { /* must be sorted by names */
                { "broadcast_before",   afb_hook_flag_evt_broadcast_before },
                { "common",             afb_hook_flags_evt_common },
                { "create",             afb_hook_flag_evt_create },
-               { "drop",               afb_hook_flag_evt_drop },
                { "extra",              afb_hook_flags_evt_extra },
                { "name",               afb_hook_flag_evt_name },
                { "push_after",         afb_hook_flag_evt_push_after },
@@ -842,11 +842,6 @@ static void hook_evt_name(void *closure, const struct afb_hookid *hookid, const
        hook_evt(closure, hookid, evt, id, "name", "{ss}", "result", result);
 }
 
-static void hook_evt_drop(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
-{
-       hook_evt(closure, hookid, evt, id, "drop", NULL);
-}
-
 static void hook_evt_addref(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
 {
        hook_evt(closure, hookid, evt, id, "addref", NULL);
@@ -864,7 +859,6 @@ static struct afb_hook_evt_itf hook_evt_itf = {
        .hook_evt_broadcast_before = hook_evt_broadcast_before,
        .hook_evt_broadcast_after = hook_evt_broadcast_after,
        .hook_evt_name = hook_evt_name,
-       .hook_evt_drop = hook_evt_drop,
        .hook_evt_addref = hook_evt_addref,
        .hook_evt_unref = hook_evt_unref
 };
@@ -1045,7 +1039,7 @@ static void trace_cleanup(struct afb_trace *trace)
                        pevent = &event->next;
                else {
                        *pevent = event->next;
-                       afb_event_drop(event->event);
+                       afb_evt_evtid_unref(event->evtid);
                        free(event);
                }
        }
@@ -1095,18 +1089,20 @@ static struct tag *trace_get_tag(struct afb_trace *trace, const char *name, int
  */
 static struct event *trace_get_event(struct afb_trace *trace, const char *name, int alloc)
 {
+       struct afb_event e;
        struct event *event;
 
        /* search the event */
        event = trace->events;
-       while (event && strcmp(afb_event_name(event->event), name))
+       while (event && strcmp(afb_evt_evtid_name(event->evtid), name))
                event = event->next;
 
        if (!event && alloc) {
                event = malloc(sizeof * event);
                if (event) {
-                       event->event = trace->daemon->itf->event_make(trace->daemon->closure, name);
-                       if (afb_event_is_valid(event->event)) {
+                       e = afb_daemon_make_event_v1(*trace->daemon, name);
+                       event->evtid = afb_evt_to_evtid(afb_event_to_eventid(e));
+                       if (event->evtid) {
                                event->next = trace->events;
                                trace->events = event;
                        } else {
@@ -1271,7 +1267,7 @@ static void addhook(struct desc *desc, enum trace_type type)
        }
 
        /* attach and activate the hook */
-       afb_req_subscribe(desc->context->req, hook->event->event);
+       afb_req_subscribe(desc->context->req, afb_event_from_evtid(hook->event->evtid));
        trace_attach_hook(trace, hook, type);
 }