/*
- * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* limitations under the License.
*/
+#if WITH_AFB_HOOK /***********************************************************/
+
#define _GNU_SOURCE
#include <limits.h>
#include <string.h>
#include <pthread.h>
#include <unistd.h>
-#include <fnmatch.h>
#include <sys/uio.h>
#include <json-c/json.h>
+#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE)
+#define JSON_C_TO_STRING_NOSLASHESCAPE 0
+#endif
-#include <afb/afb-req-common.h>
-#include <afb/afb-event-itf.h>
+#include <afb/afb-req-x1.h>
+#include <afb/afb-event-x2.h>
#include "afb-context.h"
#include "afb-hook.h"
#include "afb-xreq.h"
#include "afb-export.h"
#include "afb-evt.h"
+#include "afb-api.h"
+#include "afb-msg-json.h"
#include "verbose.h"
+#include <fnmatch.h>
+#define MATCH(pattern,string) (\
+ pattern \
+ ? !fnmatch((pattern),(string),FNM_CASEFOLD|FNM_EXTMATCH|FNM_PERIOD) \
+ : afb_api_is_public(string))
+
+#define MATCH_API(pattern,string) MATCH(pattern,string)
+#define MATCH_VERB(pattern,string) MATCH(pattern,string)
+#define MATCH_EVENT(pattern,string) MATCH(pattern,string)
+#define MATCH_SESSION(pattern,string) MATCH(pattern,string)
+
/**
* Definition of a hook for xreq
*/
struct afb_hook_xreq {
struct afb_hook_xreq *next; /**< next hook */
unsigned refcount; /**< reference count */
+ unsigned flags; /**< hook flags */
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 */
};
/**
* Definition of a hook for export
*/
-struct afb_hook_ditf {
- struct afb_hook_ditf *next; /**< next hook */
+struct afb_hook_api {
+ struct afb_hook_api *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 */
+ char *api; /**< api hooked or NULL for any */
+ struct afb_hook_api_itf *itf; /**< interface of hook */
void *closure; /**< closure for callbacks */
};
/**
- * Definition of a hook for export
+ * Definition of a hook for evt
*/
-struct afb_hook_svc {
- struct afb_hook_svc *next; /**< next hook */
+struct afb_hook_evt {
+ struct afb_hook_evt *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 */
+ char *pattern; /**< event pattern name hooked or NULL for any */
+ struct afb_hook_evt_itf *itf; /**< interface of hook */
void *closure; /**< closure for callbacks */
};
/**
- * Definition of a hook for evt
+ * Definition of a hook for session
*/
-struct afb_hook_evt {
- struct afb_hook_evt *next; /**< next hook */
+struct afb_hook_session {
+ struct afb_hook_session *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 */
+ char *pattern; /**< event pattern name hooked or NULL for any */
+ struct afb_hook_session_itf *itf; /**< interface of hook */
void *closure; /**< closure for callbacks */
};
void *closure; /**< closure for callbacks */
};
-/* synchronisation across threads */
+/* synchronization across threads */
static pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
/* list of hooks for xreq */
static struct afb_hook_xreq *list_of_xreq_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;
+static struct afb_hook_api *list_of_api_hooks = NULL;
/* list of hooks for evt */
static struct afb_hook_evt *list_of_evt_hooks = NULL;
+/* list of hooks for session */
+static struct afb_hook_session *list_of_session_hooks = NULL;
+
/* list of hooks for global */
static struct afb_hook_global *list_of_global_hooks = NULL;
static void init_hookid(struct afb_hookid *hookid)
{
hookid->id = __atomic_add_fetch(&next_hookid, 1, __ATOMIC_RELAXED);
- clock_gettime(CLOCK_MONOTONIC, &hookid->time);
+ clock_gettime(CLOCK_REALTIME, &hookid->time);
}
/******************************************************************************
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";
struct iovec iov[5];
va_list arg1;
+ /* "HOOK: [" */
iov[0].iov_base = (void*)&chars[0];
iov[0].iov_len = 7;
+ /* fmt1 ... */
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;
+ /* fmt2 arg2 */
iov[3].iov_base = _pbuf_(fmt2, arg2, &mem2, buf2, sizeof buf2, &iov[3].iov_len);
+ /* "\n" */
iov[4].iov_base = (void*)&chars[9];
iov[4].iov_len = 1;
- writev(2, iov, 5);
+ (void)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);
+ _hook_("xreq-%06d:%s/%s", format, ap, xreq->hookindex, xreq->request.called_api, xreq->request.called_verb);
va_end(ap);
}
-static void hook_xreq_begin_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
+static void hook_xreq_begin_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
{
- if (!xreq->cred)
+ struct afb_cred *cred = xreq->context.credentials;
+
+ if (!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)"
+ (int)cred->uid,
+ cred->user,
+ (int)cred->gid,
+ (int)cred->pid,
+ cred->label?:"(null)",
+ cred->id?:"(null)"
);
}
-static void hook_xreq_end_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
+static void hook_xreq_end_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)
+static void hook_xreq_json_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));
+ _hook_xreq_(xreq, "json() -> %s", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE));
}
-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)
+static void hook_xreq_get_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)
+static void hook_xreq_reply_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info)
{
- _hook_xreq_(xreq, "fail(%s, %s)", status, info);
+ _hook_xreq_(xreq, "reply[%s](%s, %s)", error?:"success", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE), info);
}
-static void hook_xreq_context_get_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, void *value)
+static void hook_xreq_legacy_context_get_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*))
+static void hook_xreq_legacy_context_set_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)
+static void hook_xreq_addref_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)
+static void hook_xreq_unref_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)
+static void hook_xreq_session_close_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)
+static void hook_xreq_session_set_LOA_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)
+static void hook_xreq_subscribe_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_event_x2 *event_x2, int result)
{
- _hook_xreq_(xreq, "subscribe(%s:%d) -> %d", afb_evt_event_name(event), afb_evt_event_id(event), result);
+ _hook_xreq_(xreq, "subscribe(%s:%d) -> %d", afb_evt_event_x2_fullname(event_x2), afb_evt_event_x2_id(event_x2), 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)
+static void hook_xreq_unsubscribe_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_event_x2 *event_x2, int result)
{
- _hook_xreq_(xreq, "unsubscribe(%s:%d) -> %d", afb_evt_event_name(event), afb_evt_event_id(event), result);
+ _hook_xreq_(xreq, "unsubscribe(%s:%d) -> %d", afb_evt_event_x2_fullname(event_x2), afb_evt_event_x2_id(event_x2), 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)
+static void hook_xreq_subcall_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));
+ _hook_xreq_(xreq, "subcall(%s/%s, %s) ...", api, verb, json_object_to_json_string_ext(args, JSON_C_TO_STRING_NOSLASHESCAPE));
}
-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)
+static void hook_xreq_subcall_result_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info)
{
- _hook_xreq_(xreq, " ...subcall... -> %d: %s", status, json_object_to_json_string(result));
+ _hook_xreq_(xreq, " ...subcall... [%s] -> %s (%s)", error?:"success", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE), info?:"");
}
-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)
+static void hook_xreq_subcallsync_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));
+ _hook_xreq_(xreq, "subcallsync(%s/%s, %s) ...", api, verb, json_object_to_json_string_ext(args, JSON_C_TO_STRING_NOSLASHESCAPE));
}
-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)
+static void hook_xreq_subcallsync_result_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, int status, struct json_object *object, const char *error, const char *info)
{
- _hook_xreq_(xreq, " ...subcallsync... -> %d: %s", status, json_object_to_json_string(result));
+ _hook_xreq_(xreq, " ...subcallsync... %d [%s] -> %s (%s)", status, error?:"success", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE), info?:"");
}
-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)
+static void hook_xreq_vverbose_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 *msg;
va_end(ap);
if (len < 0)
- _hook_xreq_(xreq, "vverbose(%d, %s, %d, %s) -> %s ? ? ?", level, file, line, func, fmt);
+ _hook_xreq_(xreq, "vverbose(%d:%s, %s, %d, %s) -> %s ? ? ?", level, verbose_name_of_level(level), file, line, func, fmt);
else {
- _hook_xreq_(xreq, "vverbose(%d, %s, %d, %s) -> %s", level, file, line, func, msg);
+ _hook_xreq_(xreq, "vverbose(%d:%s, %s, %d, %s) -> %s", level, verbose_name_of_level(level), file, line, func, msg);
free(msg);
}
}
-static void hook_xreq_store_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct afb_stored_req *sreq)
+static void hook_xreq_legacy_store_cb(void *closure, const struct afb_hookid *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_hookid *hookid, const struct afb_xreq *xreq)
+static void hook_xreq_legacy_unstore_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
{
_hook_xreq_(xreq, "unstore()");
}
-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)
+static void hook_xreq_has_permission_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, const char *permission, int result)
{
- _hook_xreq_(xreq, "subcall_req(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
+ _hook_xreq_(xreq, "has_permission(%s) -> %d", permission, result);
}
-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)
+static void hook_xreq_get_application_id_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, char *result)
{
- _hook_xreq_(xreq, " ...subcall_req... -> %d: %s", status, json_object_to_json_string(result));
+ _hook_xreq_(xreq, "get_application_id() -> %s", result);
}
-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)
+static void hook_xreq_context_make_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_xreq_(xreq, "has_permission(%s) -> %d", permission, result);
+ _hook_xreq_(xreq, "context_make(replace=%s, %p, %p, %p) -> %p", replace?"yes":"no", create_value, free_value, create_closure, result);
+}
+
+static void hook_xreq_get_uid_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, int result)
+{
+ _hook_xreq_(xreq, "get_uid() -> %d", result);
+}
+
+static void hook_xreq_get_client_info_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, struct json_object *result)
+{
+ _hook_xreq_(xreq, "get_client_info() -> %s", json_object_to_json_string_ext(result, JSON_C_TO_STRING_NOSLASHESCAPE));
}
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_begin = hook_xreq_begin_cb,
+ .hook_xreq_end = hook_xreq_end_cb,
+ .hook_xreq_json = hook_xreq_json_cb,
+ .hook_xreq_get = hook_xreq_get_cb,
+ .hook_xreq_reply = hook_xreq_reply_cb,
+ .hook_xreq_legacy_context_get = hook_xreq_legacy_context_get_cb,
+ .hook_xreq_legacy_context_set = hook_xreq_legacy_context_set_cb,
+ .hook_xreq_addref = hook_xreq_addref_cb,
+ .hook_xreq_unref = hook_xreq_unref_cb,
+ .hook_xreq_session_close = hook_xreq_session_close_cb,
+ .hook_xreq_session_set_LOA = hook_xreq_session_set_LOA_cb,
+ .hook_xreq_subscribe = hook_xreq_subscribe_cb,
+ .hook_xreq_unsubscribe = hook_xreq_unsubscribe_cb,
+ .hook_xreq_subcall = hook_xreq_subcall_cb,
+ .hook_xreq_subcall_result = hook_xreq_subcall_result_cb,
+ .hook_xreq_subcallsync = hook_xreq_subcallsync_cb,
+ .hook_xreq_subcallsync_result = hook_xreq_subcallsync_result_cb,
+ .hook_xreq_vverbose = hook_xreq_vverbose_cb,
+ .hook_xreq_legacy_store = hook_xreq_legacy_store_cb,
+ .hook_xreq_legacy_unstore = hook_xreq_legacy_unstore_cb,
+ .hook_xreq_has_permission = hook_xreq_has_permission_cb,
+ .hook_xreq_get_application_id = hook_xreq_get_application_id_cb,
+ .hook_xreq_context_make = hook_xreq_context_make_cb,
+ .hook_xreq_get_uid = hook_xreq_get_uid_cb,
+ .hook_xreq_get_client_info = hook_xreq_get_client_info_cb,
};
/******************************************************************************
* section: hooks for tracing requests
*****************************************************************************/
-#define _HOOK_XREQ_(what,...) \
+#define _HOOK_XREQ_2_(flag,func,...) \
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 \
+ if (hook->refcount \
+ && hook->itf->hook_xreq_##func \
+ && (hook->flags & afb_hook_flag_req_##flag) != 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__); \
+ && MATCH_API(hook->api, xreq->request.called_api) \
+ && MATCH_VERB(hook->verb, xreq->request.called_verb)) { \
+ hook->itf->hook_xreq_##func(hook->closure, &hookid, __VA_ARGS__); \
} \
hook = hook->next; \
} \
pthread_rwlock_unlock(&rwlock);
+#define _HOOK_XREQ_(what,...) _HOOK_XREQ_2_(what,what,__VA_ARGS__)
void afb_hook_xreq_begin(const struct afb_xreq *xreq)
{
return arg;
}
-void afb_hook_xreq_success(const struct afb_xreq *xreq, struct json_object *obj, const char *info)
-{
- _HOOK_XREQ_(success, xreq, obj, info);
-}
-
-void afb_hook_xreq_fail(const struct afb_xreq *xreq, const char *status, const char *info)
+void afb_hook_xreq_reply(const struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info)
{
- _HOOK_XREQ_(fail, xreq, status, info);
+ _HOOK_XREQ_(reply, xreq, obj, error, info);
}
-void *afb_hook_xreq_context_get(const struct afb_xreq *xreq, void *value)
+void *afb_hook_xreq_legacy_context_get(const struct afb_xreq *xreq, void *value)
{
- _HOOK_XREQ_(context_get, xreq, value);
+ _HOOK_XREQ_(legacy_context_get, xreq, value);
return value;
}
-void afb_hook_xreq_context_set(const struct afb_xreq *xreq, void *value, void (*free_value)(void*))
+void afb_hook_xreq_legacy_context_set(const struct afb_xreq *xreq, void *value, void (*free_value)(void*))
{
- _HOOK_XREQ_(context_set, xreq, value, free_value);
+ _HOOK_XREQ_(legacy_context_set, xreq, value, free_value);
}
void afb_hook_xreq_addref(const struct afb_xreq *xreq)
return result;
}
-int afb_hook_xreq_subscribe(const struct afb_xreq *xreq, struct afb_event event, int result)
+int afb_hook_xreq_subscribe(const struct afb_xreq *xreq, struct afb_event_x2 *event_x2, int result)
{
- _HOOK_XREQ_(subscribe, xreq, event, result);
+ _HOOK_XREQ_(subscribe, xreq, event_x2, result);
return result;
}
-int afb_hook_xreq_unsubscribe(const struct afb_xreq *xreq, struct afb_event event, int result)
+int afb_hook_xreq_unsubscribe(const struct afb_xreq *xreq, struct afb_event_x2 *event_x2, int result)
{
- _HOOK_XREQ_(unsubscribe, xreq, event, result);
+ _HOOK_XREQ_(unsubscribe, xreq, event_x2, result);
return result;
}
-void afb_hook_xreq_subcall(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+void afb_hook_xreq_subcall(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, int flags)
{
_HOOK_XREQ_(subcall, xreq, api, verb, args);
}
-void afb_hook_xreq_subcall_result(const struct afb_xreq *xreq, int status, struct json_object *result)
+void afb_hook_xreq_subcall_result(const struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info)
{
- _HOOK_XREQ_(subcall_result, xreq, status, result);
+ _HOOK_XREQ_(subcall_result, xreq, object, error, info);
}
-void afb_hook_xreq_subcallsync(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+void afb_hook_xreq_subcallsync(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, int flags)
{
_HOOK_XREQ_(subcallsync, xreq, api, verb, args);
}
-int afb_hook_xreq_subcallsync_result(const struct afb_xreq *xreq, int status, struct json_object *result)
+int afb_hook_xreq_subcallsync_result(const struct afb_xreq *xreq, int status, struct json_object *object, const char *error, const char *info)
{
- _HOOK_XREQ_(subcallsync_result, xreq, status, result);
+ _HOOK_XREQ_(subcallsync_result, xreq, status, object, error, info);
return status;
}
_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)
+void afb_hook_xreq_legacy_store(const struct afb_xreq *xreq, struct afb_stored_req *sreq)
{
- _HOOK_XREQ_(store, xreq, sreq);
+ _HOOK_XREQ_(legacy_store, xreq, sreq);
}
-void afb_hook_xreq_unstore(const struct afb_xreq *xreq)
+void afb_hook_xreq_legacy_unstore(const struct afb_xreq *xreq)
{
- _HOOK_XREQ_(unstore, xreq);
+ _HOOK_XREQ_(legacy_unstore, xreq);
}
-void afb_hook_xreq_subcall_req(const struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args)
+int afb_hook_xreq_has_permission(const struct afb_xreq *xreq, const char *permission, int result)
{
- _HOOK_XREQ_(subcall_req, xreq, api, verb, args);
+ _HOOK_XREQ_(has_permission, xreq, permission, result);
+ return result;
}
-void afb_hook_xreq_subcall_req_result(const struct afb_xreq *xreq, int status, struct json_object *result)
+char *afb_hook_xreq_get_application_id(const struct afb_xreq *xreq, char *result)
{
- _HOOK_XREQ_(subcall_req_result, xreq, status, result);
+ _HOOK_XREQ_(get_application_id, xreq, result);
+ return result;
}
-int afb_hook_xreq_has_permission(const struct afb_xreq *xreq, const char *permission, int 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_(has_permission, xreq, permission, result);
+ _HOOK_XREQ_(context_make, xreq, replace, create_value, free_value, create_closure, result);
+ return result;
+}
+
+int afb_hook_xreq_get_uid(const struct afb_xreq *xreq, int result)
+{
+ _HOOK_XREQ_(get_uid, xreq, result);
+ return result;
+}
+
+struct json_object *afb_hook_xreq_get_client_info(const struct afb_xreq *xreq, struct json_object *result)
+{
+ _HOOK_XREQ_(get_client_info, xreq, result);
return result;
}
void afb_hook_init_xreq(struct afb_xreq *xreq)
{
- static int reqindex;
+ static int reqindex = 0;
int f, flags;
- int add;
+ int add, x;
struct afb_hook_xreq *hook;
/* scan hook list to get the expected flags */
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));
+ && MATCH_API(hook->api, xreq->request.called_api)
+ && MATCH_VERB(hook->verb, xreq->request.called_verb);
if (add)
flags |= f;
hook = hook->next;
/* 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);
+ do {
+ x = __atomic_load_n(&reqindex, __ATOMIC_RELAXED);
+ xreq->hookindex = (x + 1) % 1000000 ?: 1;
+ } while (x != __atomic_exchange_n(&reqindex, xreq->hookindex, __ATOMIC_RELAXED));
}
}
hook->closure = closure;
/* record the hook */
- pthread_rwlock_wrlock(&rwlock);
+ pthread_mutex_lock(&mutex);
hook->next = list_of_xreq_hooks;
list_of_xreq_hooks = hook;
- pthread_rwlock_unlock(&rwlock);
+ pthread_mutex_unlock(&mutex);
/* returns it */
return hook;
struct afb_hook_xreq *afb_hook_addref_xreq(struct afb_hook_xreq *hook)
{
- pthread_rwlock_wrlock(&rwlock);
- hook->refcount++;
- pthread_rwlock_unlock(&rwlock);
+ __atomic_add_fetch(&hook->refcount, 1, __ATOMIC_RELAXED);
return hook;
}
-void afb_hook_unref_xreq(struct afb_hook_xreq *hook)
+static void hook_clean_xreq()
{
- struct afb_hook_xreq **prv;
+ struct afb_hook_xreq **prv, *hook, *head;
- if (hook) {
- pthread_rwlock_wrlock(&rwlock);
- if (--hook->refcount)
- hook = NULL;
- else {
- /* unlink */
- prv = &list_of_xreq_hooks;
- while (*prv && *prv != hook)
+ if (pthread_rwlock_trywrlock(&rwlock) == 0) {
+ /* unlink under mutex */
+ head = NULL;
+ pthread_mutex_lock(&mutex);
+ prv = &list_of_xreq_hooks;
+ while ((hook = *prv)) {
+ if (hook->refcount)
prv = &(*prv)->next;
- if(*prv)
+ else {
*prv = hook->next;
+ hook->next = head;
+ head = hook;
+ }
}
+ pthread_mutex_unlock(&mutex);
pthread_rwlock_unlock(&rwlock);
- if (hook) {
- /* free */
+
+ /* free found hooks */
+ while((hook = head)) {
+ head = hook->next;
free(hook->api);
free(hook->verb);
if (hook->session)
}
}
+void afb_hook_unref_xreq(struct afb_hook_xreq *hook)
+{
+ if (hook && !__atomic_sub_fetch(&hook->refcount, 1, __ATOMIC_RELAXED))
+ hook_clean_xreq();
+}
+
/******************************************************************************
* section: default callbacks for tracing daemon interface
*****************************************************************************/
-static void _hook_ditf_(const struct afb_export *export, const char *format, ...)
+static void _hook_api_(const struct afb_export *export, const char *format, ...)
{
va_list ap;
va_start(ap, format);
- _hook_("export-%s", format, ap, afb_export_apiname(export));
+ _hook_("api-%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)
+static void hook_api_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));
+ _hook_api_(export, "event_broadcast.before(%s, %s)....", name, json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
}
-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)
+static void hook_api_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);
+ _hook_api_(export, "event_broadcast.after(%s, %s) -> %d", name, json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE), 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)
+static void hook_api_get_event_loop_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct sd_event *result)
{
- _hook_ditf_(export, "get_event_loop() -> %p", result);
+ _hook_api_(export, "get_event_loop() -> %p", result);
}
-static void hook_ditf_get_user_bus_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct sd_bus *result)
+static void hook_api_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);
+ _hook_api_(export, "get_user_bus() -> %p", result);
}
-static void hook_ditf_get_system_bus_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct sd_bus *result)
+static void hook_api_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);
+ _hook_api_(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)
+static void hook_api_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_end(ap);
if (len < 0)
- _hook_ditf_(export, "vverbose(%d, %s, %d, %s) -> %s ? ? ?", level, file, line, function, fmt);
+ _hook_api_(export, "vverbose(%d:%s, %s, %d, %s) -> %s ? ? ?", level, verbose_name_of_level(level), file, line, function, fmt);
else {
- _hook_ditf_(export, "vverbose(%d, %s, %d, %s) -> %s", level, file, line, function, msg);
+ _hook_api_(export, "vverbose(%d:%s, %s, %d, %s) -> %s", level, verbose_name_of_level(level), file, line, function, msg);
free(msg);
}
}
-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)
+static void hook_api_event_make_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, struct afb_event_x2 *result)
{
- _hook_ditf_(export, "event_make(%s) -> %s:%d", name, afb_evt_event_name(result), afb_evt_event_id(result));
+ _hook_api_(export, "event_make(%s) -> %s:%d", name, afb_evt_event_x2_fullname(result), afb_evt_event_x2_id(result));
}
-static void hook_ditf_rootdir_get_fd_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result)
+static void hook_api_rootdir_get_fd_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result)
{
- char path[PATH_MAX];
+ char path[PATH_MAX], proc[100];
+ ssize_t s;
+
if (result < 0)
- _hook_ditf_(export, "rootdir_get_fd() -> %d, %m", result);
+ _hook_api_(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);
+ snprintf(proc, sizeof proc, "/proc/self/fd/%d", result);
+ s = readlink(proc, path, sizeof path);
+ path[s < 0 ? 0 : s >= sizeof path ? sizeof path - 1 : s] = 0;
+ _hook_api_(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)
+static void hook_api_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];
+ char path[PATH_MAX], proc[100];
+ ssize_t s;
+
if (!locale)
locale = "(null)";
if (result < 0)
- _hook_ditf_(export, "rootdir_open_locale(%s, %d, %s) -> %d, %m", filename, flags, locale, result);
+ _hook_api_(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);
+ snprintf(proc, sizeof proc, "/proc/self/fd/%d", result);
+ s = readlink(proc, path, sizeof path);
+ path[s < 0 ? 0 : s >= sizeof path ? sizeof path - 1 : s] = 0;
+ _hook_api_(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)
+static void hook_api_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_api_(export, "queue_job(%p, %p, %p, %d) -> %d", callback, argument, group, timeout, result);
+}
+
+static void hook_api_unstore_req_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct afb_stored_req *sreq)
{
- _hook_ditf_(export, "queue_job(%p, %p, %p, %d) -> %d", callback, argument, group, timeout, result);
+ _hook_api_(export, "unstore_req(%p)", sreq);
}
-static void hook_ditf_unstore_req_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct afb_stored_req *sreq)
+static void hook_api_require_api_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, int initialized)
{
- _hook_ditf_(export, "unstore_req(%p)", sreq);
+ _hook_api_(export, "require_api(%s, %d)...", name, initialized);
}
-static void hook_ditf_require_api_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *name, int initialized)
+static void hook_api_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)...", name, initialized);
+ _hook_api_(export, "...require_api(%s, %d) -> %d", name, initialized, result);
}
-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)
+static void hook_api_add_alias_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *api, const char *alias, int result)
{
- _hook_ditf_(export, "...require_api(%s, %d) -> %d", name, initialized, result);
+ _hook_api_(export, "add_alias(%s -> %s) -> %d", api, alias?:"<null>", 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)
+static void hook_api_start_before_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export)
{
- _hook_ditf_(export, "rename_api(%s -> %s) -> %d", oldname, newname, result);
+ _hook_api_(export, "start.before");
}
-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
+static void hook_api_start_after_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int status)
+{
+ _hook_api_(export, "start.after -> %d", status);
+}
+
+static void hook_api_on_event_before_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int event_x2, struct json_object *object)
+{
+ _hook_api_(export, "on_event.before(%s, %d, %s)", event, event_x2, json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
+}
+
+static void hook_api_on_event_after_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int event_x2, struct json_object *object)
+{
+ _hook_api_(export, "on_event.after(%s, %d, %s)", event, event_x2, json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
+}
+
+static void hook_api_call_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+ _hook_api_(export, "call(%s/%s, %s) ...", api, verb, json_object_to_json_string_ext(args, JSON_C_TO_STRING_NOSLASHESCAPE));
+}
+
+static void hook_api_call_result_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct json_object *object, const char *error, const char *info)
+{
+ _hook_api_(export, " ...call... [%s] -> %s (%s)", error?:"success", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE), info?:"");
+}
+
+static void hook_api_callsync_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+ _hook_api_(export, "callsync(%s/%s, %s) ...", api, verb, json_object_to_json_string_ext(args, JSON_C_TO_STRING_NOSLASHESCAPE));
+}
+
+static void hook_api_callsync_result_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int status, struct json_object *object, const char *error, const char *info)
+{
+ _hook_api_(export, " ...callsync... %d [%s] -> %s (%s)", status, error?:"success", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE), info?:"");
+}
+
+static void hook_api_new_api_before_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *api, const char *info, int noconcurrency)
+{
+ _hook_api_(export, "new_api.before %s (%s)%s ...", api, info?:"", noconcurrency?" no-concurrency" : "");
+}
+
+static void hook_api_new_api_after_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const char *api)
+{
+ _hook_api_(export, "... new_api.after %s -> %s (%d)", api, result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_api_set_verbs_v2_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const struct afb_verb_v2 *verbs)
+{
+ _hook_api_(export, "set_verbs_v2 -> %s (%d)", result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_api_set_verbs_v3_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const struct afb_verb_v3 *verbs)
+{
+ _hook_api_(export, "set_verbs_v3 -> %s (%d)", result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_api_add_verb_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const char *verb, const char *info, int glob)
+{
+ _hook_api_(export, "add_verb(%s%s [%s]) -> %s (%d)", verb, glob?" (GLOB)":"", info?:"", result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_api_del_verb_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const char *verb)
+{
+ _hook_api_(export, "del_verb(%s) -> %s (%d)", verb, result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_api_set_on_event_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result)
+{
+ _hook_api_(export, "set_on_event -> %s (%d)", result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_api_set_on_init_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result)
+{
+ _hook_api_(export, "set_on_init -> %s (%d)", result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_api_seal_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export)
+{
+ _hook_api_(export, "seal");
+}
+
+static void hook_api_event_handler_add_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const char *pattern)
+{
+ _hook_api_(export, "event_handler_add(%s) -> %s (%d)", pattern, result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_event_handler_del_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const char *pattern)
+{
+ _hook_api_(export, "event_handler_del(%s) -> %s (%d)", pattern, result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_class_provide_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const char *name)
+{
+ _hook_api_(export, "class_provide(%s) -> %s (%d)", name, result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_class_require_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result, const char *name)
+{
+ _hook_api_(export, "class_require(%s) -> %s (%d)", name, result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_delete_api_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int result)
+{
+ _hook_api_(export, "delete_api -> %s (%d)", result >= 0 ? "OK" : "ERROR", result);
+}
+
+static void hook_api_on_event_handler_before_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int event_x2, struct json_object *object, const char *pattern)
+{
+ _hook_api_(export, "on_event_handler[%s].before(%s, %d, %s)", pattern, event, event_x2, json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
+}
+
+static void hook_api_on_event_handler_after_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, const char *event, int event_x2, struct json_object *object, const char *pattern)
+{
+ _hook_api_(export, "on_event_handler[%s].after(%s, %d, %s)", pattern, event, event_x2, json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
+}
+
+static void hook_api_settings_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct json_object *object)
+{
+ _hook_api_(export, "settings -> %s", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
+}
+
+static struct afb_hook_api_itf hook_api_default_itf = {
+ .hook_api_event_broadcast_before = hook_api_event_broadcast_before_cb,
+ .hook_api_event_broadcast_after = hook_api_event_broadcast_after_cb,
+ .hook_api_get_event_loop = hook_api_get_event_loop_cb,
+ .hook_api_get_user_bus = hook_api_get_user_bus_cb,
+ .hook_api_get_system_bus = hook_api_get_system_bus_cb,
+ .hook_api_vverbose = hook_api_vverbose_cb,
+ .hook_api_event_make = hook_api_event_make_cb,
+ .hook_api_rootdir_get_fd = hook_api_rootdir_get_fd_cb,
+ .hook_api_rootdir_open_locale = hook_api_rootdir_open_locale_cb,
+ .hook_api_queue_job = hook_api_queue_job_cb,
+ .hook_api_legacy_unstore_req = hook_api_unstore_req_cb,
+ .hook_api_require_api = hook_api_require_api_cb,
+ .hook_api_require_api_result = hook_api_require_api_result_cb,
+ .hook_api_add_alias = hook_api_add_alias_cb,
+ .hook_api_start_before = hook_api_start_before_cb,
+ .hook_api_start_after = hook_api_start_after_cb,
+ .hook_api_on_event_before = hook_api_on_event_before_cb,
+ .hook_api_on_event_after = hook_api_on_event_after_cb,
+ .hook_api_call = hook_api_call_cb,
+ .hook_api_call_result = hook_api_call_result_cb,
+ .hook_api_callsync = hook_api_callsync_cb,
+ .hook_api_callsync_result = hook_api_callsync_result_cb,
+ .hook_api_new_api_before = hook_api_new_api_before_cb,
+ .hook_api_new_api_after = hook_api_new_api_after_cb,
+ .hook_api_api_set_verbs_v2 = hook_api_api_set_verbs_v2_cb,
+ .hook_api_api_set_verbs_v3 = hook_api_api_set_verbs_v3_cb,
+ .hook_api_api_add_verb = hook_api_api_add_verb_cb,
+ .hook_api_api_del_verb = hook_api_api_del_verb_cb,
+ .hook_api_api_set_on_event = hook_api_api_set_on_event_cb,
+ .hook_api_api_set_on_init = hook_api_api_set_on_init_cb,
+ .hook_api_api_seal = hook_api_api_seal_cb,
+ .hook_api_event_handler_add = hook_api_event_handler_add_cb,
+ .hook_api_event_handler_del = hook_api_event_handler_del_cb,
+ .hook_api_class_provide = hook_api_class_provide_cb,
+ .hook_api_class_require = hook_api_class_require_cb,
+ .hook_api_delete_api = hook_api_delete_api_cb,
+ .hook_api_on_event_handler_before = hook_api_on_event_handler_before_cb,
+ .hook_api_on_event_handler_after = hook_api_on_event_handler_after_cb,
+ .hook_api_settings = hook_api_settings_cb,
};
/******************************************************************************
* section: hooks for tracing daemon interface (export)
*****************************************************************************/
-#define _HOOK_DITF_(what,...) \
- struct afb_hook_ditf *hook; \
+#define _HOOK_API_2_(flag,func,...) \
+ struct afb_hook_api *hook; \
struct afb_hookid hookid; \
const char *apiname = afb_export_apiname(export); \
pthread_rwlock_rdlock(&rwlock); \
init_hookid(&hookid); \
- hook = list_of_ditf_hooks; \
+ hook = list_of_api_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__); \
+ if (hook->refcount \
+ && hook->itf->hook_api_##func \
+ && (hook->flags & afb_hook_flag_api_##flag) != 0 \
+ && MATCH_API(hook->api, apiname)) { \
+ hook->itf->hook_api_##func(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)
+#define _HOOK_API_(what,...) _HOOK_API_2_(what,what,__VA_ARGS__)
+
+void afb_hook_api_event_broadcast_before(const struct afb_export *export, const char *name, struct json_object *object)
{
- _HOOK_DITF_(event_broadcast_before, export, name, object);
+ _HOOK_API_2_(event_broadcast, 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)
+int afb_hook_api_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);
+ _HOOK_API_2_(event_broadcast, 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)
+struct sd_event *afb_hook_api_get_event_loop(const struct afb_export *export, struct sd_event *result)
{
- _HOOK_DITF_(get_event_loop, export, result);
+ _HOOK_API_(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 sd_bus *afb_hook_api_get_user_bus(const struct afb_export *export, struct sd_bus *result)
{
- _HOOK_DITF_(get_user_bus, export, result);
+ _HOOK_API_(get_user_bus, export, result);
return result;
}
-struct sd_bus *afb_hook_ditf_get_system_bus(const struct afb_export *export, struct sd_bus *result)
+struct sd_bus *afb_hook_api_get_system_bus(const struct afb_export *export, struct sd_bus *result)
{
- _HOOK_DITF_(get_system_bus, export, result);
+ _HOOK_API_(get_system_bus, export, result);
return result;
}
-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)
+void afb_hook_api_vverbose(const struct afb_export *export, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
{
- _HOOK_DITF_(vverbose, export, level, file, line, function, fmt, args);
+ _HOOK_API_(vverbose, export, level, file, line, function, fmt, args);
}
-struct afb_event afb_hook_ditf_event_make(const struct afb_export *export, const char *name, struct afb_event result)
+struct afb_event_x2 *afb_hook_api_event_make(const struct afb_export *export, const char *name, struct afb_event_x2 *result)
{
- _HOOK_DITF_(event_make, export, name, result);
+ _HOOK_API_(event_make, export, name, result);
return result;
}
-int afb_hook_ditf_rootdir_get_fd(const struct afb_export *export, int result)
+int afb_hook_api_rootdir_get_fd(const struct afb_export *export, int result)
{
- _HOOK_DITF_(rootdir_get_fd, export, result);
+ _HOOK_API_(rootdir_get_fd, export, result);
return result;
}
-int afb_hook_ditf_rootdir_open_locale(const struct afb_export *export, const char *filename, int flags, const char *locale, int result)
+int afb_hook_api_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);
+ _HOOK_API_(rootdir_open_locale, export, filename, flags, locale, result);
return result;
}
-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)
+int afb_hook_api_queue_job(const struct afb_export *export, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout, int result)
{
- _HOOK_DITF_(queue_job, export, callback, argument, group, timeout, result);
+ _HOOK_API_(queue_job, export, callback, argument, group, timeout, result);
return result;
}
-void afb_hook_ditf_unstore_req(const struct afb_export *export, struct afb_stored_req *sreq)
+void afb_hook_api_legacy_unstore_req(const struct afb_export *export, struct afb_stored_req *sreq)
+{
+ _HOOK_API_(legacy_unstore_req, export, sreq);
+}
+
+void afb_hook_api_require_api(const struct afb_export *export, const char *name, int initialized)
{
- _HOOK_DITF_(unstore_req, export, sreq);
+ _HOOK_API_(require_api, export, name, initialized);
}
-void afb_hook_ditf_require_api(const struct afb_export *export, const char *name, int initialized)
+int afb_hook_api_require_api_result(const struct afb_export *export, const char *name, int initialized, int result)
{
- _HOOK_DITF_(require_api, export, name, initialized);
+ _HOOK_API_2_(require_api, require_api_result, export, name, initialized, result);
+ return result;
}
-int afb_hook_ditf_require_api_result(const struct afb_export *export, const char *name, int initialized, int result)
+int afb_hook_api_add_alias(const struct afb_export *export, const char *api, const char *alias, int result)
{
- _HOOK_DITF_(require_api_result, export, name, initialized, result);
+ _HOOK_API_(add_alias, export, api, alias, result);
return result;
}
-int afb_hook_ditf_rename_api(const struct afb_export *export, const char *oldname, const char *newname, int result)
+void afb_hook_api_start_before(const struct afb_export *export)
+{
+ _HOOK_API_2_(start, start_before, export);
+}
+
+int afb_hook_api_start_after(const struct afb_export *export, int status)
+{
+ _HOOK_API_2_(start, start_after, export, status);
+ return status;
+}
+
+void afb_hook_api_on_event_before(const struct afb_export *export, const char *event, int event_x2, struct json_object *object)
+{
+ _HOOK_API_2_(on_event, on_event_before, export, event, event_x2, object);
+}
+
+void afb_hook_api_on_event_after(const struct afb_export *export, const char *event, int event_x2, struct json_object *object)
+{
+ _HOOK_API_2_(on_event, on_event_after, export, event, event_x2, object);
+}
+
+void afb_hook_api_call(const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+ _HOOK_API_(call, export, api, verb, args);
+}
+
+void afb_hook_api_call_result(const struct afb_export *export, struct json_object *object, const char*error, const char *info)
+{
+ _HOOK_API_2_(call, call_result, export, object, error, info);
+
+}
+
+void afb_hook_api_callsync(const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+{
+ _HOOK_API_(callsync, export, api, verb, args);
+}
+
+int afb_hook_api_callsync_result(const struct afb_export *export, int status, struct json_object *object, const char *error, const char *info)
+{
+ _HOOK_API_2_(callsync, callsync_result, export, status, object, error, info);
+ return status;
+}
+
+void afb_hook_api_new_api_before(const struct afb_export *export, const char *api, const char *info, int noconcurrency)
+{
+ _HOOK_API_2_(new_api, new_api_before, export, api, info, noconcurrency);
+}
+
+int afb_hook_api_new_api_after(const struct afb_export *export, int result, const char *api)
{
- _HOOK_DITF_(rename_api, export, oldname, newname, result);
+ _HOOK_API_2_(new_api, new_api_after, export, result, api);
return result;
}
+int afb_hook_api_api_set_verbs_v2(const struct afb_export *export, int result, const struct afb_verb_v2 *verbs)
+{
+ _HOOK_API_2_(api_set_verbs, api_set_verbs_v2, export, result, verbs);
+ return result;
+}
+
+int afb_hook_api_api_set_verbs_v3(const struct afb_export *export, int result, const struct afb_verb_v3 *verbs)
+{
+ _HOOK_API_2_(api_set_verbs, api_set_verbs_v3, export, result, verbs);
+ return result;
+}
+
+int afb_hook_api_api_add_verb(const struct afb_export *export, int result, const char *verb, const char *info, int glob)
+{
+ _HOOK_API_(api_add_verb, export, result, verb, info, glob);
+ return result;
+}
+
+int afb_hook_api_api_del_verb(const struct afb_export *export, int result, const char *verb)
+{
+ _HOOK_API_(api_del_verb, export, result, verb);
+ return result;
+}
+
+int afb_hook_api_api_set_on_event(const struct afb_export *export, int result)
+{
+ _HOOK_API_(api_set_on_event, export, result);
+ return result;
+}
+
+int afb_hook_api_api_set_on_init(const struct afb_export *export, int result)
+{
+ _HOOK_API_(api_set_on_init, export, result);
+ return result;
+}
+
+void afb_hook_api_api_seal(const struct afb_export *export)
+{
+ _HOOK_API_(api_seal, export);
+}
+
+int afb_hook_api_event_handler_add(const struct afb_export *export, int result, const char *pattern)
+{
+ _HOOK_API_(event_handler_add, export, result, pattern);
+ return result;
+}
+int afb_hook_api_event_handler_del(const struct afb_export *export, int result, const char *pattern)
+{
+ _HOOK_API_(event_handler_del, export, result, pattern);
+ return result;
+}
+int afb_hook_api_class_provide(const struct afb_export *export, int result, const char *name)
+{
+ _HOOK_API_(class_provide, export, result, name);
+ return result;
+}
+int afb_hook_api_class_require(const struct afb_export *export, int result, const char *name)
+{
+ _HOOK_API_(class_require, export, result, name);
+ return result;
+}
+
+int afb_hook_api_delete_api(const struct afb_export *export, int result)
+{
+ _HOOK_API_(delete_api, export, result);
+ return result;
+}
+
+void afb_hook_api_on_event_handler_before(const struct afb_export *export, const char *event, int event_x2, struct json_object *object, const char *pattern)
+{
+ _HOOK_API_2_(on_event_handler, on_event_handler_before, export, event, event_x2, object, pattern);
+}
+
+void afb_hook_api_on_event_handler_after(const struct afb_export *export, const char *event, int event_x2, struct json_object *object, const char *pattern)
+{
+ _HOOK_API_2_(on_event_handler, on_event_handler_after, export, event, event_x2, object, pattern);
+}
+
+struct json_object *afb_hook_api_settings(const struct afb_export *export, struct json_object *object)
+{
+ _HOOK_API_(settings, export, object);
+ return object;
+}
+
/******************************************************************************
* section: hooking export
*****************************************************************************/
-int afb_hook_flags_ditf(const char *api)
+int afb_hook_flags_api(const char *api)
{
int flags;
- struct afb_hook_ditf *hook;
+ struct afb_hook_api *hook;
- pthread_rwlock_rdlock(&rwlock);
flags = 0;
- hook = list_of_ditf_hooks;
+ pthread_rwlock_rdlock(&rwlock);
+ hook = list_of_api_hooks;
while (hook) {
- if (!api || !hook->api || !strcasecmp(hook->api, api))
+ if (!api || MATCH_API(hook->api, api))
flags |= hook->flags;
hook = hook->next;
}
return flags;
}
-struct afb_hook_ditf *afb_hook_create_ditf(const char *api, int flags, struct afb_hook_ditf_itf *itf, void *closure)
+struct afb_hook_api *afb_hook_create_api(const char *api, int flags, struct afb_hook_api_itf *itf, void *closure)
{
- struct afb_hook_ditf *hook;
+ struct afb_hook_api *hook;
/* alloc the result */
hook = calloc(1, sizeof *hook);
/* initialise the rest */
hook->refcount = 1;
hook->flags = flags;
- hook->itf = itf ? itf : &hook_ditf_default_itf;
+ hook->itf = itf ? itf : &hook_api_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);
+ pthread_mutex_lock(&mutex);
+ hook->next = list_of_api_hooks;
+ list_of_api_hooks = hook;
+ pthread_mutex_unlock(&mutex);
/* returns it */
return hook;
}
-struct afb_hook_ditf *afb_hook_addref_ditf(struct afb_hook_ditf *hook)
+struct afb_hook_api *afb_hook_addref_api(struct afb_hook_api *hook)
{
- pthread_rwlock_wrlock(&rwlock);
- hook->refcount++;
- pthread_rwlock_unlock(&rwlock);
+ __atomic_add_fetch(&hook->refcount, 1, __ATOMIC_RELAXED);
return hook;
}
-void afb_hook_unref_ditf(struct afb_hook_ditf *hook)
+static void hook_clean_api()
{
- struct afb_hook_ditf **prv;
+ struct afb_hook_api **prv, *hook, *head;
- if (hook) {
- pthread_rwlock_wrlock(&rwlock);
- if (--hook->refcount)
- hook = NULL;
- else {
- /* unlink */
- prv = &list_of_ditf_hooks;
- while (*prv && *prv != hook)
+ if (pthread_rwlock_trywrlock(&rwlock) == 0) {
+ /* unlink under mutex */
+ head = NULL;
+ pthread_mutex_lock(&mutex);
+ prv = &list_of_api_hooks;
+ while ((hook = *prv)) {
+ if (hook->refcount)
prv = &(*prv)->next;
- if(*prv)
+ else {
*prv = hook->next;
+ hook->next = head;
+ head = hook;
+ }
}
+ pthread_mutex_unlock(&mutex);
pthread_rwlock_unlock(&rwlock);
- if (hook) {
- /* free */
+
+ /* free found hooks */
+ while((hook = head)) {
+ head = hook->next;
free(hook->api);
free(hook);
}
}
}
+void afb_hook_unref_api(struct afb_hook_api *hook)
+{
+ if (hook && !__atomic_sub_fetch(&hook->refcount, 1, __ATOMIC_RELAXED))
+ hook_clean_api();
+}
+
/******************************************************************************
- * section: default callbacks for tracing service interface (export)
+ * section: default callbacks for tracing service interface (evt)
*****************************************************************************/
-static void _hook_svc_(const struct afb_export *export, const char *format, ...)
+static void _hook_evt_(const char *evt, int id, const char *format, ...)
{
va_list ap;
va_start(ap, format);
- _hook_("export-%s", format, ap, afb_export_apiname(export));
+ _hook_("evt-%s:%d", format, ap, evt, id);
va_end(ap);
}
-static void hook_svc_start_before_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export)
+static void hook_evt_create_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
{
- _hook_svc_(export, "start.before");
+ _hook_evt_(evt, id, "create");
}
-static void hook_svc_start_after_default_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, int status)
+static void hook_evt_push_before_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id, struct json_object *obj)
{
- _hook_svc_(export, "start.after -> %d", status);
+ _hook_evt_(evt, id, "push.before(%s)", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE));
}
-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)
+
+static void hook_evt_push_after_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id, struct json_object *obj, int result)
{
- _hook_svc_(export, "on_event.before(%s, %d, %s)", event, eventid, json_object_to_json_string(object));
+ _hook_evt_(evt, id, "push.after(%s) -> %d", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE), result);
}
-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)
+static void hook_evt_broadcast_before_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id, struct json_object *obj)
{
- _hook_svc_(export, "on_event.after(%s, %d, %s)", event, eventid, json_object_to_json_string(object));
+ _hook_evt_(evt, id, "broadcast.before(%s)", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE));
}
-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)
+static void hook_evt_broadcast_after_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id, struct json_object *obj, int result)
{
- _hook_svc_(export, "call(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
+ _hook_evt_(evt, id, "broadcast.after(%s) -> %d", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE), result);
}
-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)
+static void hook_evt_name_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id, const char *result)
{
- _hook_svc_(export, " ...call... -> %d: %s", status, json_object_to_json_string(result));
+ _hook_evt_(evt, id, "name -> %s", result);
}
-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)
+static void hook_evt_addref_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
{
- _hook_svc_(export, "callsync(%s/%s, %s) ...", api, verb, json_object_to_json_string(args));
+ _hook_evt_(evt, id, "addref");
}
-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)
+static void hook_evt_unref_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
{
- _hook_svc_(export, " ...callsync... -> %d: %s", status, json_object_to_json_string(result));
+ _hook_evt_(evt, id, "unref");
}
-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
+static struct afb_hook_evt_itf hook_evt_default_itf = {
+ .hook_evt_create = hook_evt_create_cb,
+ .hook_evt_push_before = hook_evt_push_before_cb,
+ .hook_evt_push_after = hook_evt_push_after_cb,
+ .hook_evt_broadcast_before = hook_evt_broadcast_before_cb,
+ .hook_evt_broadcast_after = hook_evt_broadcast_after_cb,
+ .hook_evt_name = hook_evt_name_cb,
+ .hook_evt_addref = hook_evt_addref_cb,
+ .hook_evt_unref = hook_evt_unref_cb
};
/******************************************************************************
- * section: hooks for tracing service interface (export)
+ * section: hooks for tracing events interface (evt)
*****************************************************************************/
-#define _HOOK_SVC_(what,...) \
- struct afb_hook_svc *hook; \
+#define _HOOK_EVT_(what,...) \
+ struct afb_hook_evt *hook; \
struct afb_hookid hookid; \
- const char *apiname = afb_export_apiname(export); \
pthread_rwlock_rdlock(&rwlock); \
init_hookid(&hookid); \
- hook = list_of_svc_hooks; \
+ hook = list_of_evt_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__); \
+ if (hook->refcount \
+ && hook->itf->hook_evt_##what \
+ && (hook->flags & afb_hook_flag_evt_##what) != 0 \
+ && MATCH_EVENT(hook->pattern, evt)) { \
+ hook->itf->hook_evt_##what(hook->closure, &hookid, __VA_ARGS__); \
} \
hook = hook->next; \
} \
pthread_rwlock_unlock(&rwlock);
-void afb_hook_svc_start_before(const struct afb_export *export)
+void afb_hook_evt_create(const char *evt, int id)
{
- _HOOK_SVC_(start_before, export);
+ _HOOK_EVT_(create, evt, id);
}
-int afb_hook_svc_start_after(const struct afb_export *export, int status)
+void afb_hook_evt_push_before(const char *evt, int id, struct json_object *obj)
{
- _HOOK_SVC_(start_after, export, status);
- return status;
+ _HOOK_EVT_(push_before, evt, id, obj);
}
-void afb_hook_svc_on_event_before(const struct afb_export *export, const char *event, int eventid, struct json_object *object)
+int afb_hook_evt_push_after(const char *evt, int id, struct json_object *obj, int result)
{
- _HOOK_SVC_(on_event_before, export, event, eventid, object);
+ _HOOK_EVT_(push_after, evt, id, obj, result);
+ return result;
}
-void afb_hook_svc_on_event_after(const struct afb_export *export, const char *event, int eventid, struct json_object *object)
+void afb_hook_evt_broadcast_before(const char *evt, int id, struct json_object *obj)
{
- _HOOK_SVC_(on_event_after, export, event, eventid, object);
+ _HOOK_EVT_(broadcast_before, evt, id, obj);
}
-void afb_hook_svc_call(const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+int afb_hook_evt_broadcast_after(const char *evt, int id, struct json_object *obj, int result)
{
- _HOOK_SVC_(call, export, api, verb, args);
+ _HOOK_EVT_(broadcast_after, evt, id, obj, result);
+ return result;
}
-void afb_hook_svc_call_result(const struct afb_export *export, int status, struct json_object *result)
+void afb_hook_evt_name(const char *evt, int id, const char *result)
{
- _HOOK_SVC_(call_result, export, status, result);
+ _HOOK_EVT_(name, evt, id, result);
}
-void afb_hook_svc_callsync(const struct afb_export *export, const char *api, const char *verb, struct json_object *args)
+void afb_hook_evt_addref(const char *evt, int id)
{
- _HOOK_SVC_(callsync, export, api, verb, args);
+ _HOOK_EVT_(addref, evt, id);
}
-int afb_hook_svc_callsync_result(const struct afb_export *export, int status, struct json_object *result)
+void afb_hook_evt_unref(const char *evt, int id)
{
- _HOOK_SVC_(callsync_result, export, status, result);
- return status;
+ _HOOK_EVT_(unref, evt, id);
}
/******************************************************************************
- * section: hooking services (export)
+ * section: hooking services (evt)
*****************************************************************************/
-int afb_hook_flags_svc(const char *api)
+int afb_hook_flags_evt(const char *name)
{
int flags;
- struct afb_hook_svc *hook;
+ struct afb_hook_evt *hook;
- pthread_rwlock_rdlock(&rwlock);
flags = 0;
- hook = list_of_svc_hooks;
+ pthread_rwlock_rdlock(&rwlock);
+ hook = list_of_evt_hooks;
while (hook) {
- if (!api || !hook->api || !strcasecmp(hook->api, api))
+ if (!name || MATCH_EVENT(hook->pattern, name))
flags |= hook->flags;
hook = hook->next;
}
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_evt *afb_hook_create_evt(const char *pattern, int flags, struct afb_hook_evt_itf *itf, void *closure)
{
- struct afb_hook_svc *hook;
+ struct afb_hook_evt *hook;
/* alloc the result */
hook = calloc(1, sizeof *hook);
return NULL;
/* get a copy of the names */
- hook->api = api ? strdup(api) : NULL;
- if (api && !hook->api) {
+ hook->pattern = pattern ? strdup(pattern) : NULL;
+ if (pattern && !hook->pattern) {
free(hook);
return NULL;
}
/* initialise the rest */
hook->refcount = 1;
hook->flags = flags;
- hook->itf = itf ? itf : &hook_svc_default_itf;
+ hook->itf = itf ? itf : &hook_evt_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);
+ pthread_mutex_lock(&mutex);
+ hook->next = list_of_evt_hooks;
+ list_of_evt_hooks = hook;
+ pthread_mutex_unlock(&mutex);
/* returns it */
return hook;
}
-struct afb_hook_svc *afb_hook_addref_svc(struct afb_hook_svc *hook)
+struct afb_hook_evt *afb_hook_addref_evt(struct afb_hook_evt *hook)
{
- pthread_rwlock_wrlock(&rwlock);
- hook->refcount++;
- pthread_rwlock_unlock(&rwlock);
+ __atomic_add_fetch(&hook->refcount, 1, __ATOMIC_RELAXED);
return hook;
}
-void afb_hook_unref_svc(struct afb_hook_svc *hook)
+static void hook_clean_evt()
{
- struct afb_hook_svc **prv;
+ struct afb_hook_evt **prv, *hook, *head;
- if (hook) {
- pthread_rwlock_wrlock(&rwlock);
- if (--hook->refcount)
- hook = NULL;
- else {
- /* unlink */
- prv = &list_of_svc_hooks;
- while (*prv && *prv != hook)
+ if (pthread_rwlock_trywrlock(&rwlock) == 0) {
+ /* unlink under mutex */
+ head = NULL;
+ pthread_mutex_lock(&mutex);
+ prv = &list_of_evt_hooks;
+ while ((hook = *prv)) {
+ if (hook->refcount)
prv = &(*prv)->next;
- if(*prv)
+ else {
*prv = hook->next;
+ hook->next = head;
+ head = hook;
+ }
}
+ pthread_mutex_unlock(&mutex);
pthread_rwlock_unlock(&rwlock);
- if (hook) {
- /* free */
- free(hook->api);
+
+ /* free found hooks */
+ while((hook = head)) {
+ head = hook->next;
+ free(hook->pattern);
free(hook);
}
}
}
+void afb_hook_unref_evt(struct afb_hook_evt *hook)
+{
+ if (hook && !__atomic_sub_fetch(&hook->refcount, 1, __ATOMIC_RELAXED))
+ hook_clean_evt();
+}
+
/******************************************************************************
- * section: default callbacks for tracing service interface (evt)
+ * section: default callbacks for sessions (session)
*****************************************************************************/
-static void _hook_evt_(const char *evt, int id, const char *format, ...)
+static void _hook_session_(struct afb_session *session, const char *format, ...)
{
va_list ap;
va_start(ap, format);
- _hook_("evt-%s:%d", format, ap, evt, id);
+ _hook_("session-%s", format, ap, afb_session_uuid(session));
va_end(ap);
}
-static void hook_evt_create_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
+static void hook_session_create_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
{
- _hook_evt_(evt, id, "create");
+ _hook_session_(session, "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)
+static void hook_session_close_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
{
- _hook_evt_(evt, id, "push.before(%s)", json_object_to_json_string(obj));
+ _hook_session_(session, "close");
}
-
-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)
+static void hook_session_destroy_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
{
- _hook_evt_(evt, id, "push.after(%s) -> %d", json_object_to_json_string(obj), result);
+ _hook_session_(session, "destroy");
}
-static void hook_evt_broadcast_before_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id, struct json_object *obj)
+static void hook_session_addref_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
{
- _hook_evt_(evt, id, "broadcast.before(%s)", json_object_to_json_string(obj));
+ _hook_session_(session, "addref");
}
-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)
+static void hook_session_unref_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
{
- _hook_evt_(evt, id, "broadcast.after(%s) -> %d", json_object_to_json_string(obj), result);
+ _hook_session_(session, "unref");
}
-static void hook_evt_name_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
-{
- _hook_evt_(evt, id, "name");
-}
-
-static void hook_evt_drop_default_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id)
-{
- _hook_evt_(evt, id, "drop");
-}
-
-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_drop = hook_evt_drop_default_cb
+static struct afb_hook_session_itf hook_session_default_itf = {
+ .hook_session_create = hook_session_create_cb,
+ .hook_session_close = hook_session_close_cb,
+ .hook_session_destroy = hook_session_destroy_cb,
+ .hook_session_addref = hook_session_addref_cb,
+ .hook_session_unref = hook_session_unref_cb
};
/******************************************************************************
- * section: hooks for tracing events interface (evt)
+ * section: hooks for tracing sessions (session)
*****************************************************************************/
-#define _HOOK_EVT_(what,...) \
- struct afb_hook_evt *hook; \
+#define _HOOK_SESSION_(what,...) \
+ struct afb_hook_session *hook; \
struct afb_hookid hookid; \
+ const char *sessid = 0; \
pthread_rwlock_rdlock(&rwlock); \
init_hookid(&hookid); \
- hook = list_of_evt_hooks; \
+ hook = list_of_session_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__); \
+ if (hook->refcount \
+ && hook->itf->hook_session_##what \
+ && (hook->flags & afb_hook_flag_session_##what) != 0 \
+ && MATCH_SESSION(hook->pattern, (sessid?:(sessid=afb_session_uuid(session))))) { \
+ hook->itf->hook_session_##what(hook->closure, &hookid, __VA_ARGS__); \
} \
hook = hook->next; \
} \
pthread_rwlock_unlock(&rwlock);
-void afb_hook_evt_create(const char *evt, int id)
+void afb_hook_session_create(struct afb_session *session)
{
- _HOOK_EVT_(create, evt, id);
+ _HOOK_SESSION_(create, session);
}
-void afb_hook_evt_push_before(const char *evt, int id, struct json_object *obj)
+void afb_hook_session_close(struct afb_session *session)
{
- _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;
+ _HOOK_SESSION_(close, session);
}
-void afb_hook_evt_broadcast_before(const char *evt, int id, struct json_object *obj)
+void afb_hook_session_destroy(struct afb_session *session)
{
- _HOOK_EVT_(broadcast_before, evt, id, obj);
+ _HOOK_SESSION_(destroy, session);
}
-int afb_hook_evt_broadcast_after(const char *evt, int id, struct json_object *obj, int result)
+void afb_hook_session_addref(struct afb_session *session)
{
- _HOOK_EVT_(broadcast_after, evt, id, obj, result);
- return result;
+ _HOOK_SESSION_(addref, session);
}
-void afb_hook_evt_name(const char *evt, int id)
+void afb_hook_session_unref(struct afb_session *session)
{
- _HOOK_EVT_(name, evt, id);
+ _HOOK_SESSION_(unref, session);
}
-void afb_hook_evt_drop(const char *evt, int id)
-{
- _HOOK_EVT_(drop, evt, id);
-}
/******************************************************************************
- * section: hooking services (evt)
+ * section: hooking sessions (session)
*****************************************************************************/
-int afb_hook_flags_evt(const char *name)
+struct afb_hook_session *afb_hook_create_session(const char *pattern, int flags, struct afb_hook_session_itf *itf, void *closure)
{
- 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_evt *afb_hook_create_evt(const char *pattern, int flags, struct afb_hook_evt_itf *itf, void *closure)
-{
- struct afb_hook_evt *hook;
+ struct afb_hook_session *hook;
/* alloc the result */
hook = calloc(1, sizeof *hook);
/* initialise the rest */
hook->refcount = 1;
hook->flags = flags;
- hook->itf = itf ? itf : &hook_evt_default_itf;
+ hook->itf = itf ? itf : &hook_session_default_itf;
hook->closure = closure;
/* record the hook */
- pthread_rwlock_wrlock(&rwlock);
- hook->next = list_of_evt_hooks;
- list_of_evt_hooks = hook;
- pthread_rwlock_unlock(&rwlock);
+ pthread_mutex_lock(&mutex);
+ hook->next = list_of_session_hooks;
+ list_of_session_hooks = hook;
+ pthread_mutex_unlock(&mutex);
/* returns it */
return hook;
}
-struct afb_hook_evt *afb_hook_addref_evt(struct afb_hook_evt *hook)
+struct afb_hook_session *afb_hook_addref_session(struct afb_hook_session *hook)
{
- pthread_rwlock_wrlock(&rwlock);
- hook->refcount++;
- pthread_rwlock_unlock(&rwlock);
+ __atomic_add_fetch(&hook->refcount, 1, __ATOMIC_RELAXED);
return hook;
}
-void afb_hook_unref_evt(struct afb_hook_evt *hook)
+static void hook_clean_session()
{
- struct afb_hook_evt **prv;
+ struct afb_hook_session **prv, *hook, *head;
- if (hook) {
- pthread_rwlock_wrlock(&rwlock);
- if (--hook->refcount)
- hook = NULL;
- else {
- /* unlink */
- prv = &list_of_evt_hooks;
- while (*prv && *prv != hook)
+ if (pthread_rwlock_trywrlock(&rwlock) == 0) {
+ /* unlink under mutex */
+ head = NULL;
+ pthread_mutex_lock(&mutex);
+ prv = &list_of_session_hooks;
+ while ((hook = *prv)) {
+ if (hook->refcount)
prv = &(*prv)->next;
- if(*prv)
+ else {
*prv = hook->next;
+ hook->next = head;
+ head = hook;
+ }
}
+ pthread_mutex_unlock(&mutex);
pthread_rwlock_unlock(&rwlock);
- if (hook) {
- /* free */
+
+ /* free found hooks */
+ while((hook = head)) {
+ head = hook->next;
free(hook->pattern);
free(hook);
}
}
}
+void afb_hook_unref_session(struct afb_hook_session *hook)
+{
+ if (hook && !__atomic_sub_fetch(&hook->refcount, 1, __ATOMIC_RELAXED))
+ hook_clean_session();
+}
+
/******************************************************************************
* section: default callbacks for globals (global)
*****************************************************************************/
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)
+static void hook_global_vverbose_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_end(ap);
if (len < 0)
- _hook_global_("vverbose(%d, %s, %d, %s) -> %s ? ? ?", level, file, line, func, fmt);
+ _hook_global_("vverbose(%d:%s, %s, %d, %s) -> %s ? ? ?", level, verbose_name_of_level(level), file, line, func, fmt);
else {
- _hook_global_("vverbose(%d, %s, %d, %s) -> %s", level, file, line, func, msg);
+ _hook_global_("vverbose(%d:%s, %s, %d, %s) -> %s", level, verbose_name_of_level(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
+ .hook_global_vverbose = hook_global_vverbose_cb
};
/******************************************************************************
init_hookid(&hookid); \
hook = list_of_global_hooks; \
while (hook) { \
- if (hook->itf->hook_global_##what \
+ if (hook->refcount \
+ && hook->itf->hook_global_##what \
&& (hook->flags & afb_hook_flag_global_##what) != 0) { \
hook->itf->hook_global_##what(hook->closure, &hookid, __VA_ARGS__); \
} \
pthread_rwlock_rdlock(&rwlock);
hook = list_of_global_hooks;
while (hook) {
- flags = hook->flags;
+ if (hook->refcount)
+ flags = hook->flags;
hook = hook->next;
}
verbose_observer = (flags & afb_hook_flag_global_vverbose) ? afb_hook_global_vverbose : NULL;
hook->closure = closure;
/* record the hook */
- pthread_rwlock_wrlock(&rwlock);
+ pthread_mutex_lock(&mutex);
hook->next = list_of_global_hooks;
list_of_global_hooks = hook;
- pthread_rwlock_unlock(&rwlock);
+ pthread_mutex_unlock(&mutex);
/* update hooking */
update_global();
struct afb_hook_global *afb_hook_addref_global(struct afb_hook_global *hook)
{
- pthread_rwlock_wrlock(&rwlock);
- hook->refcount++;
- pthread_rwlock_unlock(&rwlock);
+ __atomic_add_fetch(&hook->refcount, 1, __ATOMIC_RELAXED);
return hook;
}
-void afb_hook_unref_global(struct afb_hook_global *hook)
+static void hook_clean_global()
{
- struct afb_hook_global **prv;
+ struct afb_hook_global **prv, *hook, *head;
- if (hook) {
- pthread_rwlock_wrlock(&rwlock);
- if (--hook->refcount)
- hook = NULL;
- else {
- /* unlink */
- prv = &list_of_global_hooks;
- while (*prv && *prv != hook)
+ if (pthread_rwlock_trywrlock(&rwlock) == 0) {
+ /* unlink under mutex */
+ head = NULL;
+ pthread_mutex_lock(&mutex);
+ prv = &list_of_global_hooks;
+ while ((hook = *prv)) {
+ if (hook->refcount)
prv = &(*prv)->next;
- if(*prv)
+ else {
*prv = hook->next;
+ hook->next = head;
+ head = hook;
+ }
}
+ pthread_mutex_unlock(&mutex);
pthread_rwlock_unlock(&rwlock);
- if (hook) {
- /* free */
- free(hook);
- /* update hooking */
- update_global();
+ /* free found hooks */
+ while((hook = head)) {
+ head = hook->next;
+ free(hook);
}
}
}
+void afb_hook_unref_global(struct afb_hook_global *hook)
+{
+ if (hook && !__atomic_sub_fetch(&hook->refcount, 1, __ATOMIC_RELAXED)) {
+ /* update hooking */
+ update_global();
+ hook_clean_global();
+ }
+}
+
+#endif /* WITH_AFB_HOOK *******************************************************/
Code Review / src / app-framework-binder.git / blobdiff