Make afb_event_drop obsolete
[src/app-framework-binder.git] / src / afb-hook.c
index c06eb78..3c015dc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
 
 #define _GNU_SOURCE
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <fnmatch.h>
+#include <sys/uio.h>
 
 #include <json-c/json.h>
 
-#include <afb/afb-req-itf.h>
+#include <afb/afb-req-common.h>
 #include <afb/afb-event-itf.h>
 
 #include "afb-context.h"
 #include "afb-hook.h"
-#include "session.h"
+#include "afb-session.h"
+#include "afb-cred.h"
+#include "afb-xreq.h"
+#include "afb-export.h"
+#include "afb-evt.h"
 #include "verbose.h"
 
-/*
- * Definition of a hook
+/**
+ * Definition of a hook for xreq
  */
-struct afb_hook {
-       struct afb_hook *next; /* next hook */
-       unsigned refcount; /* reference count */
-       char *api; /* api hooked or NULL for any */
-       char *verb; /* verb hooked or NULL for any */
-       struct AFB_clientCtx *session; /* session hooked or NULL if any */
-       unsigned flags; /* hook flags */
-       struct afb_hook_req_itf *reqitf; /* interface of hook */
-       void *closure; /* closure for callbacks */
+struct afb_hook_xreq {
+       struct afb_hook_xreq *next; /**< next hook */
+       unsigned refcount; /**< reference count */
+       char *api; /**< api hooked or NULL for any */
+       char *verb; /**< verb hooked or NULL for any */
+       struct afb_session *session; /**< session hooked or NULL if any */
+       unsigned flags; /**< hook flags */
+       struct afb_hook_xreq_itf *itf; /**< interface of hook */
+       void *closure; /**< closure for callbacks */
 };
 
-/*
- * Link hooks to a hooked request
+/**
+ * Definition of a hook for export
  */
-struct hook_req_observer {
-       struct afb_hook *hook; /* the hook */
-       struct hook_req_observer *next; /* the next observer */
+struct afb_hook_ditf {
+       struct afb_hook_ditf *next; /**< next hook */
+       unsigned refcount; /**< reference count */
+       char *api; /**< api hooked or NULL for any */
+       unsigned flags; /**< hook flags */
+       struct afb_hook_ditf_itf *itf; /**< interface of hook */
+       void *closure; /**< closure for callbacks */
 };
 
-/*
- * Structure recording a request to hook
+/**
+ * Definition of a hook for export
  */
-struct afb_hook_req {
-       struct hook_req_observer *observers; /* observers */
-       struct afb_context *context; /* context of the request */
-       struct afb_req req; /* the request hookd */
-       unsigned refcount; /* reference count proxy for request */
-       char name[1]; /* hook info for the request */
+struct afb_hook_svc {
+       struct afb_hook_svc *next; /**< next hook */
+       unsigned refcount; /**< reference count */
+       char *api; /**< api hooked or NULL for any */
+       unsigned flags; /**< hook flags */
+       struct afb_hook_svc_itf *itf; /**< interface of hook */
+       void *closure; /**< closure for callbacks */
 };
 
-/*
- * Structure for handling subcalls callbacks
+/**
+ * Definition of a hook for evt
  */
-struct hook_subcall {
-       struct afb_hook_req *tr; /* hookd request */
-       void (*callback)(void*, int, struct json_object*); /* client callback */
-       void *cb_closure; /* cient closure */
+struct afb_hook_evt {
+       struct afb_hook_evt *next; /**< next hook */
+       unsigned refcount; /**< reference count */
+       char *pattern; /**< event pattern name hooked or NULL for any */
+       unsigned flags; /**< hook flags */
+       struct afb_hook_evt_itf *itf; /**< interface of hook */
+       void *closure; /**< closure for callbacks */
 };
 
-/* counter of hooking */
-static unsigned hook_count = 0;
+/**
+ * Definition of a hook for global
+ */
+struct afb_hook_global {
+       struct afb_hook_global *next; /**< next hook */
+       unsigned refcount; /**< reference count */
+       unsigned flags; /**< hook flags */
+       struct afb_hook_global_itf *itf; /**< interface of hook */
+       void *closure; /**< closure for callbacks */
+};
+
+/* synchronisation across threads */
+static pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
+
+/* list of hooks for xreq */
+static struct afb_hook_xreq *list_of_xreq_hooks = NULL;
 
-/* list of hooks */
-static struct afb_hook *list_of_hooks = NULL;
+/* list of hooks for export */
+static struct afb_hook_ditf *list_of_ditf_hooks = NULL;
+
+/* list of hooks for export */
+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;
+
+/* list of hooks for global */
+static struct afb_hook_global *list_of_global_hooks = NULL;
+
+/* hook id */
+static unsigned next_hookid = 0;
+
+/******************************************************************************
+ * section: hook id
+ *****************************************************************************/
+static void init_hookid(struct afb_hookid *hookid)
+{
+       hookid->id = __atomic_add_fetch(&next_hookid, 1, __ATOMIC_RELAXED);
+       clock_gettime(CLOCK_MONOTONIC, &hookid->time);
+}
 
 /******************************************************************************
  * section: default callbacks for tracing requests
  *****************************************************************************/
 
-static void _hook_(const struct afb_hook_req *tr, const char *format, ...)
+static char *_pbuf_(const char *fmt, va_list args, char **palloc, char *sbuf, size_t szsbuf, size_t *outlen)
+{
+       int rc;
+       va_list cp;
+
+       *palloc = NULL;
+       va_copy(cp, args);
+       rc = vsnprintf(sbuf, szsbuf, fmt, args);
+       if ((size_t)rc >= szsbuf) {
+               sbuf[szsbuf-1] = 0;
+               sbuf[szsbuf-2] = sbuf[szsbuf-3] = sbuf[szsbuf-4] = '.';
+               rc = vasprintf(palloc, fmt, cp);
+               if (rc >= 0)
+                       sbuf = *palloc;
+       }
+       va_end(cp);
+       if (rc >= 0 && outlen)
+               *outlen = (size_t)rc;
+       return sbuf;
+}
+
+#if 0 /* old behaviour: use NOTICE */
+static void _hook_(const char *fmt1, const char *fmt2, va_list arg2, ...)
+{
+       char *tag, *data, *mem1, *mem2, buf1[256], buf2[2000];
+       va_list arg1;
+
+       data = _pbuf_(fmt2, arg2, &mem2, buf2, sizeof buf2, NULL);
+
+       va_start(arg1, arg2);
+       tag = _pbuf_(fmt1, arg1, &mem1, buf1, sizeof buf1, NULL);
+       va_end(arg1);
+
+       NOTICE("[HOOK %s] %s", tag, data);
+
+       free(mem1);
+       free(mem2);
+}
+#else /* new behaviour: emits directly to stderr */
+static void _hook_(const char *fmt1, const char *fmt2, va_list arg2, ...)
+{
+       static const char chars[] = "HOOK: [] \n";
+       char *mem1, *mem2, buf1[256], buf2[2000];
+       struct iovec iov[5];
+       va_list arg1;
+
+       iov[0].iov_base = (void*)&chars[0];
+       iov[0].iov_len = 7;
+
+       va_start(arg1, arg2);
+       iov[1].iov_base = _pbuf_(fmt1, arg1, &mem1, buf1, sizeof buf1, &iov[1].iov_len);
+       va_end(arg1);
+
+       iov[2].iov_base = (void*)&chars[7];
+       iov[2].iov_len = 2;
+
+       iov[3].iov_base = _pbuf_(fmt2, arg2, &mem2, buf2, sizeof buf2, &iov[3].iov_len);
+
+       iov[4].iov_base = (void*)&chars[9];
+       iov[4].iov_len = 1;
+
+       writev(2, iov, 5);
+
+       free(mem1);
+       free(mem2);
+}
+#endif
+
+static void _hook_xreq_(const struct afb_xreq *xreq, const char *format, ...)
+{
+       va_list ap;
+       va_start(ap, format);
+       _hook_("xreq-%06d:%s/%s", format, ap, xreq->hookindex, xreq->api, xreq->verb);
+       va_end(ap);
+}
+
+static void hook_xreq_begin_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
+{
+       if (!xreq->cred)
+               _hook_xreq_(xreq, "BEGIN");
+       else
+               _hook_xreq_(xreq, "BEGIN uid=%d=%s gid=%d pid=%d label=%s id=%s",
+                       (int)xreq->cred->uid,
+                       xreq->cred->user,
+                       (int)xreq->cred->gid,
+                       (int)xreq->cred->pid,
+                       xreq->cred->label?:"(null)",
+                       xreq->cred->id?:"(null)"
+               );
+}
+
+static void hook_xreq_end_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
+{
+       _hook_xreq_(xreq, "END");
+}
+
+static void hook_xreq_json_default_cb(void *closure, const struct afb_hookid *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_hookid *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_hookid *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_hookid *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_hookid *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_hookid *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_hookid *hookid, const struct afb_xreq *xreq)
+{
+       _hook_xreq_(xreq, "addref()");
+}
+
+static void hook_xreq_unref_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
+{
+       _hook_xreq_(xreq, "unref()");
+}
+
+static void hook_xreq_session_close_default_cb(void *closure, const struct afb_hookid *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_hookid *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_hookid *hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
+{
+       _hook_xreq_(xreq, "subscribe(%s:%d) -> %d", afb_evt_event_fullname(event), afb_evt_event_id(event), result);
+}
+
+static void hook_xreq_unsubscribe_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_event event, int result)
+{
+       _hook_xreq_(xreq, "unsubscribe(%s:%d) -> %d", afb_evt_event_fullname(event), afb_evt_event_id(event), result);
+}
+
+static void hook_xreq_subcall_default_cb(void *closure, const struct afb_hookid *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_hookid *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_hookid *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_hookid *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_hookid *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 *buffer;
+       char *msg;
        va_list ap;
 
-       va_start(ap, format);
-       len = vasprintf(&buffer, format, ap);
+       va_copy(ap, args);
+       len = vasprintf(&msg, fmt, ap);
        va_end(ap);
 
        if (len < 0)
-               NOTICE("tracing %s allocation error", tr->name);
+               _hook_xreq_(xreq, "vverbose(%d, %s, %d, %s) -> %s ? ? ?", level, file, line, func, fmt);
        else {
-               NOTICE("hook %s %s", tr->name, buffer);
-               free(buffer);
+               _hook_xreq_(xreq, "vverbose(%d, %s, %d, %s) -> %s", level, file, line, func, msg);
+               free(msg);
        }
 }
 
-static void hook_req_begin_default_cb(void * closure, const struct afb_hook_req *tr)
+static void hook_xreq_store_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_stored_req *sreq)
 {
-       _hook_(tr, "BEGIN");
+       _hook_xreq_(xreq, "store() -> %p", sreq);
 }
 
-static void hook_req_end_default_cb(void * closure, const struct afb_hook_req *tr)
+static void hook_xreq_unstore_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
 {
-       _hook_(tr, "END");
+       _hook_xreq_(xreq, "unstore()");
 }
 
-static void hook_req_json_default_cb(void * closure, const struct afb_hook_req *tr, struct json_object *obj)
+static void hook_xreq_subcall_req_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
 {
-       _hook_(tr, "json() -> %s", json_object_to_json_string(obj));
+       _hook_xreq_(xreq, "subcall_req(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static void hook_req_get_default_cb(void * closure, const struct afb_hook_req *tr, const char *name, struct afb_arg arg)
+static void hook_xreq_subcall_req_result_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, int status, struct json_object *result)
 {
-       _hook_(tr, "get(%s) -> { name: %s, value: %s, path: %s }", name, arg.name, arg.value, arg.path);
+       _hook_xreq_(xreq, "    ...subcall_req... -> %d: %s", status, json_object_to_json_string(result));
 }
 
-static void hook_req_success_default_cb(void * closure, const struct afb_hook_req *tr, struct json_object *obj, const char *info)
+static void hook_xreq_has_permission_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, const char *permission, int result)
 {
-       _hook_(tr, "success(%s, %s)", json_object_to_json_string(obj), info);
+       _hook_xreq_(xreq, "has_permission(%s) -> %d", permission, result);
 }
 
-static void hook_req_fail_default_cb(void * closure, const struct afb_hook_req *tr, const char *status, const char *info)
+static void hook_xreq_get_application_id_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, char *result)
 {
-       _hook_(tr, "fail(%s, %s)", status, info);
+       _hook_xreq_(xreq, "get_application_id() -> %s", result);
 }
 
-static void hook_req_raw_default_cb(void * closure, const struct afb_hook_req *tr, const char *buffer, size_t size)
+static void hook_xreq_context_make_default_cb(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)
 {
-       _hook_(tr, "raw() -> %.*s", (int)size, buffer);
+       _hook_xreq_(xreq, "context_make(replace=%s, %p, %p, %p) -> %p", replace?"yes":"no", create_value, free_value, create_closure, result);
 }
 
-static void hook_req_send_default_cb(void * closure, const struct afb_hook_req *tr, const char *buffer, size_t size)
+static struct afb_hook_xreq_itf hook_xreq_default_itf = {
+       .hook_xreq_begin = hook_xreq_begin_default_cb,
+       .hook_xreq_end = hook_xreq_end_default_cb,
+       .hook_xreq_json = hook_xreq_json_default_cb,
+       .hook_xreq_get = hook_xreq_get_default_cb,
+       .hook_xreq_success = hook_xreq_success_default_cb,
+       .hook_xreq_fail = hook_xreq_fail_default_cb,
+       .hook_xreq_context_get = hook_xreq_context_get_default_cb,
+       .hook_xreq_context_set = hook_xreq_context_set_default_cb,
+       .hook_xreq_addref = hook_xreq_addref_default_cb,
+       .hook_xreq_unref = hook_xreq_unref_default_cb,
+       .hook_xreq_session_close = hook_xreq_session_close_default_cb,
+       .hook_xreq_session_set_LOA = hook_xreq_session_set_LOA_default_cb,
+       .hook_xreq_subscribe = hook_xreq_subscribe_default_cb,
+       .hook_xreq_unsubscribe = hook_xreq_unsubscribe_default_cb,
+       .hook_xreq_subcall = hook_xreq_subcall_default_cb,
+       .hook_xreq_subcall_result = hook_xreq_subcall_result_default_cb,
+       .hook_xreq_subcallsync = hook_xreq_subcallsync_default_cb,
+       .hook_xreq_subcallsync_result = hook_xreq_subcallsync_result_default_cb,
+       .hook_xreq_vverbose = hook_xreq_vverbose_default_cb,
+       .hook_xreq_store = hook_xreq_store_default_cb,
+       .hook_xreq_unstore = hook_xreq_unstore_default_cb,
+       .hook_xreq_subcall_req = hook_xreq_subcall_req_default_cb,
+       .hook_xreq_subcall_req_result = hook_xreq_subcall_req_result_default_cb,
+       .hook_xreq_has_permission = hook_xreq_has_permission_default_cb,
+       .hook_xreq_get_application_id = hook_xreq_get_application_id_default_cb,
+       .hook_xreq_context_make = hook_xreq_context_make_default_cb
+};
+
+/******************************************************************************
+ * section: hooks for tracing requests
+ *****************************************************************************/
+
+#define _HOOK_XREQ_(what,...)   \
+       struct afb_hook_xreq *hook; \
+       struct afb_hookid hookid; \
+       pthread_rwlock_rdlock(&rwlock); \
+       init_hookid(&hookid); \
+       hook = list_of_xreq_hooks; \
+       while (hook) { \
+               if (hook->itf->hook_xreq_##what \
+                && (hook->flags & afb_hook_flag_req_##what) != 0 \
+                && (!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, &hookid, __VA_ARGS__); \
+               } \
+               hook = hook->next; \
+       } \
+       pthread_rwlock_unlock(&rwlock);
+
+
+void afb_hook_xreq_begin(const struct afb_xreq *xreq)
 {
-       _hook_(tr, "send(%.*s)", (int)size, buffer);
+       _HOOK_XREQ_(begin, xreq);
 }
 
-static void hook_req_context_get_default_cb(void * closure, const struct afb_hook_req *tr, void *value)
+void afb_hook_xreq_end(const struct afb_xreq *xreq)
 {
-       _hook_(tr, "context_get() -> %p", value);
+       _HOOK_XREQ_(end, xreq);
 }
 
-static void hook_req_context_set_default_cb(void * closure, const struct afb_hook_req *tr, void *value, void (*free_value)(void*))
+struct json_object *afb_hook_xreq_json(const struct afb_xreq *xreq, struct json_object *obj)
 {
-       _hook_(tr, "context_set(%p, %p)", value, free_value);
+       _HOOK_XREQ_(json, xreq, obj);
+       return obj;
 }
 
-static void hook_req_addref_default_cb(void * closure, const struct afb_hook_req *tr)
+struct afb_arg afb_hook_xreq_get(const struct afb_xreq *xreq, const char *name, struct afb_arg arg)
 {
-       _hook_(tr, "addref()");
+       _HOOK_XREQ_(get, xreq, name, arg);
+       return arg;
 }
 
-static void hook_req_unref_default_cb(void * closure, const struct afb_hook_req *tr)
+void afb_hook_xreq_success(const struct afb_xreq *xreq, struct json_object *obj, const char *info)
 {
-       _hook_(tr, "unref()");
+       _HOOK_XREQ_(success, xreq, obj, info);
 }
 
-static void hook_req_session_close_default_cb(void * closure, const struct afb_hook_req *tr)
+void afb_hook_xreq_fail(const struct afb_xreq *xreq, const char *status, const char *info)
 {
-       _hook_(tr, "session_close()");
+       _HOOK_XREQ_(fail, xreq, status, info);
 }
 
-static void hook_req_session_set_LOA_default_cb(void * closure, const struct afb_hook_req *tr, unsigned level, int result)
+void *afb_hook_xreq_context_get(const struct afb_xreq *xreq, void *value)
 {
-       _hook_(tr, "session_set_LOA(%u) -> %d", level, result);
+       _HOOK_XREQ_(context_get, xreq, value);
+       return value;
 }
 
-static void hook_req_subscribe_default_cb(void * closure, const struct afb_hook_req *tr, struct afb_event event, int result)
+void afb_hook_xreq_context_set(const struct afb_xreq *xreq, void *value, void (*free_value)(void*))
 {
-       _hook_(tr, "subscribe(%s:%p) -> %d", afb_event_name(event), event.closure, result);
+       _HOOK_XREQ_(context_set, xreq, value, free_value);
 }
 
-static void hook_req_unsubscribe_default_cb(void * closure, const struct afb_hook_req *tr, struct afb_event event, int result)
+void afb_hook_xreq_addref(const struct afb_xreq *xreq)
 {
-       _hook_(tr, "unsubscribe(%s:%p) -> %d", afb_event_name(event), event.closure, result);
+       _HOOK_XREQ_(addref, xreq);
 }
 
-static void hook_req_subcall_default_cb(void * closure, const struct afb_hook_req *tr, const char *api, const char *verb, struct json_object *args)
+void afb_hook_xreq_unref(const struct afb_xreq *xreq)
 {
-       _hook_(tr, "subcall(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
+       _HOOK_XREQ_(unref, xreq);
 }
 
-static void hook_req_subcall_result_default_cb(void * closure, const struct afb_hook_req *tr, int status, struct json_object *result)
+void afb_hook_xreq_session_close(const struct afb_xreq *xreq)
 {
-       _hook_(tr, "    ...subcall... -> %d: %s", status, json_object_to_json_string(result));
+       _HOOK_XREQ_(session_close, xreq);
 }
 
-static struct afb_hook_req_itf hook_req_default_itf = {
-       .hook_req_begin = hook_req_begin_default_cb,
-       .hook_req_end = hook_req_end_default_cb,
-       .hook_req_json = hook_req_json_default_cb,
-       .hook_req_get = hook_req_get_default_cb,
-       .hook_req_success = hook_req_success_default_cb,
-       .hook_req_fail = hook_req_fail_default_cb,
-       .hook_req_raw = hook_req_raw_default_cb,
-       .hook_req_send = hook_req_send_default_cb,
-       .hook_req_context_get = hook_req_context_get_default_cb,
-       .hook_req_context_set = hook_req_context_set_default_cb,
-       .hook_req_addref = hook_req_addref_default_cb,
-       .hook_req_unref = hook_req_unref_default_cb,
-       .hook_req_session_close = hook_req_session_close_default_cb,
-       .hook_req_session_set_LOA = hook_req_session_set_LOA_default_cb,
-       .hook_req_subscribe = hook_req_subscribe_default_cb,
-       .hook_req_unsubscribe = hook_req_unsubscribe_default_cb,
-       .hook_req_subcall = hook_req_subcall_default_cb,
-       .hook_req_subcall_result = hook_req_subcall_result_default_cb,
-};
+int afb_hook_xreq_session_set_LOA(const struct afb_xreq *xreq, unsigned level, int result)
+{
+       _HOOK_XREQ_(session_set_LOA, xreq, level, result);
+       return result;
+}
 
-/******************************************************************************
- * section: macro for tracing requests
- *****************************************************************************/
+int afb_hook_xreq_subscribe(const struct afb_xreq *xreq, struct afb_event event, int result)
+{
+       _HOOK_XREQ_(subscribe, xreq, event, result);
+       return result;
+}
+
+int afb_hook_xreq_unsubscribe(const struct afb_xreq *xreq, struct afb_event event, int result)
+{
+       _HOOK_XREQ_(unsubscribe, xreq, event, result);
+       return result;
+}
+
+void afb_hook_xreq_subcall(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+{
+       _HOOK_XREQ_(subcall, xreq, api, verb, args);
+}
+
+void afb_hook_xreq_subcall_result(const struct afb_xreq *xreq, int status, struct json_object *result)
+{
+       _HOOK_XREQ_(subcall_result, xreq, status, result);
+}
+
+void afb_hook_xreq_subcallsync(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+{
+       _HOOK_XREQ_(subcallsync, xreq, api, verb, args);
+}
 
-#define TRACE_REQX(what,tr) do{\
-               struct hook_req_observer *observer = tr->observers;\
-               while (observer != NULL) {\
-                       struct afb_hook *hook = observer->hook;\
-                       observer = observer->next;\
-                       if (hook->reqitf && hook->reqitf->hook_req_##what)\
-                               hook->reqitf->hook_req_##what(hook->closure, tr);\
-               }\
-       }while(0)
-
-#define TRACE_REQ_(what,tr) do{\
-               struct hook_req_observer *observer = tr->observers;\
-               while (observer != NULL) {\
-                       struct afb_hook *hook = observer->hook;\
-                       observer = observer->next;\
-                       if ((hook->flags & afb_hook_flag_req_##what) && hook->reqitf && hook->reqitf->hook_req_##what)\
-                               hook->reqitf->hook_req_##what(hook->closure, tr);\
-               }\
-       }while(0)
-
-#define TRACE_REQ(what,tr,...) do{\
-               struct hook_req_observer *observer = tr->observers;\
-               while (observer != NULL) {\
-                       struct afb_hook *hook = observer->hook;\
-                       observer = observer->next;\
-                       if ((hook->flags & afb_hook_flag_req_##what) && hook->reqitf && hook->reqitf->hook_req_##what)\
-                               hook->reqitf->hook_req_##what(hook->closure, tr, __VA_ARGS__);\
-               }\
-       }while(0)
+int afb_hook_xreq_subcallsync_result(const struct afb_xreq *xreq, int status, struct json_object *result)
+{
+       _HOOK_XREQ_(subcallsync_result, xreq, status, result);
+       return status;
+}
+
+void afb_hook_xreq_vverbose(const struct afb_xreq *xreq, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+       _HOOK_XREQ_(vverbose, xreq, level, file ?: "?", line, func ?: "?", fmt, args);
+}
+
+void afb_hook_xreq_store(const struct afb_xreq *xreq, struct afb_stored_req *sreq)
+{
+       _HOOK_XREQ_(store, xreq, sreq);
+}
+
+void afb_hook_xreq_unstore(const struct afb_xreq *xreq)
+{
+       _HOOK_XREQ_(unstore, xreq);
+}
+
+void afb_hook_xreq_subcall_req(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+{
+       _HOOK_XREQ_(subcall_req, xreq, api, verb, args);
+}
+
+void afb_hook_xreq_subcall_req_result(const struct afb_xreq *xreq, int status, struct json_object *result)
+{
+       _HOOK_XREQ_(subcall_req_result, xreq, status, result);
+}
+
+int afb_hook_xreq_has_permission(const struct afb_xreq *xreq, const char *permission, int result)
+{
+       _HOOK_XREQ_(has_permission, xreq, permission, result);
+       return result;
+}
+
+char *afb_hook_xreq_get_application_id(const struct afb_xreq *xreq, char *result)
+{
+       _HOOK_XREQ_(get_application_id, xreq, result);
+       return result;
+}
+
+void *afb_hook_xreq_context_make(const struct afb_xreq *xreq, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure, void *result)
+{
+       _HOOK_XREQ_(context_make, xreq, replace, create_value, free_value, create_closure, result);
+       return result;
+}
 
 /******************************************************************************
- * section: afb_hook_req handling
+ * section: hooking xreqs
  *****************************************************************************/
 
-static void hook_req_addref(struct afb_hook_req *tr)
+void afb_hook_init_xreq(struct afb_xreq *xreq)
+{
+       static int reqindex;
+
+       int f, flags;
+       int add;
+       struct afb_hook_xreq *hook;
+
+       /* scan hook list to get the expected flags */
+       flags = 0;
+       pthread_rwlock_rdlock(&rwlock);
+       hook = list_of_xreq_hooks;
+       while (hook) {
+               f = hook->flags & afb_hook_flags_req_all;
+               add = f != 0
+                  && (!hook->session || hook->session == xreq->context.session)
+                  && (!hook->api || !strcasecmp(hook->api, xreq->api))
+                  && (!hook->verb || !strcasecmp(hook->verb, xreq->verb));
+               if (add)
+                       flags |= f;
+               hook = hook->next;
+       }
+       pthread_rwlock_unlock(&rwlock);
+
+       /* store the hooking data */
+       xreq->hookflags = flags;
+       if (flags) {
+               pthread_rwlock_wrlock(&rwlock);
+               if (++reqindex < 0)
+                       reqindex = 1;
+               xreq->hookindex = reqindex;
+               pthread_rwlock_unlock(&rwlock);
+       }
+}
+
+struct afb_hook_xreq *afb_hook_create_xreq(const char *api, const char *verb, struct afb_session *session, int flags, struct afb_hook_xreq_itf *itf, void *closure)
 {
-       tr->refcount++;
+       struct afb_hook_xreq *hook;
+
+       /* alloc the result */
+       hook = calloc(1, sizeof *hook);
+       if (hook == NULL)
+               return NULL;
+
+       /* get a copy of the names */
+       hook->api = api ? strdup(api) : NULL;
+       hook->verb = verb ? strdup(verb) : NULL;
+       if ((api && !hook->api) || (verb && !hook->verb)) {
+               free(hook->api);
+               free(hook->verb);
+               free(hook);
+               return NULL;
+       }
+
+       /* initialise the rest */
+       hook->session = session;
+       if (session)
+               afb_session_addref(session);
+       hook->refcount = 1;
+       hook->flags = flags;
+       hook->itf = itf ? itf : &hook_xreq_default_itf;
+       hook->closure = closure;
+
+       /* record the hook */
+       pthread_rwlock_wrlock(&rwlock);
+       hook->next = list_of_xreq_hooks;
+       list_of_xreq_hooks = hook;
+       pthread_rwlock_unlock(&rwlock);
+
+       /* returns it */
+       return hook;
 }
 
-static void hook_req_unref(struct afb_hook_req *tr)
+struct afb_hook_xreq *afb_hook_addref_xreq(struct afb_hook_xreq *hook)
 {
-       struct hook_req_observer *o1, *o2;
-       if (!--tr->refcount) {
-               TRACE_REQX(end, tr);
-               afb_req_unref(tr->req);
-               o1 = tr->observers;
-               while(o1) {
-                       afb_hook_unref(o1->hook);
-                       o2 = o1->next;
-                       free(o1);
-                       o1 = o2;
+       pthread_rwlock_wrlock(&rwlock);
+       hook->refcount++;
+       pthread_rwlock_unlock(&rwlock);
+       return hook;
+}
+
+void afb_hook_unref_xreq(struct afb_hook_xreq *hook)
+{
+       struct afb_hook_xreq **prv;
+
+       if (hook) {
+               pthread_rwlock_wrlock(&rwlock);
+               if (--hook->refcount)
+                       hook = NULL;
+               else {
+                       /* unlink */
+                       prv = &list_of_xreq_hooks;
+                       while (*prv && *prv != hook)
+                               prv = &(*prv)->next;
+                       if(*prv)
+                               *prv = hook->next;
+               }
+               pthread_rwlock_unlock(&rwlock);
+               if (hook) {
+                       /* free */
+                       free(hook->api);
+                       free(hook->verb);
+                       if (hook->session)
+                               afb_session_unref(hook->session);
+                       free(hook);
                }
-               free(tr);
        }
 }
 
-static struct afb_hook_req *hook_req_create(struct afb_req req, struct afb_context *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
+/******************************************************************************
+ * section: default callbacks for tracing daemon interface
+ *****************************************************************************/
+
+static void _hook_ditf_(const struct afb_export *export, const char *format, ...)
+{
+       va_list ap;
+       va_start(ap, format);
+       _hook_("export-%s", format, ap, afb_export_apiname(export));
+       va_end(ap);
+}
+
+static void hook_ditf_event_broadcast_before_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, struct json_object *object)
+{
+       _hook_ditf_(export, "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_hookid *hookid, const struct afb_export *export, const char *name, struct json_object *object, int result)
+{
+       _hook_ditf_(export, "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_hookid *hookid, const struct afb_export *export, struct sd_event *result)
 {
-       unsigned id;
-       struct afb_hook_req *tr;
+       _hook_ditf_(export, "get_event_loop() -> %p", result);
+}
 
-       tr = malloc(sizeof *tr + 8 + lenapi + lenverb);
-       if (tr != NULL) {
-               /* get the call id */
-               id = ++hook_count;
-               if (id == 1000000)
-                       id = hook_count = 1;
+static void hook_ditf_get_user_bus_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct sd_bus *result)
+{
+       _hook_ditf_(export, "get_user_bus() -> %p", result);
+}
 
-               /* init hook */
-               tr->observers = NULL;
-               tr->refcount = 1;
-               tr->context = context;
-               tr->req = req;
-               afb_req_addref(req);
-               snprintf(tr->name, 9 + lenapi + lenverb, "%06d:%.*s/%.*s", id, (int)lenapi, api, (int)lenverb, verb);
+static void hook_ditf_get_system_bus_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct sd_bus *result)
+{
+       _hook_ditf_(export, "get_system_bus() -> %p", result);
+}
+
+static void hook_ditf_vverbose_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
+{
+       int len;
+       char *msg;
+       va_list ap;
+
+       va_copy(ap, args);
+       len = vasprintf(&msg, fmt, ap);
+       va_end(ap);
+
+       if (len < 0)
+               _hook_ditf_(export, "vverbose(%d, %s, %d, %s) -> %s ? ? ?", level, file, line, function, fmt);
+       else {
+               _hook_ditf_(export, "vverbose(%d, %s, %d, %s) -> %s", level, file, line, function, msg);
+               free(msg);
        }
-       return tr;
 }
 
-static void hook_req_add_observer(struct afb_hook_req *tr, struct afb_hook *hook)
+static void hook_ditf_event_make_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, struct afb_event result)
 {
-       struct hook_req_observer *observer;
+       _hook_ditf_(export, "event_make(%s) -> %s:%d", name, afb_evt_event_fullname(result), afb_evt_event_id(result));
+}
 
-       observer = malloc(sizeof *observer);
-       if (observer) {
-               observer->hook = afb_hook_addref(hook);
-               observer->next = tr->observers;
-               tr->observers = observer;
+static void hook_ditf_rootdir_get_fd_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result)
+{
+       char path[PATH_MAX];
+       if (result < 0)
+               _hook_ditf_(export, "rootdir_get_fd() -> %d, %m", result);
+       else {
+               sprintf(path, "/proc/self/fd/%d", result);
+               readlink(path, path, sizeof path);
+               _hook_ditf_(export, "rootdir_get_fd() -> %d = %s", result, path);
        }
 }
 
+static void hook_ditf_rootdir_open_locale_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *filename, int flags, const char *locale, int result)
+{
+       char path[PATH_MAX];
+       if (!locale)
+               locale = "(null)";
+       if (result < 0)
+               _hook_ditf_(export, "rootdir_open_locale(%s, %d, %s) -> %d, %m", filename, flags, locale, result);
+       else {
+               sprintf(path, "/proc/self/fd/%d", result);
+               readlink(path, path, sizeof path);
+               _hook_ditf_(export, "rootdir_open_locale(%s, %d, %s) -> %d = %s", filename, flags, locale, result, path);
+       }
+}
+
+static void hook_ditf_queue_job_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result)
+{
+       _hook_ditf_(export, "queue_job(%p, %p, %p, %d) -> %d", callback, argument, group, timeout, result);
+}
+
+static void hook_ditf_unstore_req_cb(void *closure, const struct afb_hookid *hookid,  const struct afb_export *export, struct afb_stored_req *sreq)
+{
+       _hook_ditf_(export, "unstore_req(%p)", sreq);
+}
+
+static void hook_ditf_require_api_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, int initialized)
+{
+       _hook_ditf_(export, "require_api(%s, %d)...", name, initialized);
+}
+
+static void hook_ditf_require_api_result_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, int initialized, int result)
+{
+       _hook_ditf_(export, "...require_api(%s, %d) -> %d", name, initialized, result);
+}
+
+static void hook_ditf_rename_api_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *oldname, const char *newname, int result)
+{
+       _hook_ditf_(export, "rename_api(%s -> %s) -> %d", oldname, newname, result);
+}
+
+static struct afb_hook_ditf_itf hook_ditf_default_itf = {
+       .hook_ditf_event_broadcast_before = hook_ditf_event_broadcast_before_cb,
+       .hook_ditf_event_broadcast_after = hook_ditf_event_broadcast_after_cb,
+       .hook_ditf_get_event_loop = hook_ditf_get_event_loop_cb,
+       .hook_ditf_get_user_bus = hook_ditf_get_user_bus_cb,
+       .hook_ditf_get_system_bus = hook_ditf_get_system_bus_cb,
+       .hook_ditf_vverbose = hook_ditf_vverbose_cb,
+       .hook_ditf_event_make = hook_ditf_event_make_cb,
+       .hook_ditf_rootdir_get_fd = hook_ditf_rootdir_get_fd_cb,
+       .hook_ditf_rootdir_open_locale = hook_ditf_rootdir_open_locale_cb,
+       .hook_ditf_queue_job = hook_ditf_queue_job_cb,
+       .hook_ditf_unstore_req = hook_ditf_unstore_req_cb,
+       .hook_ditf_require_api = hook_ditf_require_api_cb,
+       .hook_ditf_require_api_result = hook_ditf_require_api_result_cb,
+       .hook_ditf_rename_api = hook_ditf_rename_api_cb
+};
+
 /******************************************************************************
- * section: hooks for tracing requests
+ * section: hooks for tracing daemon interface (export)
  *****************************************************************************/
 
-static struct json_object *req_hook_json(void *closure)
+#define _HOOK_DITF_(what,...)   \
+       struct afb_hook_ditf *hook; \
+       struct afb_hookid hookid; \
+       const char *apiname = afb_export_apiname(export); \
+       pthread_rwlock_rdlock(&rwlock); \
+       init_hookid(&hookid); \
+       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, apiname))) { \
+                       hook->itf->hook_ditf_##what(hook->closure, &hookid, __VA_ARGS__); \
+               } \
+               hook = hook->next; \
+       } \
+       pthread_rwlock_unlock(&rwlock);
+
+void afb_hook_ditf_event_broadcast_before(const struct afb_export *export, const char *name, struct json_object *object)
+{
+       _HOOK_DITF_(event_broadcast_before, export, name, object);
+}
+
+int afb_hook_ditf_event_broadcast_after(const struct afb_export *export, const char *name, struct json_object *object, int result)
+{
+       _HOOK_DITF_(event_broadcast_after, export, name, object, result);
+       return result;
+}
+
+struct sd_event *afb_hook_ditf_get_event_loop(const struct afb_export *export, struct sd_event *result)
+{
+       _HOOK_DITF_(get_event_loop, export, result);
+       return result;
+}
+
+struct sd_bus *afb_hook_ditf_get_user_bus(const struct afb_export *export, struct sd_bus *result)
 {
-       struct afb_hook_req *tr = closure;
-       struct json_object *r;
+       _HOOK_DITF_(get_user_bus, export, result);
+       return result;
+}
 
-       r = afb_req_json(tr->req);
-       TRACE_REQ(json, tr, r);
-       return r;
+struct sd_bus *afb_hook_ditf_get_system_bus(const struct afb_export *export, struct sd_bus *result)
+{
+       _HOOK_DITF_(get_system_bus, export, result);
+       return result;
 }
 
-static struct afb_arg req_hook_get(void *closure, const char *name)
+void afb_hook_ditf_vverbose(const struct afb_export *export, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
 {
-       struct afb_hook_req *tr = closure;
-       struct afb_arg a;
+       _HOOK_DITF_(vverbose, export, level, file, line, function, fmt, args);
+}
 
-       a = afb_req_get(tr->req, name);
-       TRACE_REQ(get, tr, name, a);
-       return a;
+struct afb_event afb_hook_ditf_event_make(const struct afb_export *export, const char *name, struct afb_event result)
+{
+       _HOOK_DITF_(event_make, export, name, result);
+       return result;
 }
 
-static void req_hook_success(void *closure, struct json_object *obj, const char *info)
+int afb_hook_ditf_rootdir_get_fd(const struct afb_export *export, int result)
 {
-       struct afb_hook_req *tr = closure;
+       _HOOK_DITF_(rootdir_get_fd, export, result);
+       return result;
+}
 
-       TRACE_REQ(success, tr, obj, info);
-       afb_req_success(tr->req, obj, info);
-       hook_req_unref(tr);
+int afb_hook_ditf_rootdir_open_locale(const struct afb_export *export, const char *filename, int flags, const char *locale, int result)
+{
+       _HOOK_DITF_(rootdir_open_locale, export, filename, flags, locale, result);
+       return result;
 }
 
-static void req_hook_fail(void *closure, const char *status, const char *info)
+int afb_hook_ditf_queue_job(const struct afb_export *export, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result)
 {
-       struct afb_hook_req *tr = closure;
+       _HOOK_DITF_(queue_job, export, callback, argument, group, timeout, result);
+       return result;
+}
 
-       TRACE_REQ(fail, tr, status, info);
-       afb_req_fail(tr->req, status, info);
-       hook_req_unref(tr);
+void afb_hook_ditf_unstore_req(const struct afb_export *export, struct afb_stored_req *sreq)
+{
+       _HOOK_DITF_(unstore_req, export, sreq);
 }
 
-static const char *req_hook_raw(void *closure, size_t *size)
+void afb_hook_ditf_require_api(const struct afb_export *export, const char *name, int initialized)
 {
-       struct afb_hook_req *tr = closure;
-       const char *r;
-       size_t s;
+       _HOOK_DITF_(require_api, export, name, initialized);
+}
 
-       r = afb_req_raw(tr->req, &s);
-       TRACE_REQ(raw, tr, r, s);
-       if (size)
-               *size = s;
-       return r;
+int afb_hook_ditf_require_api_result(const struct afb_export *export, const char *name, int initialized, int result)
+{
+       _HOOK_DITF_(require_api_result, export, name, initialized, result);
+       return result;
 }
 
-static void req_hook_send(void *closure, const char *buffer, size_t size)
+int afb_hook_ditf_rename_api(const struct afb_export *export, const char *oldname, const char *newname, int result)
 {
-       struct afb_hook_req *tr = closure;
+       _HOOK_DITF_(rename_api, export, oldname, newname, result);
+       return result;
+}
 
-       TRACE_REQ(send, tr, buffer, size);
-       afb_req_send(tr->req, buffer, size);
+/******************************************************************************
+ * section: hooking export
+ *****************************************************************************/
+
+int afb_hook_flags_ditf(const char *api)
+{
+       int flags;
+       struct afb_hook_ditf *hook;
+
+       pthread_rwlock_rdlock(&rwlock);
+       flags = 0;
+       hook = list_of_ditf_hooks;
+       while (hook) {
+               if (!api || !hook->api || !strcasecmp(hook->api, api))
+                       flags |= hook->flags;
+               hook = hook->next;
+       }
+       pthread_rwlock_unlock(&rwlock);
+       return flags;
 }
 
-static void *req_hook_context_get(void *closure)
+struct afb_hook_ditf *afb_hook_create_ditf(const char *api, int flags, struct afb_hook_ditf_itf *itf, void *closure)
 {
-       struct afb_hook_req *tr = closure;
-       void *r;
+       struct afb_hook_ditf *hook;
+
+       /* alloc the result */
+       hook = calloc(1, sizeof *hook);
+       if (hook == NULL)
+               return NULL;
 
-       r = afb_req_context_get(tr->req);
-       TRACE_REQ(context_get, tr, r);
+       /* get a copy of the names */
+       hook->api = api ? strdup(api) : NULL;
+       if (api && !hook->api) {
+               free(hook);
+               return NULL;
+       }
+
+       /* initialise the rest */
+       hook->refcount = 1;
+       hook->flags = flags;
+       hook->itf = itf ? itf : &hook_ditf_default_itf;
+       hook->closure = closure;
+
+       /* record the hook */
+       pthread_rwlock_wrlock(&rwlock);
+       hook->next = list_of_ditf_hooks;
+       list_of_ditf_hooks = hook;
+       pthread_rwlock_unlock(&rwlock);
+
+       /* returns it */
+       return hook;
+}
 
-       return r;
+struct afb_hook_ditf *afb_hook_addref_ditf(struct afb_hook_ditf *hook)
+{
+       pthread_rwlock_wrlock(&rwlock);
+       hook->refcount++;
+       pthread_rwlock_unlock(&rwlock);
+       return hook;
 }
 
-static void req_hook_context_set(void *closure, void *value, void (*free_value)(void*))
+void afb_hook_unref_ditf(struct afb_hook_ditf *hook)
 {
-       struct afb_hook_req *tr = closure;
+       struct afb_hook_ditf **prv;
 
-       TRACE_REQ(context_set, tr, value, free_value);
-       afb_req_context_set(tr->req, value, free_value);
+       if (hook) {
+               pthread_rwlock_wrlock(&rwlock);
+               if (--hook->refcount)
+                       hook = NULL;
+               else {
+                       /* unlink */
+                       prv = &list_of_ditf_hooks;
+                       while (*prv && *prv != hook)
+                               prv = &(*prv)->next;
+                       if(*prv)
+                               *prv = hook->next;
+               }
+               pthread_rwlock_unlock(&rwlock);
+               if (hook) {
+                       /* free */
+                       free(hook->api);
+                       free(hook);
+               }
+       }
 }
 
-static void req_hook_addref(void *closure)
+/******************************************************************************
+ * section: default callbacks for tracing service interface (export)
+ *****************************************************************************/
+
+static void _hook_svc_(const struct afb_export *export, const char *format, ...)
 {
-       struct afb_hook_req *tr = closure;
+       va_list ap;
+       va_start(ap, format);
+       _hook_("export-%s", format, ap, afb_export_apiname(export));
+       va_end(ap);
+}
 
-       TRACE_REQ_(addref, tr);
-       hook_req_addref(tr);
+static void hook_svc_start_before_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export)
+{
+       _hook_svc_(export, "start.before");
 }
 
-static void req_hook_unref(void *closure)
+static void hook_svc_start_after_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int status)
 {
-       struct afb_hook_req *tr = closure;
+       _hook_svc_(export, "start.after -> %d", status);
+}
 
-       TRACE_REQ_(unref, tr);
-       hook_req_unref(tr);
+static void hook_svc_on_event_before_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int eventid, struct json_object *object)
+{
+       _hook_svc_(export, "on_event.before(%s, %d, %s)", event, eventid, json_object_to_json_string(object));
 }
 
-static void req_hook_session_close(void *closure)
+static void hook_svc_on_event_after_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int eventid, struct json_object *object)
 {
-       struct afb_hook_req *tr = closure;
+       _hook_svc_(export, "on_event.after(%s, %d, %s)", event, eventid, json_object_to_json_string(object));
+}
 
-       TRACE_REQ_(session_close, tr);
-       afb_req_session_close(tr->req);
+static void hook_svc_call_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+       _hook_svc_(export, "call(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static int req_hook_session_set_LOA(void *closure, unsigned level)
+static void hook_svc_call_result_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int status, struct json_object *result)
 {
-       struct afb_hook_req *tr = closure;
-       int r;
+       _hook_svc_(export, "    ...call... -> %d: %s", status, json_object_to_json_string(result));
+}
 
-       r = afb_req_session_set_LOA(tr->req, level);
-       TRACE_REQ(session_set_LOA, tr, level, r);
-       return r;
+static void hook_svc_callsync_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+       _hook_svc_(export, "callsync(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
 }
 
-static int req_hook_subscribe(void *closure, struct afb_event event)
+static void hook_svc_callsync_result_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int status, struct json_object *result)
 {
-       struct afb_hook_req *tr = closure;
-       int r;
+       _hook_svc_(export, "    ...callsync... -> %d: %s", status, json_object_to_json_string(result));
+}
 
-       r = afb_req_subscribe(tr->req, event);
-       TRACE_REQ(subscribe, tr, event, r);
-       return r;
+static struct afb_hook_svc_itf hook_svc_default_itf = {
+       .hook_svc_start_before = hook_svc_start_before_default_cb,
+       .hook_svc_start_after = hook_svc_start_after_default_cb,
+       .hook_svc_on_event_before = hook_svc_on_event_before_default_cb,
+       .hook_svc_on_event_after = hook_svc_on_event_after_default_cb,
+       .hook_svc_call = hook_svc_call_default_cb,
+       .hook_svc_call_result = hook_svc_call_result_default_cb,
+       .hook_svc_callsync = hook_svc_callsync_default_cb,
+       .hook_svc_callsync_result = hook_svc_callsync_result_default_cb
+};
+
+/******************************************************************************
+ * section: hooks for tracing service interface (export)
+ *****************************************************************************/
+
+#define _HOOK_SVC_(what,...)   \
+       struct afb_hook_svc *hook; \
+       struct afb_hookid hookid; \
+       const char *apiname = afb_export_apiname(export); \
+       pthread_rwlock_rdlock(&rwlock); \
+       init_hookid(&hookid); \
+       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, apiname))) { \
+                       hook->itf->hook_svc_##what(hook->closure, &hookid, __VA_ARGS__); \
+               } \
+               hook = hook->next; \
+       } \
+       pthread_rwlock_unlock(&rwlock);
+
+void afb_hook_svc_start_before(const struct afb_export *export)
+{
+       _HOOK_SVC_(start_before, export);
 }
 
-static int req_hook_unsubscribe(void *closure, struct afb_event event)
+int afb_hook_svc_start_after(const struct afb_export *export, int status)
 {
-       struct afb_hook_req *tr = closure;
-       int r;
+       _HOOK_SVC_(start_after, export, status);
+       return status;
+}
 
-       r = afb_req_unsubscribe(tr->req, event);
-       TRACE_REQ(unsubscribe, tr, event, r);
-       return r;
+void afb_hook_svc_on_event_before(const struct afb_export *export, const char *event, int eventid, struct json_object *object)
+{
+       _HOOK_SVC_(on_event_before, export, event, eventid, object);
 }
 
-static void req_hook_subcall_result(void *closure, int status, struct json_object *result)
+void afb_hook_svc_on_event_after(const struct afb_export *export, const char *event, int eventid, struct json_object *object)
 {
-       struct hook_subcall *sc = closure;
-       struct hook_subcall s = *sc;
+       _HOOK_SVC_(on_event_after, export, event, eventid, object);
+}
 
-       free(sc);
-       TRACE_REQ(subcall_result, s.tr, status, result);
-       hook_req_unref(s.tr);
-       s.callback(s.cb_closure, status, result);
+void afb_hook_svc_call(const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+       _HOOK_SVC_(call, export, api, verb, args);
 }
 
-static void req_hook_subcall(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+void afb_hook_svc_call_result(const struct afb_export *export, int status, struct json_object *result)
 {
-       struct afb_hook_req *tr = closure;
-       struct hook_subcall *sc;
+       _HOOK_SVC_(call_result, export, status, result);
+}
 
-       TRACE_REQ(subcall, tr, api, verb, args);
-       sc = malloc(sizeof *sc);
-       if (sc) {
-               sc->tr = tr;
-               sc->callback = callback;
-               sc->cb_closure = cb_closure;
-               hook_req_addref(tr);
-               cb_closure = sc;
-               callback = req_hook_subcall_result;
-       }
-       afb_req_subcall(tr->req, api, verb, args, callback, cb_closure);
-}
-
-static struct afb_req_itf req_hook_itf = {
-       .json = req_hook_json,
-       .get = req_hook_get,
-       .success = req_hook_success,
-       .fail = req_hook_fail,
-       .raw = req_hook_raw,
-       .send = req_hook_send,
-       .context_get = req_hook_context_get,
-       .context_set = req_hook_context_set,
-       .addref = req_hook_addref,
-       .unref = req_hook_unref,
-       .session_close = req_hook_session_close,
-       .session_set_LOA = req_hook_session_set_LOA,
-       .subscribe = req_hook_subscribe,
-       .unsubscribe = req_hook_unsubscribe,
-       .subcall = req_hook_subcall
-};
+void afb_hook_svc_callsync(const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+       _HOOK_SVC_(callsync, export, api, verb, args);
+}
+
+int afb_hook_svc_callsync_result(const struct afb_export *export, int status, struct json_object *result)
+{
+       _HOOK_SVC_(callsync_result, export, status, result);
+       return status;
+}
 
 /******************************************************************************
- * section: 
+ * section: hooking services (export)
  *****************************************************************************/
 
-struct afb_req afb_hook_req_call(struct afb_req req, struct afb_context *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
+int afb_hook_flags_svc(const char *api)
 {
-       int add;
-       struct afb_hook_req *tr;
-       struct afb_hook *hook;
+       int flags;
+       struct afb_hook_svc *hook;
+
+       pthread_rwlock_rdlock(&rwlock);
+       flags = 0;
+       hook = list_of_svc_hooks;
+       while (hook) {
+               if (!api || !hook->api || !strcasecmp(hook->api, api))
+                       flags |= hook->flags;
+               hook = hook->next;
+       }
+       pthread_rwlock_unlock(&rwlock);
+       return flags;
+}
+
+struct afb_hook_svc *afb_hook_create_svc(const char *api, int flags, struct afb_hook_svc_itf *itf, void *closure)
+{
+       struct afb_hook_svc *hook;
+
+       /* alloc the result */
+       hook = calloc(1, sizeof *hook);
+       if (hook == NULL)
+               return NULL;
+
+       /* get a copy of the names */
+       hook->api = api ? strdup(api) : NULL;
+       if (api && !hook->api) {
+               free(hook);
+               return NULL;
+       }
+
+       /* initialise the rest */
+       hook->refcount = 1;
+       hook->flags = flags;
+       hook->itf = itf ? itf : &hook_svc_default_itf;
+       hook->closure = closure;
+
+       /* record the hook */
+       pthread_rwlock_wrlock(&rwlock);
+       hook->next = list_of_svc_hooks;
+       list_of_svc_hooks = hook;
+       pthread_rwlock_unlock(&rwlock);
+
+       /* returns it */
+       return hook;
+}
+
+struct afb_hook_svc *afb_hook_addref_svc(struct afb_hook_svc *hook)
+{
+       pthread_rwlock_wrlock(&rwlock);
+       hook->refcount++;
+       pthread_rwlock_unlock(&rwlock);
+       return hook;
+}
+
+void afb_hook_unref_svc(struct afb_hook_svc *hook)
+{
+       struct afb_hook_svc **prv;
 
-       hook = list_of_hooks;
        if (hook) {
-               tr = NULL;
-               do {
-                       add = (hook->flags & afb_hook_flags_req_all) != 0
-                          && (!hook->session || hook->session == context->session)
-                          && (!hook->api || !(memcmp(hook->api, api, lenapi) || hook->api[lenapi]))
-                          && (!hook->verb || !(memcmp(hook->verb, verb, lenverb) || hook->verb[lenverb]));
-                       if (add) {
-                               if (!tr)
-                                       tr = hook_req_create(req, context, api, lenapi, verb, lenverb);
-                               if (tr)
-                                       hook_req_add_observer(tr, hook);
-                       }
-                       hook = hook->next;
-               } while(hook);
-               if (tr) {
-                       req.closure = tr;
-                       req.itf = &req_hook_itf;
-                       TRACE_REQX(begin, tr);
+               pthread_rwlock_wrlock(&rwlock);
+               if (--hook->refcount)
+                       hook = NULL;
+               else {
+                       /* unlink */
+                       prv = &list_of_svc_hooks;
+                       while (*prv && *prv != hook)
+                               prv = &(*prv)->next;
+                       if(*prv)
+                               *prv = hook->next;
+               }
+               pthread_rwlock_unlock(&rwlock);
+               if (hook) {
+                       /* free */
+                       free(hook->api);
+                       free(hook);
                }
        }
+}
+
+/******************************************************************************
+ * section: default callbacks for tracing service interface (evt)
+ *****************************************************************************/
+
+static void _hook_evt_(const char *evt, int id, const char *format, ...)
+{
+       va_list ap;
+       va_start(ap, format);
+       _hook_("evt-%s:%d", format, ap, evt, id);
+       va_end(ap);
+}
+
+static void hook_evt_create_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
+{
+       _hook_evt_(evt, id, "create");
+}
+
+static void hook_evt_push_before_default_cb(void *closure, const struct afb_hookid *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 struct afb_hookid *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 struct afb_hookid *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 struct afb_hookid *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 struct afb_hookid *hookid, const char *evt, int id, const char *result)
+{
+       _hook_evt_(evt, id, "name -> %s", result);
+}
+
+static void hook_evt_addref_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
+{
+       _hook_evt_(evt, id, "addref");
+}
+
+static void hook_evt_unref_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
+{
+       _hook_evt_(evt, id, "unref");
+}
+
+static struct afb_hook_evt_itf hook_evt_default_itf = {
+       .hook_evt_create = hook_evt_create_default_cb,
+       .hook_evt_push_before = hook_evt_push_before_default_cb,
+       .hook_evt_push_after = hook_evt_push_after_default_cb,
+       .hook_evt_broadcast_before = hook_evt_broadcast_before_default_cb,
+       .hook_evt_broadcast_after = hook_evt_broadcast_after_default_cb,
+       .hook_evt_name = hook_evt_name_default_cb,
+       .hook_evt_addref = hook_evt_addref_default_cb,
+       .hook_evt_unref = hook_evt_unref_default_cb
+};
+
+/******************************************************************************
+ * section: hooks for tracing events interface (evt)
+ *****************************************************************************/
+
+#define _HOOK_EVT_(what,...)   \
+       struct afb_hook_evt *hook; \
+       struct afb_hookid hookid; \
+       pthread_rwlock_rdlock(&rwlock); \
+       init_hookid(&hookid); \
+       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, &hookid, __VA_ARGS__); \
+               } \
+               hook = hook->next; \
+       } \
+       pthread_rwlock_unlock(&rwlock);
+
+void afb_hook_evt_create(const char *evt, int id)
+{
+       _HOOK_EVT_(create, evt, id);
+}
+
+void afb_hook_evt_push_before(const char *evt, int id, struct json_object *obj)
+{
+       _HOOK_EVT_(push_before, evt, id, obj);
+}
+
+int afb_hook_evt_push_after(const char *evt, int id, struct json_object *obj, int result)
+{
+       _HOOK_EVT_(push_after, evt, id, obj, result);
+       return result;
+}
+
+void afb_hook_evt_broadcast_before(const char *evt, int id, struct json_object *obj)
+{
+       _HOOK_EVT_(broadcast_before, evt, id, obj);
+}
+
+int afb_hook_evt_broadcast_after(const char *evt, int id, struct json_object *obj, int result)
+{
+       _HOOK_EVT_(broadcast_after, evt, id, obj, result);
+       return result;
+}
+
+void afb_hook_evt_name(const char *evt, int id, const char *result)
+{
+       _HOOK_EVT_(name, evt, id, result);
+}
+
+void afb_hook_evt_addref(const char *evt, int id)
+{
+       _HOOK_EVT_(addref, evt, id);
+}
 
-       return req;
+void afb_hook_evt_unref(const char *evt, int id)
+{
+       _HOOK_EVT_(unref, evt, id);
+}
+
+/******************************************************************************
+ * section: hooking services (evt)
+ *****************************************************************************/
+
+int afb_hook_flags_evt(const char *name)
+{
+       int flags;
+       struct afb_hook_evt *hook;
+
+       pthread_rwlock_rdlock(&rwlock);
+       flags = 0;
+       hook = list_of_evt_hooks;
+       while (hook) {
+               if (!name || !hook->pattern || !fnmatch(hook->pattern, name, FNM_CASEFOLD))
+                       flags |= hook->flags;
+               hook = hook->next;
+       }
+       pthread_rwlock_unlock(&rwlock);
+       return flags;
 }
 
-struct afb_hook *afb_hook_req_create(const char *api, const char *verb, struct AFB_clientCtx *session, unsigned flags, struct afb_hook_req_itf *itf, void *closure)
+struct afb_hook_evt *afb_hook_create_evt(const char *pattern, int flags, struct afb_hook_evt_itf *itf, void *closure)
 {
-       struct afb_hook *hook;
+       struct afb_hook_evt *hook;
 
-       hook = malloc(sizeof *hook);
+       /* alloc the result */
+       hook = calloc(1, sizeof *hook);
        if (hook == NULL)
                return NULL;
 
-       hook->api = api ? strdup(api) : NULL;
-       hook->verb = verb ? strdup(verb) : NULL;
-       hook->session = session ? ctxClientAddRef(session) : NULL;
-
-       if ((api && !hook->api) || (verb && !hook->verb)) {
-               free(hook->api);
-               free(hook->verb);
-               if (hook->session)
-                       ctxClientUnref(hook->session);
+       /* get a copy of the names */
+       hook->pattern = pattern ? strdup(pattern) : NULL;
+       if (pattern && !hook->pattern) {
                free(hook);
                return NULL;
        }
 
+       /* initialise the rest */
        hook->refcount = 1;
        hook->flags = flags;
-       hook->reqitf = itf ? itf : &hook_req_default_itf;
+       hook->itf = itf ? itf : &hook_evt_default_itf;
        hook->closure = closure;
 
-       hook->next = list_of_hooks;
-       list_of_hooks = hook;
+       /* record the hook */
+       pthread_rwlock_wrlock(&rwlock);
+       hook->next = list_of_evt_hooks;
+       list_of_evt_hooks = hook;
+       pthread_rwlock_unlock(&rwlock);
+
+       /* returns it */
        return hook;
 }
 
-struct afb_hook *afb_hook_addref(struct afb_hook *hook)
+struct afb_hook_evt *afb_hook_addref_evt(struct afb_hook_evt *hook)
 {
+       pthread_rwlock_wrlock(&rwlock);
        hook->refcount++;
+       pthread_rwlock_unlock(&rwlock);
        return hook;
 }
 
-void afb_hook_unref(struct afb_hook *hook)
+void afb_hook_unref_evt(struct afb_hook_evt *hook)
 {
-       if (!--hook->refcount) {
-               /* unlink */
-               struct afb_hook **prv = &list_of_hooks;
-               while (*prv && *prv != hook)
-                       prv = &(*prv)->next;
-               if(*prv)
-                       *prv = hook->next;
+       struct afb_hook_evt **prv;
 
-               /* free */
-               free(hook->api);
-               free(hook->verb);
-               if (hook->session)
-                       ctxClientUnref(hook->session);
-               free(hook);
+       if (hook) {
+               pthread_rwlock_wrlock(&rwlock);
+               if (--hook->refcount)
+                       hook = NULL;
+               else {
+                       /* unlink */
+                       prv = &list_of_evt_hooks;
+                       while (*prv && *prv != hook)
+                               prv = &(*prv)->next;
+                       if(*prv)
+                               *prv = hook->next;
+               }
+               pthread_rwlock_unlock(&rwlock);
+               if (hook) {
+                       /* free */
+                       free(hook->pattern);
+                       free(hook);
+               }
+       }
+}
+
+/******************************************************************************
+ * section: default callbacks for globals (global)
+ *****************************************************************************/
+
+static void _hook_global_(const char *format, ...)
+{
+       va_list ap;
+       va_start(ap, format);
+       _hook_("global", format, ap);
+       va_end(ap);
+}
+
+static void hook_global_vverbose_default_cb(void *closure, const struct afb_hookid *hookid, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+       int len;
+       char *msg;
+       va_list ap;
+
+       va_copy(ap, args);
+       len = vasprintf(&msg, fmt, ap);
+       va_end(ap);
+
+       if (len < 0)
+               _hook_global_("vverbose(%d, %s, %d, %s) -> %s ? ? ?", level, file, line, func, fmt);
+       else {
+               _hook_global_("vverbose(%d, %s, %d, %s) -> %s", level, file, line, func, msg);
+               free(msg);
+       }
+}
+
+static struct afb_hook_global_itf hook_global_default_itf = {
+       .hook_global_vverbose = hook_global_vverbose_default_cb
+};
+
+/******************************************************************************
+ * section: hooks for tracing globals (global)
+ *****************************************************************************/
+
+#define _HOOK_GLOBAL_(what,...)   \
+       struct afb_hook_global *hook; \
+       struct afb_hookid hookid; \
+       pthread_rwlock_rdlock(&rwlock); \
+       init_hookid(&hookid); \
+       hook = list_of_global_hooks; \
+       while (hook) { \
+               if (hook->itf->hook_global_##what \
+                && (hook->flags & afb_hook_flag_global_##what) != 0) { \
+                       hook->itf->hook_global_##what(hook->closure, &hookid, __VA_ARGS__); \
+               } \
+               hook = hook->next; \
+       } \
+       pthread_rwlock_unlock(&rwlock);
+
+static void afb_hook_global_vverbose(int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+       _HOOK_GLOBAL_(vverbose, level, file ?: "?", line, func ?: "?", fmt ?: "", args);
+}
+
+/******************************************************************************
+ * section: hooking globals (global)
+ *****************************************************************************/
+
+static void update_global()
+{
+       struct afb_hook_global *hook;
+       int flags = 0;
+
+       pthread_rwlock_rdlock(&rwlock);
+       hook = list_of_global_hooks;
+       while (hook) {
+               flags = hook->flags;
+               hook = hook->next;
+       }
+       verbose_observer = (flags & afb_hook_flag_global_vverbose) ? afb_hook_global_vverbose : NULL;
+       pthread_rwlock_unlock(&rwlock);
+}
+
+struct afb_hook_global *afb_hook_create_global(int flags, struct afb_hook_global_itf *itf, void *closure)
+{
+       struct afb_hook_global *hook;
+
+       /* alloc the result */
+       hook = calloc(1, sizeof *hook);
+       if (hook == NULL)
+               return NULL;
+
+       /* initialise the rest */
+       hook->refcount = 1;
+       hook->flags = flags;
+       hook->itf = itf ? itf : &hook_global_default_itf;
+       hook->closure = closure;
+
+       /* record the hook */
+       pthread_rwlock_wrlock(&rwlock);
+       hook->next = list_of_global_hooks;
+       list_of_global_hooks = hook;
+       pthread_rwlock_unlock(&rwlock);
+
+       /* update hooking */
+       update_global();
+
+       /* returns it */
+       return hook;
+}
+
+struct afb_hook_global *afb_hook_addref_global(struct afb_hook_global *hook)
+{
+       pthread_rwlock_wrlock(&rwlock);
+       hook->refcount++;
+       pthread_rwlock_unlock(&rwlock);
+       return hook;
+}
+
+void afb_hook_unref_global(struct afb_hook_global *hook)
+{
+       struct afb_hook_global **prv;
+
+       if (hook) {
+               pthread_rwlock_wrlock(&rwlock);
+               if (--hook->refcount)
+                       hook = NULL;
+               else {
+                       /* unlink */
+                       prv = &list_of_global_hooks;
+                       while (*prv && *prv != hook)
+                               prv = &(*prv)->next;
+                       if(*prv)
+                               *prv = hook->next;
+               }
+               pthread_rwlock_unlock(&rwlock);
+               if (hook) {
+                       /* free */
+                       free(hook);
+
+                       /* update hooking */
+                       update_global();
+               }
        }
 }