/*
- * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2016-2019 "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 <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-x1.h>
#include <afb/afb-event-x2.h>
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;
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, ...)
{
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_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_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, const char *name, struct afb_arg arg)
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, "reply[%s](%s, %s)", error?:"success", json_object_to_json_string(obj), 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_legacy_context_get_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, void *value)
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_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... [%s] -> %s (%s)", error?:"success", json_object_to_json_string(object), info?:"");
+ _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_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_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] -> %s (%s)", status, error?:"success", json_object_to_json_string(object), info?:"");
+ _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_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_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(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 = {
init_hookid(&hookid); \
hook = list_of_xreq_hooks; \
while (hook) { \
- if (hook->itf->hook_xreq_##func \
+ if (hook->refcount \
+ && hook->itf->hook_xreq_##func \
&& (hook->flags & afb_hook_flag_req_##flag) != 0 \
&& (!hook->session || hook->session == xreq->context.session) \
&& MATCH_API(hook->api, xreq->request.called_api) \
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 */
/* 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_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_api_(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_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_api_(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_api_get_event_loop_cb(void *closure, const struct afb_hookid *hookid, const struct afb_export *export, struct sd_event *result)
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(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(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(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(object), 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(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(object), 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)
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(object));
+ _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(object));
+ _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_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,
};
/******************************************************************************
init_hookid(&hookid); \
hook = list_of_api_hooks; \
while (hook) { \
- if (hook->itf->hook_api_##func \
+ 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_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
*****************************************************************************/
hook->closure = closure;
/* record the hook */
- pthread_rwlock_wrlock(&rwlock);
+ pthread_mutex_lock(&mutex);
hook->next = list_of_api_hooks;
list_of_api_hooks = hook;
- pthread_rwlock_unlock(&rwlock);
+ pthread_mutex_unlock(&mutex);
/* returns it */
return 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_api(struct afb_hook_api *hook)
+static void hook_clean_api()
{
- struct afb_hook_api **prv;
+ struct afb_hook_api **prv, *hook, *head;
- if (hook) {
- pthread_rwlock_wrlock(&rwlock);
- if (--hook->refcount)
- hook = NULL;
- else {
- /* unlink */
- prv = &list_of_api_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 (evt)
*****************************************************************************/
static void hook_evt_push_before_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));
+ _hook_evt_(evt, id, "push.before(%s)", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE));
}
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_evt_(evt, id, "push.after(%s) -> %d", json_object_to_json_string(obj), result);
+ _hook_evt_(evt, id, "push.after(%s) -> %d", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE), result);
}
static void hook_evt_broadcast_before_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));
+ _hook_evt_(evt, id, "broadcast.before(%s)", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE));
}
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_evt_(evt, id, "broadcast.after(%s) -> %d", json_object_to_json_string(obj), result);
+ _hook_evt_(evt, id, "broadcast.after(%s) -> %d", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE), result);
}
static void hook_evt_name_cb(void *closure, const struct afb_hookid *hookid, const char *evt, int id, const char *result)
init_hookid(&hookid); \
hook = list_of_evt_hooks; \
while (hook) { \
- if (hook->itf->hook_evt_##what \
+ 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->closure = closure;
/* record the hook */
- pthread_rwlock_wrlock(&rwlock);
+ pthread_mutex_lock(&mutex);
hook->next = list_of_evt_hooks;
list_of_evt_hooks = hook;
- pthread_rwlock_unlock(&rwlock);
+ pthread_mutex_unlock(&mutex);
/* returns it */
return 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_evt(struct afb_hook_evt *hook)
+static void hook_clean_evt()
{
- struct afb_hook_evt **prv;
+ struct afb_hook_evt **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_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 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 sessions (session)
*****************************************************************************/
static void hook_session_create_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
{
- _hook_session_(session, "create -> token=%s", afb_session_token(session));
+ _hook_session_(session, "create");
}
static void hook_session_close_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
_hook_session_(session, "destroy");
}
-static void hook_session_renew_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
-{
- _hook_session_(session, "renew -> token=%s", afb_session_token(session));
-}
-
static void hook_session_addref_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
{
_hook_session_(session, "addref");
.hook_session_create = hook_session_create_cb,
.hook_session_close = hook_session_close_cb,
.hook_session_destroy = hook_session_destroy_cb,
- .hook_session_renew = hook_session_renew_cb,
.hook_session_addref = hook_session_addref_cb,
.hook_session_unref = hook_session_unref_cb
};
init_hookid(&hookid); \
hook = list_of_session_hooks; \
while (hook) { \
- if (hook->itf->hook_session_##what \
+ 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_SESSION_(destroy, session);
}
-void afb_hook_session_renew(struct afb_session *session)
-{
- _HOOK_SESSION_(renew, session);
-}
-
void afb_hook_session_addref(struct afb_session *session)
{
_HOOK_SESSION_(addref, session);
hook->closure = closure;
/* record the hook */
- pthread_rwlock_wrlock(&rwlock);
+ pthread_mutex_lock(&mutex);
hook->next = list_of_session_hooks;
list_of_session_hooks = hook;
- pthread_rwlock_unlock(&rwlock);
+ pthread_mutex_unlock(&mutex);
/* returns it */
return 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_session(struct afb_hook_session *hook)
+static void hook_clean_session()
{
- struct afb_hook_session **prv;
+ struct afb_hook_session **prv, *hook, *head;
- if (hook) {
- pthread_rwlock_wrlock(&rwlock);
- if (--hook->refcount)
- hook = NULL;
- else {
- /* unlink */
- prv = &list_of_session_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)
*****************************************************************************/
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 *******************************************************/