X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-trace.c;h=fb077956445559cc2d4ff0604346a50ee9f84c00;hb=e4469a55553423344e8b6fe5251eeb58e7c3e9bd;hp=bf8db690c829eaf79d89c66f923815be6f8c5c4a;hpb=15d0dae1cd6ab982137a7c2848de9303a9c969f0;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-trace.c b/src/afb-trace.c
index bf8db690..fb077956 100644
--- 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 */
@@ -188,17 +189,17 @@ static const char *verbosity_level_name(int level)
 static void emit(void *closure, const struct afb_hookid *hookid, const char *type, const char *fmt1, const char *fmt2, va_list ap2, ...)
 {
 	struct hook *hook = closure;
-	struct json_object *event, *data1, *data2;
+	struct json_object *data, *data1, *data2;
 	va_list ap1;
 
-	data1 = data2 = event = NULL;
+	data1 = data2 = data = NULL;
 	va_start(ap1, ap2);
 	wrap_json_vpack(&data1, fmt1, ap1);
 	va_end(ap1);
 	if (fmt2)
 		wrap_json_vpack(&data2, fmt2, ap2);
 
-	wrap_json_pack(&event, "{so ss ss si so so*}",
+	wrap_json_pack(&data, "{so ss ss si so so*}",
 					"time", timestamp(hookid),
 					"tag", hook->tag->tag,
 					"type", type,
@@ -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, event);
+	afb_evt_evtid_push(hook->event->evtid, data);
 }
 
 /*******************************************************************************/
@@ -221,6 +222,7 @@ static struct flag xreq_flags[] = { /* must be sorted by names */
 		{ "common",		afb_hook_flags_req_common },
 		{ "context",		afb_hook_flags_req_context },
 		{ "context_get",	afb_hook_flag_req_context_get },
+		{ "context_make",	afb_hook_flag_req_context_make },
 		{ "context_set",	afb_hook_flag_req_context_set },
 		{ "end",		afb_hook_flag_req_end },
 		{ "event",		afb_hook_flags_req_event },
@@ -228,6 +230,7 @@ static struct flag xreq_flags[] = { /* must be sorted by names */
 		{ "fail",		afb_hook_flag_req_fail },
 		{ "get",		afb_hook_flag_req_get },
 		{ "get_application_id",	afb_hook_flag_req_get_application_id },
+		{ "get_uid",		afb_hook_flag_req_get_uid },
 		{ "has_permission",	afb_hook_flag_req_has_permission },
 		{ "json",		afb_hook_flag_req_json },
 		{ "life",		afb_hook_flags_req_life },
@@ -281,8 +284,8 @@ static void hook_xreq(void *closure, const struct afb_hookid *hookid, const stru
 	va_start(ap, format);
 	emit(closure, hookid, "request", "{si ss ss ss so* ss*}", format, ap,
 					"index", xreq->hookindex,
-					"api", xreq->api,
-					"verb", xreq->verb,
+					"api", xreq->request.api,
+					"verb", xreq->request.verb,
 					"action", action,
 					"credentials", cred,
 					"session", session);
@@ -360,21 +363,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_name(event),
-						"id", afb_evt_event_id(event),
+						"name", afb_evt_eventid_fullname(eventid),
+						"id", afb_evt_eventid_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_name(event),
-						"id", afb_evt_event_id(event),
+						"name", afb_evt_eventid_fullname(eventid),
+						"id", afb_evt_eventid_id(eventid),
 					"result", result);
 }
 
@@ -472,6 +475,27 @@ static void hook_xreq_get_application_id(void *closure, const struct afb_hookid
 					"result", result);
 }
 
+static void hook_xreq_context_make(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure, void *result)
+{
+	char pc[50], pf[50], pv[50], pr[50];
+	snprintf(pc, sizeof pc, "%p", create_value);
+	snprintf(pf, sizeof pf, "%p", free_value);
+	snprintf(pv, sizeof pv, "%p", create_closure);
+	snprintf(pr, sizeof pr, "%p", result);
+	hook_xreq(closure, hookid, xreq, "context_make", "{sb ss ss ss ss}",
+					"replace", replace,
+					"create", pc,
+					"free", pf,
+					"closure", pv,
+					"result", pr);
+}
+
+static void hook_xreq_get_uid(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, int result)
+{
+	hook_xreq(closure, hookid, xreq, "get_uid", "{si}",
+					"result", result);
+}
+
 static struct afb_hook_xreq_itf hook_xreq_itf = {
 	.hook_xreq_begin = hook_xreq_begin,
 	.hook_xreq_end = hook_xreq_end,
@@ -497,7 +521,9 @@ static struct afb_hook_xreq_itf hook_xreq_itf = {
 	.hook_xreq_subcall_req = hook_xreq_subcall_req,
 	.hook_xreq_subcall_req_result = hook_xreq_subcall_req_result,
 	.hook_xreq_has_permission = hook_xreq_has_permission,
-	.hook_xreq_get_application_id = hook_xreq_get_application_id
+	.hook_xreq_get_application_id = hook_xreq_get_application_id,
+	.hook_xreq_context_make = hook_xreq_context_make,
+	.hook_xreq_get_uid = hook_xreq_get_uid,
 };
 
 /*******************************************************************************/
@@ -594,10 +620,10 @@ 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_name(result), "id", afb_evt_event_id(result));
+			"name", name, "event", afb_evt_eventid_fullname(result), "id", afb_evt_eventid_id(result));
 }
 
 static void hook_ditf_rootdir_get_fd(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result)
@@ -710,16 +736,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)
@@ -762,16 +788,17 @@ static struct afb_hook_svc_itf hook_svc_itf = {
 /*******************************************************************************/
 
 static struct flag evt_flags[] = { /* must be sorted by names */
+		{ "addref",		afb_hook_flag_evt_addref },
 		{ "all",		afb_hook_flags_evt_all },
 		{ "broadcast_after",	afb_hook_flag_evt_broadcast_after },
 		{ "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 },
 		{ "push_before",	afb_hook_flag_evt_push_before },
+		{ "unref",		afb_hook_flag_evt_unref },
 };
 
 /* get the evt value for flag of 'name' */
@@ -818,14 +845,19 @@ static void hook_evt_broadcast_after(void *closure, const struct afb_hookid *hoo
 	hook_evt(closure, hookid, evt, id, "broadcast_after", "{sO* si}", "data", obj, "result", result);
 }
 
-static void hook_evt_name(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
+static void hook_evt_name(void *closure, const struct afb_hookid *hookid, const char *evt, int id, const char *result)
+{
+	hook_evt(closure, hookid, evt, id, "name", "{ss}", "result", result);
+}
+
+static void hook_evt_addref(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
 {
-	hook_evt(closure, hookid, evt, id, "name", NULL);
+	hook_evt(closure, hookid, evt, id, "addref", NULL);
 }
 
-static void hook_evt_drop(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
+static void hook_evt_unref(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
 {
-	hook_evt(closure, hookid, evt, id, "drop", NULL);
+	hook_evt(closure, hookid, evt, id, "unref", NULL);
 }
 
 static struct afb_hook_evt_itf hook_evt_itf = {
@@ -835,7 +867,8 @@ 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
 };
 
 /*******************************************************************************/
@@ -1014,7 +1047,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);
 		}
 	}
@@ -1064,18 +1097,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_eventid_to_evtid(afb_event_to_eventid(e));
+			if (event->evtid) {
 				event->next = trace->events;
 				trace->events = event;
 			} else {
@@ -1240,7 +1275,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_evt_event_from_evtid(hook->event->evtid));
 	trace_attach_hook(trace, hook, type);
 }