hook+trace: adds hookid and type

The hookid is a unic identifier for a hook event.
Its purpose is to distinguish events that could match
different filters: a same event has a same id.

Also integrate the field "type" (of the event) in the
trace event.

Change-Id: I90b0b2d3a0846b673b993110d2752cc54db75bd8
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

4 files changed, 236 insertions, 219 deletions

diff --git a/src/afb-hook.c b/src/afb-hook.c
index 05b04aec..daff851c 100644
--- a/src/afb-hook.c
+++ b/src/afb-hook.c
@@ -105,6 +105,17 @@ static struct afb_hook_svc *list_of_svc_hooks = NULL;
 /* list of hooks for evt */
 static struct afb_hook_evt *list_of_evt_hooks = NULL;
 
+/* hook id */
+static unsigned next_hookid = 0;
+
+/******************************************************************************
+ * section: hook id
+ *****************************************************************************/
+static inline unsigned new_hookid()
+{
+	return __atomic_add_fetch(&next_hookid, 1, __ATOMIC_RELAXED);
+}
+
 /******************************************************************************
  * section: default callbacks for tracing requests
  *****************************************************************************/
@@ -153,7 +164,7 @@ static void _hook_xreq_(const struct afb_xreq *xreq, const char *format, ...)
 	va_end(ap);
 }
 
-static void hook_xreq_begin_default_cb(void * closure, const struct afb_xreq *xreq)
+static void hook_xreq_begin_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
 	if (!xreq->cred)
 		_hook_xreq_(xreq, "BEGIN");
@@ -168,92 +179,92 @@ static void hook_xreq_begin_default_cb(void * closure, const struct afb_xreq *xr
 		);
 }
 
-static void hook_xreq_end_default_cb(void * closure, const struct afb_xreq *xreq)
+static void hook_xreq_end_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
 	_hook_xreq_(xreq, "END");
 }
 
-static void hook_xreq_json_default_cb(void * closure, const struct afb_xreq *xreq, struct json_object *obj)
+static void hook_xreq_json_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct json_object *obj)
 {
 	_hook_xreq_(xreq, "json() -> %s", json_object_to_json_string(obj));
 }
 
-static void hook_xreq_get_default_cb(void * closure, const struct afb_xreq *xreq, const char *name, struct afb_arg arg)
+static void hook_xreq_get_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *name, struct afb_arg arg)
 {
 	_hook_xreq_(xreq, "get(%s) -> { name: %s, value: %s, path: %s }", name, arg.name, arg.value, arg.path);
 }
 
-static void hook_xreq_success_default_cb(void * closure, const struct afb_xreq *xreq, struct json_object *obj, const char *info)
+static void hook_xreq_success_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct json_object *obj, const char *info)
 {
 	_hook_xreq_(xreq, "success(%s, %s)", json_object_to_json_string(obj), info);
 }
 
-static void hook_xreq_fail_default_cb(void * closure, const struct afb_xreq *xreq, const char *status, const char *info)
+static void hook_xreq_fail_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *status, const char *info)
 {
 	_hook_xreq_(xreq, "fail(%s, %s)", status, info);
 }
 
-static void hook_xreq_context_get_default_cb(void * closure, const struct afb_xreq *xreq, void *value)
+static void hook_xreq_context_get_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, void *value)
 {
 	_hook_xreq_(xreq, "context_get() -> %p", value);
 }
 
-static void hook_xreq_context_set_default_cb(void * closure, const struct afb_xreq *xreq, void *value, void (*free_value)(void*))
+static void hook_xreq_context_set_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, void *value, void (*free_value)(void*))
 {
 	_hook_xreq_(xreq, "context_set(%p, %p)", value, free_value);
 }
 
-static void hook_xreq_addref_default_cb(void * closure, const struct afb_xreq *xreq)
+static void hook_xreq_addref_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
 	_hook_xreq_(xreq, "addref()");
 }
 
-static void hook_xreq_unref_default_cb(void * closure, const struct afb_xreq *xreq)
+static void hook_xreq_unref_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
 	_hook_xreq_(xreq, "unref()");
 }
 
-static void hook_xreq_session_close_default_cb(void * closure, const struct afb_xreq *xreq)
+static void hook_xreq_session_close_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
 	_hook_xreq_(xreq, "session_close()");
 }
 
-static void hook_xreq_session_set_LOA_default_cb(void * closure, const struct afb_xreq *xreq, unsigned level, int result)
+static void hook_xreq_session_set_LOA_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, unsigned level, int result)
 {
 	_hook_xreq_(xreq, "session_set_LOA(%u) -> %d", level, result);
 }
 
-static void hook_xreq_subscribe_default_cb(void * closure, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_subscribe_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
 {
 	_hook_xreq_(xreq, "subscribe(%s:%d) -> %d", afb_evt_event_name(event), afb_evt_event_id(event), result);
 }
 
-static void hook_xreq_unsubscribe_default_cb(void * closure, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_unsubscribe_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
 {
 	_hook_xreq_(xreq, "unsubscribe(%s:%d) -> %d", afb_evt_event_name(event), afb_evt_event_id(event), result);
 }
 
-static void hook_xreq_subcall_default_cb(void * closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+static void hook_xreq_subcall_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
 {
 	_hook_xreq_(xreq, "subcall(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static void hook_xreq_subcall_result_default_cb(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result)
+static void hook_xreq_subcall_result_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result)
 {
 	_hook_xreq_(xreq, "    ...subcall... -> %d: %s", status, json_object_to_json_string(result));
 }
 
-static void hook_xreq_subcallsync_default_cb(void * closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+static void hook_xreq_subcallsync_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
 {
 	_hook_xreq_(xreq, "subcallsync(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static void hook_xreq_subcallsync_result_default_cb(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result)
+static void hook_xreq_subcallsync_result_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result)
 {
 	_hook_xreq_(xreq, "    ...subcallsync... -> %d: %s", status, json_object_to_json_string(result));
 }
 
-static void hook_xreq_vverbose_default_cb(void * closure, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+static void hook_xreq_vverbose_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
 {
 	int len;
 	char *msg;
@@ -271,22 +282,22 @@ static void hook_xreq_vverbose_default_cb(void * closure, const struct afb_xreq
 	}
 }
 
-static void hook_xreq_store_default_cb(void * closure, const struct afb_xreq *xreq, struct afb_stored_req *sreq)
+static void hook_xreq_store_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_stored_req *sreq)
 {
 	_hook_xreq_(xreq, "store() -> %p", sreq);
 }
 
-static void hook_xreq_unstore_default_cb(void * closure, const struct afb_xreq *xreq)
+static void hook_xreq_unstore_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
 	_hook_xreq_(xreq, "unstore()");
 }
 
-static void hook_xreq_subcall_req_default_cb(void * closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+static void hook_xreq_subcall_req_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
 {
 	_hook_xreq_(xreq, "subcall_req(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static void hook_xreq_subcall_req_result_default_cb(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result)
+static void hook_xreq_subcall_req_result_default_cb(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result)
 {
 	_hook_xreq_(xreq, "    ...subcall_req... -> %d: %s", status, json_object_to_json_string(result));
 }
@@ -323,6 +334,7 @@ static struct afb_hook_xreq_itf hook_xreq_default_itf = {
 
 #define _HOOK_XREQ_(what,...)   \
 	struct afb_hook_xreq *hook; \
+	unsigned hookid = new_hookid(); \
 	pthread_rwlock_rdlock(&rwlock); \
 	hook = list_of_xreq_hooks; \
 	while (hook) { \
@@ -331,7 +343,7 @@ static struct afb_hook_xreq_itf hook_xreq_default_itf = {
 		 && (!hook->session || hook->session == xreq->context.session) \
 		 && (!hook->api || !strcasecmp(hook->api, xreq->api)) \
 		 && (!hook->verb || !strcasecmp(hook->verb, xreq->verb))) { \
-			hook->itf->hook_xreq_##what(hook->closure, __VA_ARGS__); \
+			hook->itf->hook_xreq_##what(hook->closure, hookid, __VA_ARGS__); \
 		} \
 		hook = hook->next; \
 	} \
@@ -585,32 +597,32 @@ static void _hook_ditf_(const struct afb_ditf *ditf, const char *format, ...)
 	va_end(ap);
 }
 
-static void hook_ditf_event_broadcast_before_cb(void *closure, const struct afb_ditf *ditf, const char *name, struct json_object *object)
+static void hook_ditf_event_broadcast_before_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct json_object *object)
 {
 	_hook_ditf_(ditf, "event_broadcast.before(%s, %s)....", name, json_object_to_json_string(object));
 }
 
-static void hook_ditf_event_broadcast_after_cb(void *closure, const struct afb_ditf *ditf, const char *name, struct json_object *object, int result)
+static void hook_ditf_event_broadcast_after_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct json_object *object, int result)
 {
 	_hook_ditf_(ditf, "event_broadcast.after(%s, %s) -> %d", name, json_object_to_json_string(object), result);
 }
 
-static void hook_ditf_get_event_loop_cb(void *closure, const struct afb_ditf *ditf, struct sd_event *result)
+static void hook_ditf_get_event_loop_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_event *result)
 {
 	_hook_ditf_(ditf, "get_event_loop() -> %p", result);
 }
 
-static void hook_ditf_get_user_bus_cb(void *closure, const struct afb_ditf *ditf, struct sd_bus *result)
+static void hook_ditf_get_user_bus_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_bus *result)
 {
 	_hook_ditf_(ditf, "get_user_bus() -> %p", result);
 }
 
-static void hook_ditf_get_system_bus_cb(void *closure, const struct afb_ditf *ditf, struct sd_bus *result)
+static void hook_ditf_get_system_bus_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_bus *result)
 {
 	_hook_ditf_(ditf, "get_system_bus() -> %p", result);
 }
 
-static void hook_ditf_vverbose_cb(void*closure, const struct afb_ditf *ditf, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
+static void hook_ditf_vverbose_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
 {
 	int len;
 	char *msg;
@@ -628,12 +640,12 @@ static void hook_ditf_vverbose_cb(void*closure, const struct afb_ditf *ditf, int
 	}
 }
 
-static void hook_ditf_event_make_cb(void *closure, const struct afb_ditf *ditf, const char *name, struct afb_event result)
+static void hook_ditf_event_make_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct afb_event result)
 {
 	_hook_ditf_(ditf, "event_make(%s) -> %s:%d", name, afb_evt_event_name(result), afb_evt_event_id(result));
 }
 
-static void hook_ditf_rootdir_get_fd_cb(void *closure, const struct afb_ditf *ditf, int result)
+static void hook_ditf_rootdir_get_fd_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, int result)
 {
 	char path[PATH_MAX];
 	if (result < 0)
@@ -645,7 +657,7 @@ static void hook_ditf_rootdir_get_fd_cb(void *closure, const struct afb_ditf *di
 	}
 }
 
-static void hook_ditf_rootdir_open_locale_cb(void *closure, const struct afb_ditf *ditf, const char *filename, int flags, const char *locale, int result)
+static void hook_ditf_rootdir_open_locale_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *filename, int flags, const char *locale, int result)
 {
 	char path[PATH_MAX];
 	if (!locale)
@@ -659,22 +671,22 @@ static void hook_ditf_rootdir_open_locale_cb(void *closure, const struct afb_dit
 	}
 }
 
-static void hook_ditf_queue_job_cb(void *closure, const struct afb_ditf *ditf, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result)
+static void hook_ditf_queue_job_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result)
 {
 	_hook_ditf_(ditf, "queue_job(%p, %p, %p, %d) -> %d", callback, argument, group, timeout, result);
 }
 
-static void hook_ditf_unstore_req_cb(void * closure,  const struct afb_ditf *ditf, struct afb_stored_req *sreq)
+static void hook_ditf_unstore_req_cb(void *closure, unsigned hookid,  const struct afb_ditf *ditf, struct afb_stored_req *sreq)
 {
 	_hook_ditf_(ditf, "unstore_req(%p)", sreq);
 }
 
-static void hook_ditf_require_api_cb(void *closure, const struct afb_ditf *ditf, const char *name, int initialized)
+static void hook_ditf_require_api_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, int initialized)
 {
 	_hook_ditf_(ditf, "require_api(%s, %d)...", name, initialized);
 }
 
-static void hook_ditf_require_api_result_cb(void *closure, const struct afb_ditf *ditf, const char *name, int initialized, int result)
+static void hook_ditf_require_api_result_cb(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, int initialized, int result)
 {
 	_hook_ditf_(ditf, "...require_api(%s, %d) -> %d", name, initialized, result);
 }
@@ -701,13 +713,14 @@ static struct afb_hook_ditf_itf hook_ditf_default_itf = {
 
 #define _HOOK_DITF_(what,...)   \
 	struct afb_hook_ditf *hook; \
+	unsigned hookid = new_hookid(); \
 	pthread_rwlock_rdlock(&rwlock); \
 	hook = list_of_ditf_hooks; \
 	while (hook) { \
 		if (hook->itf->hook_ditf_##what \
 		 && (hook->flags & afb_hook_flag_ditf_##what) != 0 \
 		 && (!hook->api || !strcasecmp(hook->api, ditf->api))) { \
-			hook->itf->hook_ditf_##what(hook->closure, __VA_ARGS__); \
+			hook->itf->hook_ditf_##what(hook->closure, hookid, __VA_ARGS__); \
 		} \
 		hook = hook->next; \
 	} \
@@ -885,42 +898,42 @@ static void _hook_svc_(const struct afb_svc *svc, const char *format, ...)
 	va_end(ap);
 }
 
-static void hook_svc_start_before_default_cb(void *closure, const struct afb_svc *svc)
+static void hook_svc_start_before_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc)
 {
 	_hook_svc_(svc, "start.before");
 }
 
-static void hook_svc_start_after_default_cb(void *closure, const struct afb_svc *svc, int status)
+static void hook_svc_start_after_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc, int status)
 {
 	_hook_svc_(svc, "start.after -> %d", status);
 }
 
-static void hook_svc_on_event_before_default_cb(void *closure, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
+static void hook_svc_on_event_before_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
 {
 	_hook_svc_(svc, "on_event.before(%s, %d, %s)", event, eventid, json_object_to_json_string(object));
 }
 
-static void hook_svc_on_event_after_default_cb(void *closure, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
+static void hook_svc_on_event_after_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
 {
 	_hook_svc_(svc, "on_event.after(%s, %d, %s)", event, eventid, json_object_to_json_string(object));
 }
 
-static void hook_svc_call_default_cb(void *closure, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
+static void hook_svc_call_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
 {
 	_hook_svc_(svc, "call(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static void hook_svc_call_result_default_cb(void *closure, const struct afb_svc *svc, int status, struct json_object *result)
+static void hook_svc_call_result_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc, int status, struct json_object *result)
 {
 	_hook_svc_(svc, "    ...call... -> %d: %s", status, json_object_to_json_string(result));
 }
 
-static void hook_svc_callsync_default_cb(void *closure, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
+static void hook_svc_callsync_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
 {
 	_hook_svc_(svc, "callsync(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static void hook_svc_callsync_result_default_cb(void *closure, const struct afb_svc *svc, int status, struct json_object *result)
+static void hook_svc_callsync_result_default_cb(void *closure, unsigned hookid, const struct afb_svc *svc, int status, struct json_object *result)
 {
 	_hook_svc_(svc, "    ...callsync... -> %d: %s", status, json_object_to_json_string(result));
 }
@@ -942,13 +955,14 @@ static struct afb_hook_svc_itf hook_svc_default_itf = {
 
 #define _HOOK_SVC_(what,...)   \
 	struct afb_hook_svc *hook; \
+	unsigned hookid = new_hookid(); \
 	pthread_rwlock_rdlock(&rwlock); \
 	hook = list_of_svc_hooks; \
 	while (hook) { \
 		if (hook->itf->hook_svc_##what \
 		 && (hook->flags & afb_hook_flag_svc_##what) != 0 \
 		 && (!hook->api || !strcasecmp(hook->api, svc->api))) { \
-			hook->itf->hook_svc_##what(hook->closure, __VA_ARGS__); \
+			hook->itf->hook_svc_##what(hook->closure, hookid, __VA_ARGS__); \
 		} \
 		hook = hook->next; \
 	} \
@@ -1094,38 +1108,38 @@ static void _hook_evt_(const char *evt, int id, const char *format, ...)
 	va_end(ap);
 }
 
-static void hook_evt_create_default_cb(void *closure, const char *evt, int id)
+static void hook_evt_create_default_cb(void *closure, unsigned hookid, const char *evt, int id)
 {
 	_hook_evt_(evt, id, "create");
 }
 
-static void hook_evt_push_before_default_cb(void *closure, const char *evt, int id, struct json_object *obj)
+static void hook_evt_push_before_default_cb(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj)
 {
 	_hook_evt_(evt, id, "push.before(%s)", json_object_to_json_string(obj));
 }
 
 
-static void hook_evt_push_after_default_cb(void *closure, const char *evt, int id, struct json_object *obj, int result)
+static void hook_evt_push_after_default_cb(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj, int result)
 {
 	_hook_evt_(evt, id, "push.after(%s) -> %d", json_object_to_json_string(obj), result);
 }
 
-static void hook_evt_broadcast_before_default_cb(void *closure, const char *evt, int id, struct json_object *obj)
+static void hook_evt_broadcast_before_default_cb(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj)
 {
 	_hook_evt_(evt, id, "broadcast.before(%s)", json_object_to_json_string(obj));
 }
 
-static void hook_evt_broadcast_after_default_cb(void *closure, const char *evt, int id, struct json_object *obj, int result)
+static void hook_evt_broadcast_after_default_cb(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj, int result)
 {
 	_hook_evt_(evt, id, "broadcast.after(%s) -> %d", json_object_to_json_string(obj), result);
 }
 
-static void hook_evt_name_default_cb(void *closure, const char *evt, int id)
+static void hook_evt_name_default_cb(void *closure, unsigned hookid, const char *evt, int id)
 {
 	_hook_evt_(evt, id, "name");
 }
 
-static void hook_evt_drop_default_cb(void *closure, const char *evt, int id)
+static void hook_evt_drop_default_cb(void *closure, unsigned hookid, const char *evt, int id)
 {
 	_hook_evt_(evt, id, "drop");
 }
@@ -1146,13 +1160,14 @@ static struct afb_hook_evt_itf hook_evt_default_itf = {
 
 #define _HOOK_EVT_(what,...)   \
 	struct afb_hook_evt *hook; \
+	unsigned hookid = new_hookid(); \
 	pthread_rwlock_rdlock(&rwlock); \
 	hook = list_of_evt_hooks; \
 	while (hook) { \
 		if (hook->itf->hook_evt_##what \
 		 && (hook->flags & afb_hook_flag_evt_##what) != 0 \
 		 && (!hook->pattern || !fnmatch(hook->pattern, evt, FNM_CASEFOLD))) { \
-			hook->itf->hook_evt_##what(hook->closure, __VA_ARGS__); \
+			hook->itf->hook_evt_##what(hook->closure, hookid, __VA_ARGS__); \
 		} \
 		hook = hook->next; \
 	} \
diff --git a/src/afb-hook.h b/src/afb-hook.h
index 1cf73488..4e3d6140 100644
--- a/src/afb-hook.h
+++ b/src/afb-hook.h
@@ -86,29 +86,29 @@ struct afb_hook_xreq;
 #define afb_hook_flags_req_all		(afb_hook_flags_req_extra)
 
 struct afb_hook_xreq_itf {
-	void (*hook_xreq_begin)(void * closure, const struct afb_xreq *xreq);
-	void (*hook_xreq_end)(void * closure, const struct afb_xreq *xreq);
-	void (*hook_xreq_json)(void * closure, const struct afb_xreq *xreq, struct json_object *obj);
-	void (*hook_xreq_get)(void * closure, const struct afb_xreq *xreq, const char *name, struct afb_arg arg);
-	void (*hook_xreq_success)(void * closure, const struct afb_xreq *xreq, struct json_object *obj, const char *info);
-	void (*hook_xreq_fail)(void * closure, const struct afb_xreq *xreq, const char *status, const char *info);
-	void (*hook_xreq_context_get)(void * closure, const struct afb_xreq *xreq, void *value);
-	void (*hook_xreq_context_set)(void * closure, const struct afb_xreq *xreq, void *value, void (*free_value)(void*));
-	void (*hook_xreq_addref)(void * closure, const struct afb_xreq *xreq);
-	void (*hook_xreq_unref)(void * closure, const struct afb_xreq *xreq);
-	void (*hook_xreq_session_close)(void * closure, const struct afb_xreq *xreq);
-	void (*hook_xreq_session_set_LOA)(void * closure, const struct afb_xreq *xreq, unsigned level, int result);
-	void (*hook_xreq_subscribe)(void * closure, const struct afb_xreq *xreq, struct afb_event event, int result);
-	void (*hook_xreq_unsubscribe)(void * closure, const struct afb_xreq *xreq, struct afb_event event, int result);
-	void (*hook_xreq_subcall)(void * closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
-	void (*hook_xreq_subcall_result)(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result);
-	void (*hook_xreq_subcallsync)(void * closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
-	void (*hook_xreq_subcallsync_result)(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result);
-	void (*hook_xreq_vverbose)(void * closure, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args);
-	void (*hook_xreq_store)(void * closure, const struct afb_xreq *xreq, struct afb_stored_req *sreq);
-	void (*hook_xreq_unstore)(void * closure, const struct afb_xreq *xreq);
-	void (*hook_xreq_subcall_req)(void * closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
-	void (*hook_xreq_subcall_req_result)(void * closure, const struct afb_xreq *xreq, int status, struct json_object *result);
+	void (*hook_xreq_begin)(void *closure, unsigned hookid, const struct afb_xreq *xreq);
+	void (*hook_xreq_end)(void *closure, unsigned hookid, const struct afb_xreq *xreq);
+	void (*hook_xreq_json)(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct json_object *obj);
+	void (*hook_xreq_get)(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *name, struct afb_arg arg);
+	void (*hook_xreq_success)(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct json_object *obj, const char *info);
+	void (*hook_xreq_fail)(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *status, const char *info);
+	void (*hook_xreq_context_get)(void *closure, unsigned hookid, const struct afb_xreq *xreq, void *value);
+	void (*hook_xreq_context_set)(void *closure, unsigned hookid, const struct afb_xreq *xreq, void *value, void (*free_value)(void*));
+	void (*hook_xreq_addref)(void *closure, unsigned hookid, const struct afb_xreq *xreq);
+	void (*hook_xreq_unref)(void *closure, unsigned hookid, const struct afb_xreq *xreq);
+	void (*hook_xreq_session_close)(void *closure, unsigned hookid, const struct afb_xreq *xreq);
+	void (*hook_xreq_session_set_LOA)(void *closure, unsigned hookid, const struct afb_xreq *xreq, unsigned level, int result);
+	void (*hook_xreq_subscribe)(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_event event, int result);
+	void (*hook_xreq_unsubscribe)(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_event event, int result);
+	void (*hook_xreq_subcall)(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
+	void (*hook_xreq_subcall_result)(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result);
+	void (*hook_xreq_subcallsync)(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
+	void (*hook_xreq_subcallsync_result)(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result);
+	void (*hook_xreq_vverbose)(void *closure, unsigned hookid, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args);
+	void (*hook_xreq_store)(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_stored_req *sreq);
+	void (*hook_xreq_unstore)(void *closure, unsigned hookid, const struct afb_xreq *xreq);
+	void (*hook_xreq_subcall_req)(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args);
+	void (*hook_xreq_subcall_req_result)(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result);
 };
 
 extern void afb_hook_init_xreq(struct afb_xreq *xreq);
@@ -177,19 +177,19 @@ extern void afb_hook_xreq_subcall_req_result(const struct afb_xreq *xreq, int st
 #define afb_hook_flags_ditf_all		(afb_hook_flags_ditf_common|afb_hook_flags_ditf_extra)
 
 struct afb_hook_ditf_itf {
-	void (*hook_ditf_event_broadcast_before)(void *closure, const struct afb_ditf *ditf, const char *name, struct json_object *object);
-	void (*hook_ditf_event_broadcast_after)(void *closure, const struct afb_ditf *ditf, const char *name, struct json_object *object, int result);
-	void (*hook_ditf_get_event_loop)(void *closure, const struct afb_ditf *ditf, struct sd_event *result);
-	void (*hook_ditf_get_user_bus)(void *closure, const struct afb_ditf *ditf, struct sd_bus *result);
-	void (*hook_ditf_get_system_bus)(void *closure, const struct afb_ditf *ditf, struct sd_bus *result);
-	void (*hook_ditf_vverbose)(void*closure, const struct afb_ditf *ditf, int level, const char *file, int line, const char *function, const char *fmt, va_list args);
-	void (*hook_ditf_event_make)(void *closure, const struct afb_ditf *ditf, const char *name, struct afb_event result);
-	void (*hook_ditf_rootdir_get_fd)(void *closure, const struct afb_ditf *ditf, int result);
-	void (*hook_ditf_rootdir_open_locale)(void *closure, const struct afb_ditf *ditf, const char *filename, int flags, const char *locale, int result);
-	void (*hook_ditf_queue_job)(void *closure, const struct afb_ditf *ditf, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result);
-	void (*hook_ditf_unstore_req)(void *closure, const struct afb_ditf *ditf, struct afb_stored_req *sreq);
-	void (*hook_ditf_require_api)(void *closure, const struct afb_ditf *ditf, const char *name, int initialized);
-	void (*hook_ditf_require_api_result)(void *closure, const struct afb_ditf *ditf, const char *name, int initialized, int result);
+	void (*hook_ditf_event_broadcast_before)(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct json_object *object);
+	void (*hook_ditf_event_broadcast_after)(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct json_object *object, int result);
+	void (*hook_ditf_get_event_loop)(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_event *result);
+	void (*hook_ditf_get_user_bus)(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_bus *result);
+	void (*hook_ditf_get_system_bus)(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_bus *result);
+	void (*hook_ditf_vverbose)(void *closure, unsigned hookid, const struct afb_ditf *ditf, int level, const char *file, int line, const char *function, const char *fmt, va_list args);
+	void (*hook_ditf_event_make)(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct afb_event result);
+	void (*hook_ditf_rootdir_get_fd)(void *closure, unsigned hookid, const struct afb_ditf *ditf, int result);
+	void (*hook_ditf_rootdir_open_locale)(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *filename, int flags, const char *locale, int result);
+	void (*hook_ditf_queue_job)(void *closure, unsigned hookid, const struct afb_ditf *ditf, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result);
+	void (*hook_ditf_unstore_req)(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct afb_stored_req *sreq);
+	void (*hook_ditf_require_api)(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, int initialized);
+	void (*hook_ditf_require_api_result)(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, int initialized, int result);
 };
 
 extern void afb_hook_ditf_event_broadcast_before(const struct afb_ditf *ditf, const char *name, struct json_object *object);
@@ -230,14 +230,14 @@ extern void afb_hook_unref_ditf(struct afb_hook_ditf *hook);
 					|afb_hook_flag_svc_callsync|afb_hook_flag_svc_callsync_result)
 
 struct afb_hook_svc_itf {
-	void (*hook_svc_start_before)(void *closure, const struct afb_svc *svc);
-	void (*hook_svc_start_after)(void *closure, const struct afb_svc *svc, int status);
-	void (*hook_svc_on_event_before)(void *closure, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object);
-	void (*hook_svc_on_event_after)(void *closure, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object);
-	void (*hook_svc_call)(void *closure, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args);
-	void (*hook_svc_call_result)(void *closure, const struct afb_svc *svc, int status, struct json_object *result);
-	void (*hook_svc_callsync)(void *closure, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args);
-	void (*hook_svc_callsync_result)(void *closure, const struct afb_svc *svc, int status, struct json_object *result);
+	void (*hook_svc_start_before)(void *closure, unsigned hookid, const struct afb_svc *svc);
+	void (*hook_svc_start_after)(void *closure, unsigned hookid, const struct afb_svc *svc, int status);
+	void (*hook_svc_on_event_before)(void *closure, unsigned hookid, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object);
+	void (*hook_svc_on_event_after)(void *closure, unsigned hookid, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object);
+	void (*hook_svc_call)(void *closure, unsigned hookid, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args);
+	void (*hook_svc_call_result)(void *closure, unsigned hookid, const struct afb_svc *svc, int status, struct json_object *result);
+	void (*hook_svc_callsync)(void *closure, unsigned hookid, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args);
+	void (*hook_svc_callsync_result)(void *closure, unsigned hookid, const struct afb_svc *svc, int status, struct json_object *result);
 };
 
 extern void afb_hook_svc_start_before(const struct afb_svc *svc);
@@ -273,13 +273,13 @@ extern void afb_hook_unref_svc(struct afb_hook_svc *hook);
 #define afb_hook_flags_evt_all		(afb_hook_flags_evt_extra|afb_hook_flag_evt_name)
 
 struct afb_hook_evt_itf {
-	void (*hook_evt_create)(void *closure, const char *evt, int id);
-	void (*hook_evt_push_before)(void *closure, const char *evt, int id, struct json_object *obj);
-	void (*hook_evt_push_after)(void *closure, const char *evt, int id, struct json_object *obj, int result);
-	void (*hook_evt_broadcast_before)(void *closure, const char *evt, int id, struct json_object *obj);
-	void (*hook_evt_broadcast_after)(void *closure, const char *evt, int id, struct json_object *obj, int result);
-	void (*hook_evt_name)(void *closure, const char *evt, int id);
-	void (*hook_evt_drop)(void *closure, const char *evt, int id);
+	void (*hook_evt_create)(void *closure, unsigned hookid, const char *evt, int id);
+	void (*hook_evt_push_before)(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj);
+	void (*hook_evt_push_after)(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj, int result);
+	void (*hook_evt_broadcast_before)(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj);
+	void (*hook_evt_broadcast_after)(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj, int result);
+	void (*hook_evt_name)(void *closure, unsigned hookid, const char *evt, int id);
+	void (*hook_evt_drop)(void *closure, unsigned hookid, const char *evt, int id);
 };
 
 extern void afb_hook_evt_create(const char *evt, int id);
diff --git a/src/afb-trace.c b/src/afb-trace.c
index d971d871..5d58b2dd 100644
--- a/src/afb-trace.c
+++ b/src/afb-trace.c
@@ -188,7 +188,7 @@ static const char *verbosity_level_name(int level)
 }
 
 /* generic hook */
-static void emit(void *closure, const char *type, const char *fmt1, const char *fmt2, va_list ap2, ...)
+static void emit(void *closure, unsigned hookid, const char *type, const char *fmt1, const char *fmt2, va_list ap2, ...)
 {
 	struct hook *hook = closure;
 	struct json_object *event, *data1, *data2;
@@ -201,9 +201,11 @@ static void emit(void *closure, const char *type, const char *fmt1, const char *
 	if (fmt2)
 		wrap_json_vpack(&data2, fmt2, ap2);
 
-	wrap_json_pack(&event, "{so ss so so*}",
+	wrap_json_pack(&event, "{so ss ss si so so*}",
 					"time", timestamp(),
 					"tag", hook->tag->tag,
+					"type", type,
+					"id", (int)(hookid & INT_MAX),
 					type, data1,
 					"data", data2);
 
@@ -258,7 +260,7 @@ static int get_xreq_flag(const char *name)
 	return get_flag(name, xreq_flags, (int)(sizeof xreq_flags / sizeof *xreq_flags));
 }
 
-static void hook_xreq(void *closure, const struct afb_xreq *xreq, const char *action, const char *format, ...)
+static void hook_xreq(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *action, const char *format, ...)
 {
 	struct json_object *cred = NULL;
 	const char *session = NULL;
@@ -277,7 +279,7 @@ static void hook_xreq(void *closure, const struct afb_xreq *xreq, const char *ac
 						"id", xreq->cred->id
 					);
 	va_start(ap, format);
-	emit(closure, "request", "{si ss ss ss so* ss*}", format, ap,
+	emit(closure, hookid, "request", "{si ss ss ss so* ss*}", format, ap,
 					"index", xreq->hookindex,
 					"api", xreq->api,
 					"verb", xreq->verb,
@@ -287,126 +289,126 @@ static void hook_xreq(void *closure, const struct afb_xreq *xreq, const char *ac
 	va_end(ap);
 }
 
-static void hook_xreq_begin(void *closure, const struct afb_xreq *xreq)
+static void hook_xreq_begin(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
-	hook_xreq(closure, xreq, "begin", NULL);
+	hook_xreq(closure, hookid, xreq, "begin", NULL);
 }
 
-static void hook_xreq_end(void *closure, const struct afb_xreq *xreq)
+static void hook_xreq_end(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
-	hook_xreq(closure, xreq, "end", NULL);
+	hook_xreq(closure, hookid, xreq, "end", NULL);
 }
 
-static void hook_xreq_json(void *closure, const struct afb_xreq *xreq, struct json_object *obj)
+static void hook_xreq_json(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct json_object *obj)
 {
-	hook_xreq(closure, xreq, "json", "{sO?}",
+	hook_xreq(closure, hookid, xreq, "json", "{sO?}",
 						"result", obj);
 }
 
-static void hook_xreq_get(void *closure, const struct afb_xreq *xreq, const char *name, struct afb_arg arg)
+static void hook_xreq_get(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *name, struct afb_arg arg)
 {
-	hook_xreq(closure, xreq, "get", "{ss? ss? ss? ss?}",
+	hook_xreq(closure, hookid, xreq, "get", "{ss? ss? ss? ss?}",
 						"query", name,
 						"name", arg.name,
 						"value", arg.value,
 						"path", arg.path);
 }
 
-static void hook_xreq_success(void *closure, const struct afb_xreq *xreq, struct json_object *obj, const char *info)
+static void hook_xreq_success(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct json_object *obj, const char *info)
 {
-	hook_xreq(closure, xreq, "success", "{sO? ss?}",
+	hook_xreq(closure, hookid, xreq, "success", "{sO? ss?}",
 						"result", obj,
 						"info", info);
 }
 
-static void hook_xreq_fail(void *closure, const struct afb_xreq *xreq, const char *status, const char *info)
+static void hook_xreq_fail(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *status, const char *info)
 {
-	hook_xreq(closure, xreq, "fail", "{ss? ss?}",
+	hook_xreq(closure, hookid, xreq, "fail", "{ss? ss?}",
 						"status", status,
 						"info", info);
 }
 
-static void hook_xreq_context_get(void *closure, const struct afb_xreq *xreq, void *value)
+static void hook_xreq_context_get(void *closure, unsigned hookid, const struct afb_xreq *xreq, void *value)
 {
-	hook_xreq(closure, xreq, "context_get", NULL);
+	hook_xreq(closure, hookid, xreq, "context_get", NULL);
 }
 
-static void hook_xreq_context_set(void *closure, const struct afb_xreq *xreq, void *value, void (*free_value)(void*))
+static void hook_xreq_context_set(void *closure, unsigned hookid, const struct afb_xreq *xreq, void *value, void (*free_value)(void*))
 {
-	hook_xreq(closure, xreq, "context_set", NULL);
+	hook_xreq(closure, hookid, xreq, "context_set", NULL);
 }
 
-static void hook_xreq_addref(void *closure, const struct afb_xreq *xreq)
+static void hook_xreq_addref(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
-	hook_xreq(closure, xreq, "addref", NULL);
+	hook_xreq(closure, hookid, xreq, "addref", NULL);
 }
 
-static void hook_xreq_unref(void *closure, const struct afb_xreq *xreq)
+static void hook_xreq_unref(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
-	hook_xreq(closure, xreq, "unref", NULL);
+	hook_xreq(closure, hookid, xreq, "unref", NULL);
 }
 
-static void hook_xreq_session_close(void *closure, const struct afb_xreq *xreq)
+static void hook_xreq_session_close(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
-	hook_xreq(closure, xreq, "session_close", NULL);
+	hook_xreq(closure, hookid, xreq, "session_close", NULL);
 }
 
-static void hook_xreq_session_set_LOA(void *closure, const struct afb_xreq *xreq, unsigned level, int result)
+static void hook_xreq_session_set_LOA(void *closure, unsigned hookid, const struct afb_xreq *xreq, unsigned level, int result)
 {
-	hook_xreq(closure, xreq, "session_set_LOA", "{si si}",
+	hook_xreq(closure, hookid, xreq, "session_set_LOA", "{si si}",
 					"level", level,
 					"result", result);
 }
 
-static void hook_xreq_subscribe(void *closure, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_subscribe(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
 {
-	hook_xreq(closure, xreq, "subscribe", "{s{ss si} si}",
+	hook_xreq(closure, hookid, xreq, "subscribe", "{s{ss si} si}",
 					"event",
 						"name", afb_evt_event_name(event),
 						"id", afb_evt_event_id(event),
 					"result", result);
 }
 
-static void hook_xreq_unsubscribe(void *closure, const struct afb_xreq *xreq, struct afb_event event, int result)
+static void hook_xreq_unsubscribe(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
 {
-	hook_xreq(closure, xreq, "unsubscribe", "{s{ss? si} si}",
+	hook_xreq(closure, hookid, xreq, "unsubscribe", "{s{ss? si} si}",
 					"event",
 						"name", afb_evt_event_name(event),
 						"id", afb_evt_event_id(event),
 					"result", result);
 }
 
-static void hook_xreq_subcall(void *closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+static void hook_xreq_subcall(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
 {
-	hook_xreq(closure, xreq, "subcall", "{ss? ss? sO?}",
+	hook_xreq(closure, hookid, xreq, "subcall", "{ss? ss? sO?}",
 					"api", api,
 					"verb", verb,
 					"args", args);
 }
 
-static void hook_xreq_subcall_result(void *closure, const struct afb_xreq *xreq, int status, struct json_object *result)
+static void hook_xreq_subcall_result(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result)
 {
-	hook_xreq(closure, xreq, "subcall_result", "{si sO?}",
+	hook_xreq(closure, hookid, xreq, "subcall_result", "{si sO?}",
 					"status", status,
 					"result", result);
 }
 
-static void hook_xreq_subcallsync(void *closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+static void hook_xreq_subcallsync(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
 {
-	hook_xreq(closure, xreq, "subcallsync", "{ss? ss? sO?}",
+	hook_xreq(closure, hookid, xreq, "subcallsync", "{ss? ss? sO?}",
 					"api", api,
 					"verb", verb,
 					"args", args);
 }
 
-static void hook_xreq_subcallsync_result(void *closure, const struct afb_xreq *xreq, int status, struct json_object *result)
+static void hook_xreq_subcallsync_result(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result)
 {
-	hook_xreq(closure, xreq, "subcallsync_result", "{si sO?}",
+	hook_xreq(closure, hookid, xreq, "subcallsync_result", "{si sO?}",
 					"status", status,
 					"result", result);
 }
 
-static void hook_xreq_vverbose(void *closure, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+static void hook_xreq_vverbose(void *closure, unsigned hookid, const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
 {
 	struct json_object *pos;
 	int len;
@@ -423,7 +425,7 @@ static void hook_xreq_vverbose(void *closure, const struct afb_xreq *xreq, int l
 	if (file)
 		wrap_json_pack(&pos, "{ss si ss*}", "file", file, "line", line, "function", func);
 
-	hook_xreq(closure, xreq, "vverbose", "{si ss* ss? so*}",
+	hook_xreq(closure, hookid, xreq, "vverbose", "{si ss* ss? so*}",
 					"level", level,
  					"type", verbosity_level_name(level),
 					len < 0 ? "format" : "message", len < 0 ? fmt : msg,
@@ -432,27 +434,27 @@ static void hook_xreq_vverbose(void *closure, const struct afb_xreq *xreq, int l
 	free(msg);
 }
 
-static void hook_xreq_store(void *closure, const struct afb_xreq *xreq, struct afb_stored_req *sreq)
+static void hook_xreq_store(void *closure, unsigned hookid, const struct afb_xreq *xreq, struct afb_stored_req *sreq)
 {
-	hook_xreq(closure, xreq, "store", NULL);
+	hook_xreq(closure, hookid, xreq, "store", NULL);
 }
 
-static void hook_xreq_unstore(void *closure, const struct afb_xreq *xreq)
+static void hook_xreq_unstore(void *closure, unsigned hookid, const struct afb_xreq *xreq)
 {
-	hook_xreq(closure, xreq, "unstore", NULL);
+	hook_xreq(closure, hookid, xreq, "unstore", NULL);
 }
 
-static void hook_xreq_subcall_req(void *closure, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+static void hook_xreq_subcall_req(void *closure, unsigned hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
 {
-	hook_xreq(closure, xreq, "subcall_req", "{ss? ss? sO?}",
+	hook_xreq(closure, hookid, xreq, "subcall_req", "{ss? ss? sO?}",
 					"api", api,
 					"verb", verb,
 					"args", args);
 }
 
-static void hook_xreq_subcall_req_result(void *closure, const struct afb_xreq *xreq, int status, struct json_object *result)
+static void hook_xreq_subcall_req_result(void *closure, unsigned hookid, const struct afb_xreq *xreq, int status, struct json_object *result)
 {
-	hook_xreq(closure, xreq, "subcall_req_result", "{si sO?}",
+	hook_xreq(closure, hookid, xreq, "subcall_req_result", "{si sO?}",
 					"status", status,
 					"result", result);
 }
@@ -513,45 +515,45 @@ static int get_ditf_flag(const char *name)
 }
 
 
-static void hook_ditf(void *closure, const struct afb_ditf *ditf, const char *action, const char *format, ...)
+static void hook_ditf(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *action, const char *format, ...)
 {
 	va_list ap;
 
 	va_start(ap, format);
-	emit(closure, "daemon", "{ss ss}", format, ap,
+	emit(closure, hookid, "daemon", "{ss ss}", format, ap,
 					"api", ditf->api,
 					"action", action);
 	va_end(ap);
 }
 
-static void hook_ditf_event_broadcast_before(void *closure, const struct afb_ditf *ditf, const char *name, struct json_object *object)
+static void hook_ditf_event_broadcast_before(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct json_object *object)
 {
-	hook_ditf(closure, ditf, "event_broadcast_before", "{ss sO*}",
+	hook_ditf(closure, hookid, ditf, "event_broadcast_before", "{ss sO*}",
 			"name", name, "data", object);
 }
 
-static void hook_ditf_event_broadcast_after(void *closure, const struct afb_ditf *ditf, const char *name, struct json_object *object, int result)
+static void hook_ditf_event_broadcast_after(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct json_object *object, int result)
 {
-	hook_ditf(closure, ditf, "event_broadcast_after", "{ss sO* si}",
+	hook_ditf(closure, hookid, ditf, "event_broadcast_after", "{ss sO* si}",
 			"name", name, "data", object, "result", result);
 }
 
-static void hook_ditf_get_event_loop(void *closure, const struct afb_ditf *ditf, struct sd_event *result)
+static void hook_ditf_get_event_loop(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_event *result)
 {
-	hook_ditf(closure, ditf, "get_event_loop", NULL);
+	hook_ditf(closure, hookid, ditf, "get_event_loop", NULL);
 }
 
-static void hook_ditf_get_user_bus(void *closure, const struct afb_ditf *ditf, struct sd_bus *result)
+static void hook_ditf_get_user_bus(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_bus *result)
 {
-	hook_ditf(closure, ditf, "get_user_bus", NULL);
+	hook_ditf(closure, hookid, ditf, "get_user_bus", NULL);
 }
 
-static void hook_ditf_get_system_bus(void *closure, const struct afb_ditf *ditf, struct sd_bus *result)
+static void hook_ditf_get_system_bus(void *closure, unsigned hookid, const struct afb_ditf *ditf, struct sd_bus *result)
 {
-	hook_ditf(closure, ditf, "get_system_bus", NULL);
+	hook_ditf(closure, hookid, ditf, "get_system_bus", NULL);
 }
 
-static void hook_ditf_vverbose(void*closure, const struct afb_ditf *ditf, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
+static void hook_ditf_vverbose(void *closure, unsigned hookid, const struct afb_ditf *ditf, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
 {
 	struct json_object *pos;
 	int len;
@@ -568,7 +570,7 @@ static void hook_ditf_vverbose(void*closure, const struct afb_ditf *ditf, int le
 	if (file)
 		wrap_json_pack(&pos, "{ss si ss*}", "file", file, "line", line, "function", function);
 
-	hook_ditf(closure, ditf, "vverbose", "{si ss* ss? so*}",
+	hook_ditf(closure, hookid, ditf, "vverbose", "{si ss* ss? so*}",
 					"level", level,
  					"type", verbosity_level_name(level),
 					len < 0 ? "format" : "message", len < 0 ? fmt : msg,
@@ -577,13 +579,13 @@ static void hook_ditf_vverbose(void*closure, const struct afb_ditf *ditf, int le
 	free(msg);
 }
 
-static void hook_ditf_event_make(void *closure, const struct afb_ditf *ditf, const char *name, struct afb_event result)
+static void hook_ditf_event_make(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, struct afb_event result)
 {
-	hook_ditf(closure, ditf, "event_make", "{ss ss si}",
+	hook_ditf(closure, hookid, ditf, "event_make", "{ss ss si}",
 			"name", name, "event", afb_evt_event_name(result), "id", afb_evt_event_id(result));
 }
 
-static void hook_ditf_rootdir_get_fd(void *closure, const struct afb_ditf *ditf, int result)
+static void hook_ditf_rootdir_get_fd(void *closure, unsigned hookid, const struct afb_ditf *ditf, int result)
 {
 	char path[PATH_MAX];
 
@@ -592,12 +594,12 @@ static void hook_ditf_rootdir_get_fd(void *closure, const struct afb_ditf *ditf,
 		readlink(path, path, sizeof path);
 	}
 
-	hook_ditf(closure, ditf, "rootdir_get_fd", "{ss}",
+	hook_ditf(closure, hookid, ditf, "rootdir_get_fd", "{ss}",
 			result < 0 ? "path" : "error",
 			result < 0 ? strerror(errno) : path);
 }
 
-static void hook_ditf_rootdir_open_locale(void *closure, const struct afb_ditf *ditf, const char *filename, int flags, const char *locale, int result)
+static void hook_ditf_rootdir_open_locale(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *filename, int flags, const char *locale, int result)
 {
 	char path[PATH_MAX];
 
@@ -606,7 +608,7 @@ static void hook_ditf_rootdir_open_locale(void *closure, const struct afb_ditf *
 		readlink(path, path, sizeof path);
 	}
 
-	hook_ditf(closure, ditf, "rootdir_open_locale", "{ss si ss* ss}",
+	hook_ditf(closure, hookid, ditf, "rootdir_open_locale", "{ss si ss* ss}",
 			"file", filename,
 			"flags", flags,
 			"locale", locale,
@@ -614,24 +616,24 @@ static void hook_ditf_rootdir_open_locale(void *closure, const struct afb_ditf *
 			result < 0 ? strerror(errno) : path);
 }
 
-static void hook_ditf_queue_job(void *closure, const struct afb_ditf *ditf, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result)
+static void hook_ditf_queue_job(void *closure, unsigned hookid, const struct afb_ditf *ditf, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result)
 {
-	hook_ditf(closure, ditf, "queue_job", "{ss}", "result", result);
+	hook_ditf(closure, hookid, ditf, "queue_job", "{ss}", "result", result);
 }
 
-static void hook_ditf_unstore_req(void * closure,  const struct afb_ditf *ditf, struct afb_stored_req *sreq)
+static void hook_ditf_unstore_req(void * closure, unsigned hookid, const struct afb_ditf *ditf, struct afb_stored_req *sreq)
 {
-	hook_ditf(closure, ditf, "unstore_req", NULL);
+	hook_ditf(closure, hookid, ditf, "unstore_req", NULL);
 }
 
-static void hook_ditf_require_api(void *closure, const struct afb_ditf *ditf, const char *name, int initialized)
+static void hook_ditf_require_api(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, int initialized)
 {
-	hook_ditf(closure, ditf, "require_api", "{ss sb}", "name", name, "initialized", initialized);
+	hook_ditf(closure, hookid, ditf, "require_api", "{ss sb}", "name", name, "initialized", initialized);
 }
 
-static void hook_ditf_require_api_result(void *closure, const struct afb_ditf *ditf, const char *name, int initialized, int result)
+static void hook_ditf_require_api_result(void *closure, unsigned hookid, const struct afb_ditf *ditf, const char *name, int initialized, int result)
 {
-	hook_ditf(closure, ditf, "require_api_result", "{ss sb si}", "name", name, "initialized", initialized, "result", result);
+	hook_ditf(closure, hookid, ditf, "require_api_result", "{ss sb si}", "name", name, "initialized", initialized, "result", result);
 }
 
 static struct afb_hook_ditf_itf hook_ditf_itf = {
@@ -672,60 +674,60 @@ static int get_svc_flag(const char *name)
 	return get_flag(name, svc_flags, (int)(sizeof svc_flags / sizeof *svc_flags));
 }
 
-static void hook_svc(void *closure, const struct afb_svc *svc, const char *action, const char *format, ...)
+static void hook_svc(void *closure, unsigned hookid, const struct afb_svc *svc, const char *action, const char *format, ...)
 {
 	va_list ap;
 
 	va_start(ap, format);
-	emit(closure, "service", "{ss ss}", format, ap,
+	emit(closure, hookid, "service", "{ss ss}", format, ap,
 					"api", svc->api,
 					"action", action);
 	va_end(ap);
 }
 
-static void hook_svc_start_before(void *closure, const struct afb_svc *svc)
+static void hook_svc_start_before(void *closure, unsigned hookid, const struct afb_svc *svc)
 {
-	hook_svc(closure, svc, "start_before", NULL);
+	hook_svc(closure, hookid, svc, "start_before", NULL);
 }
 
-static void hook_svc_start_after(void *closure, const struct afb_svc *svc, int status)
+static void hook_svc_start_after(void *closure, unsigned hookid, const struct afb_svc *svc, int status)
 {
-	hook_svc(closure, svc, "start_after", "{si}", "result", status);
+	hook_svc(closure, hookid, svc, "start_after", "{si}", "result", status);
 }
 
-static void hook_svc_on_event_before(void *closure, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
+static void hook_svc_on_event_before(void *closure, unsigned hookid, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
 {
-	hook_svc(closure, svc, "on_event_before", "{ss si sO*}",
+	hook_svc(closure, hookid, svc, "on_event_before", "{ss si sO*}",
 			"event", event, "id", eventid, "data", object);
 }
 
-static void hook_svc_on_event_after(void *closure, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
+static void hook_svc_on_event_after(void *closure, unsigned hookid, const struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
 {
-	hook_svc(closure, svc, "on_event_after", "{ss si sO*}",
+	hook_svc(closure, hookid, svc, "on_event_after", "{ss si sO*}",
 			"event", event, "id", eventid, "data", object);
 }
 
-static void hook_svc_call(void *closure, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
+static void hook_svc_call(void *closure, unsigned hookid, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
 {
-	hook_svc(closure, svc, "call", "{ss ss sO*}",
+	hook_svc(closure, hookid, svc, "call", "{ss ss sO*}",
 			"api", api, "verb", verb, "args", args);
 }
 
-static void hook_svc_call_result(void *closure, const struct afb_svc *svc, int status, struct json_object *result)
+static void hook_svc_call_result(void *closure, unsigned hookid, const struct afb_svc *svc, int status, struct json_object *result)
 {
-	hook_svc(closure, svc, "call_result", "{si sO*}",
+	hook_svc(closure, hookid, svc, "call_result", "{si sO*}",
 			"status", status, "result", result);
 }
 
-static void hook_svc_callsync(void *closure, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
+static void hook_svc_callsync(void *closure, unsigned hookid, const struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
 {
-	hook_svc(closure, svc, "callsync", "{ss ss sO*}",
+	hook_svc(closure, hookid, svc, "callsync", "{ss ss sO*}",
 			"api", api, "verb", verb, "args", args);
 }
 
-static void hook_svc_callsync_result(void *closure, const struct afb_svc *svc, int status, struct json_object *result)
+static void hook_svc_callsync_result(void *closure, unsigned hookid, const struct afb_svc *svc, int status, struct json_object *result)
 {
-	hook_svc(closure, svc, "callsync_result", "{si sO*}",
+	hook_svc(closure, hookid, svc, "callsync_result", "{si sO*}",
 			"status", status, "result", result);
 }
 
@@ -763,52 +765,52 @@ static int get_evt_flag(const char *name)
 	return get_flag(name, evt_flags, (int)(sizeof evt_flags / sizeof *evt_flags));
 }
 
-static void hook_evt(void *closure, const char *evt, int id, const char *action, const char *format, ...)
+static void hook_evt(void *closure, unsigned hookid, const char *evt, int id, const char *action, const char *format, ...)
 {
 	va_list ap;
 
 	va_start(ap, format);
-	emit(closure, "event", "{si ss ss}", format, ap,
+	emit(closure, hookid, "event", "{si ss ss}", format, ap,
 					"id", id,
 					"name", evt,
 					"action", action);
 	va_end(ap);
 }
 
-static void hook_evt_create(void *closure, const char *evt, int id)
+static void hook_evt_create(void *closure, unsigned hookid, const char *evt, int id)
 {
-	hook_evt(closure, evt, id, "create", NULL);
+	hook_evt(closure, hookid, evt, id, "create", NULL);
 }
 
-static void hook_evt_push_before(void *closure, const char *evt, int id, struct json_object *obj)
+static void hook_evt_push_before(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj)
 {
-	hook_evt(closure, evt, id, "push_before", "{sO*}", "data", obj);
+	hook_evt(closure, hookid, evt, id, "push_before", "{sO*}", "data", obj);
 }
 
 
-static void hook_evt_push_after(void *closure, const char *evt, int id, struct json_object *obj, int result)
+static void hook_evt_push_after(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj, int result)
 {
-	hook_evt(closure, evt, id, "push_after", "{sO* si}", "data", obj, "result", result);
+	hook_evt(closure, hookid, evt, id, "push_after", "{sO* si}", "data", obj, "result", result);
 }
 
-static void hook_evt_broadcast_before(void *closure, const char *evt, int id, struct json_object *obj)
+static void hook_evt_broadcast_before(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj)
 {
-	hook_evt(closure, evt, id, "broadcast_before", "{sO*}", "data", obj);
+	hook_evt(closure, hookid, evt, id, "broadcast_before", "{sO*}", "data", obj);
 }
 
-static void hook_evt_broadcast_after(void *closure, const char *evt, int id, struct json_object *obj, int result)
+static void hook_evt_broadcast_after(void *closure, unsigned hookid, const char *evt, int id, struct json_object *obj, int result)
 {
-	hook_evt(closure, evt, id, "broadcast_after", "{sO* si}", "data", obj, "result", result);
+	hook_evt(closure, hookid, evt, id, "broadcast_after", "{sO* si}", "data", obj, "result", result);
 }
 
-static void hook_evt_name(void *closure, const char *evt, int id)
+static void hook_evt_name(void *closure, unsigned hookid, const char *evt, int id)
 {
-	hook_evt(closure, evt, id, "name", NULL);
+	hook_evt(closure, hookid, evt, id, "name", NULL);
 }
 
-static void hook_evt_drop(void *closure, const char *evt, int id)
+static void hook_evt_drop(void *closure, unsigned hookid, const char *evt, int id)
 {
-	hook_evt(closure, evt, id, "drop", NULL);
+	hook_evt(closure, hookid, evt, id, "drop", NULL);
 }
 
 static struct afb_hook_evt_itf hook_evt_itf = {
diff --git a/test/monitoring/monitor.js b/test/monitoring/monitor.js
index ecf10962..e1d4be5b 100644
--- a/test/monitoring/monitor.js
+++ b/test/monitoring/monitor.js
@@ -429,7 +429,7 @@ function gotevent(obj) {
 
 function gottraceevent(obj) {
 	var data = obj.data;
-	var type = _.find(["request", "service", "daemon", "event"],function(x){return x in data;});
+	var type = data.type;
 	var desc = data[type];
 	if (!show_monitor_events) {
 		if (type == "event" ? desc.name.startsWith("monitor/") : desc.api == "monitor")