X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-evt.c;h=1c8798fdc39cb8858a407f91748552c19fc73ff3;hb=f40979c718fa6fe6b571e133e1bf19fc90957298;hp=aba5e9b62fe9469005c6b4102616f69228f53d92;hpb=c12c74c208a30c5b18716b8faa464f0b4f643255;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-evt.c b/src/afb-evt.c
index aba5e9b6..1c8798fd 100644
--- a/src/afb-evt.c
+++ b/src/afb-evt.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
- * Author "Fulup Ar Foll"
+ * Copyright (C) 2015-2019 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,12 +24,14 @@
 #include <pthread.h>
 
 #include <json-c/json.h>
-#include <afb/afb-eventid-itf.h>
-#include <afb/afb-event.h>
+#include <afb/afb-event-x2-itf.h>
+#include <afb/afb-event-x1.h>
 
 #include "afb-evt.h"
 #include "afb-hook.h"
 #include "verbose.h"
+#include "jobs.h"
+#include "uuid.h"
 
 struct afb_evt_watch;
 
@@ -51,11 +52,11 @@ struct afb_evt_listener {
 	/* head of the list of events listened */
 	struct afb_evt_watch *watchs;
 
-	/* mutex of the listener */
-	pthread_mutex_t mutex;
+	/* rwlock of the listener */
+	pthread_rwlock_t rwlock;
 
 	/* count of reference to the listener */
-	int refcount;
+	uint16_t refcount;
 };
 
 /*
@@ -64,7 +65,7 @@ struct afb_evt_listener {
 struct afb_evtid {
 
 	/* interface */
-	struct afb_eventid eventid;
+	struct afb_event_x2 eventid;
 
 	/* next event */
 	struct afb_evtid *next;
@@ -72,20 +73,25 @@ struct afb_evtid {
 	/* head of the list of listeners watching the event */
 	struct afb_evt_watch *watchs;
 
-	/* mutex of the event */
-	pthread_mutex_t mutex;
+	/* rwlock of the event */
+	pthread_rwlock_t rwlock;
 
+#if WITH_AFB_HOOK
 	/* hooking */
 	int hookflags;
+#endif
 
 	/* refcount */
-	int refcount;
+	uint16_t refcount;
 
 	/* id of the event */
-	int id;
+	uint16_t id;
+
+	/* has client? */
+	int has_client;
 
 	/* fullname of the event */
-	char fullname[1];
+	char fullname[];
 };
 
 /*
@@ -109,8 +115,38 @@ struct afb_evt_watch {
 	unsigned activity;
 };
 
+/*
+ * structure for job of broadcasting events
+ */
+struct job_broadcast
+{
+	/** object atached to the event */
+	struct json_object *object;
+
+	/** the uuid of the event */
+	uuid_binary_t  uuid;
+
+	/** remaining hop */
+	uint8_t hop;
+
+	/** name of the event to broadcast */
+	char event[];
+};
+
+/*
+ * structure for job of broadcasting or pushing events
+ */
+struct job_evtid
+{
+	/** the event to broadcast */
+	struct afb_evtid *evtid;
+
+	/** object atached to the event */
+	struct json_object *object;
+};
+
 /* the interface for events */
-static struct afb_eventid_itf afb_evt_eventid_itf = {
+static struct afb_event_x2_itf afb_evt_event_x2_itf = {
 	.broadcast = (void*)afb_evt_evtid_broadcast,
 	.push = (void*)afb_evt_evtid_push,
 	.unref = (void*)afb_evt_evtid_unref,
@@ -118,73 +154,192 @@ static struct afb_eventid_itf afb_evt_eventid_itf = {
 	.addref = (void*)afb_evt_evtid_addref
 };
 
+#if WITH_AFB_HOOK
 /* the interface for events */
-static struct afb_eventid_itf afb_evt_hooked_eventid_itf = {
+static struct afb_event_x2_itf afb_evt_hooked_event_x2_itf = {
 	.broadcast = (void*)afb_evt_evtid_hooked_broadcast,
 	.push = (void*)afb_evt_evtid_hooked_push,
 	.unref = (void*)afb_evt_evtid_hooked_unref,
 	.name = (void*)afb_evt_evtid_hooked_name,
 	.addref = (void*)afb_evt_evtid_hooked_addref
 };
+#endif
+
+/* job groups for events push/broadcast */
+#define BROADCAST_JOB_GROUP  (&afb_evt_event_x2_itf)
+#define PUSH_JOB_GROUP       (&afb_evt_event_x2_itf)
 
 /* head of the list of listeners */
-static pthread_mutex_t listeners_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_rwlock_t listeners_rwlock = PTHREAD_RWLOCK_INITIALIZER;
 static struct afb_evt_listener *listeners = NULL;
 
 /* handling id of events */
-static pthread_mutex_t events_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_rwlock_t events_rwlock = PTHREAD_RWLOCK_INITIALIZER;
 static struct afb_evtid *evtids = NULL;
-static int event_id_counter = 0;
-static int event_id_wrapped = 0;
+static uint16_t event_genid = 0;
+static uint16_t event_count = 0;
+
+/* head of uniqueness of events */
+#if !defined(EVENT_BROADCAST_HOP_MAX)
+#  define EVENT_BROADCAST_HOP_MAX  10
+#endif
+#if !defined(EVENT_BROADCAST_MEMORY_COUNT)
+#  define EVENT_BROADCAST_MEMORY_COUNT  8
+#endif
+
+#if EVENT_BROADCAST_MEMORY_COUNT
+static struct {
+	pthread_mutex_t mutex;
+	uint8_t base;
+	uint8_t count;
+	uuid_binary_t uuids[EVENT_BROADCAST_MEMORY_COUNT];
+} uniqueness = {
+	.mutex = PTHREAD_MUTEX_INITIALIZER,
+	.base = 0,
+	.count = 0
+};
+#endif
 
 /*
- * Broadcasts the 'event' of 'id' with its 'obj'
- * 'obj' is released (like json_object_put)
- * Returns the count of listener having receive the event.
+ * Create structure for job of broadcasting string 'event' with 'object'
+ * Returns the created structure or NULL if out of memory
  */
-static int broadcast(const char *event, struct json_object *obj, int id)
+static struct job_broadcast *make_job_broadcast(const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
+{
+	size_t sz = 1 + strlen(event);
+	struct job_broadcast *jb = malloc(sz + sizeof *jb);
+	if (jb) {
+		jb->object = object;
+		memcpy(jb->uuid, uuid, sizeof jb->uuid);
+		jb->hop = hop;
+		memcpy(jb->event, event, sz);
+	}
+	return jb;
+}
+
+/*
+ * Destroy structure 'jb' for job of broadcasting string events
+ */
+static void destroy_job_broadcast(struct job_broadcast *jb)
+{
+	json_object_put(jb->object);
+	free(jb);
+}
+
+/*
+ * Create structure for job of broadcasting or pushing 'evtid' with 'object'
+ * Returns the created structure or NULL if out of memory
+ */
+static struct job_evtid *make_job_evtid(struct afb_evtid *evtid, struct json_object *object)
+{
+	struct job_evtid *je = malloc(sizeof *je);
+	if (je) {
+		je->evtid = afb_evt_evtid_addref(evtid);
+		je->object = object;
+	}
+	return je;
+}
+
+/*
+ * Destroy structure for job of broadcasting or pushing evtid
+ */
+static void destroy_job_evtid(struct job_evtid *je)
+{
+	afb_evt_evtid_unref(je->evtid);
+	json_object_put(je->object);
+	free(je);
+}
+
+/*
+ * Broadcasts the 'event' of 'id' with its 'object'
+ */
+static void broadcast(struct job_broadcast *jb)
 {
-	int result;
 	struct afb_evt_listener *listener;
 
-	result = 0;
-	pthread_mutex_lock(&listeners_mutex);
+	pthread_rwlock_rdlock(&listeners_rwlock);
 	listener = listeners;
 	while(listener) {
-		if (listener->itf->broadcast != NULL) {
-			listener->itf->broadcast(listener->closure, event, id, json_object_get(obj));
-			result++;
-		}
+		if (listener->itf->broadcast != NULL)
+			listener->itf->broadcast(listener->closure, jb->event, json_object_get(jb->object), jb->uuid, jb->hop);
 		listener = listener->next;
 	}
-	pthread_mutex_unlock(&listeners_mutex);
-	json_object_put(obj);
-	return result;
+	pthread_rwlock_unlock(&listeners_rwlock);
 }
 
 /*
- * Broadcasts the 'event' of 'id' with its 'obj'
- * 'obj' is released (like json_object_put)
- * calls hooks if hookflags isn't 0
- * Returns the count of listener having receive the event.
+ * Jobs callback for broadcasting string asynchronously
  */
-static int hooked_broadcast(const char *event, struct json_object *obj, int id, int hookflags)
+static void broadcast_job(int signum, void *closure)
 {
-	int result;
-
-	json_object_get(obj);
-
-	if (hookflags & afb_hook_flag_evt_broadcast_before)
-		afb_hook_evt_broadcast_before(event, id, obj);
+	struct job_broadcast *jb = closure;
 
-	result = broadcast(event, obj, id);
-
-	if (hookflags & afb_hook_flag_evt_broadcast_after)
-		afb_hook_evt_broadcast_after(event, id, obj, result);
+	if (signum == 0)
+		broadcast(jb);
+	destroy_job_broadcast(jb);
+}
 
-	json_object_put(obj);
+/*
+ * Broadcasts the string 'event' with its 'object'
+ */
+static int unhooked_broadcast(const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
+{
+	uuid_binary_t local_uuid;
+	struct job_broadcast *jb;
+	int rc;
+#if EVENT_BROADCAST_MEMORY_COUNT
+	int iter, count;
+#endif
+
+	/* check if lately sent */
+	if (!uuid) {
+		uuid_new_binary(local_uuid);
+		uuid = local_uuid;
+		hop = EVENT_BROADCAST_HOP_MAX;
+#if EVENT_BROADCAST_MEMORY_COUNT
+		pthread_mutex_lock(&uniqueness.mutex);
+	} else {
+		pthread_mutex_lock(&uniqueness.mutex);
+		iter = (int)uniqueness.base;
+		count = (int)uniqueness.count;
+		while (count) {
+			if (0 == memcmp(uuid, uniqueness.uuids[iter], sizeof(uuid_binary_t))) {
+				pthread_mutex_unlock(&uniqueness.mutex);
+				return 0;
+			}
+			if (++iter == EVENT_BROADCAST_MEMORY_COUNT)
+				iter = 0;
+			count--;
+		}
+	}
+	iter = (int)uniqueness.base;
+	if (uniqueness.count < EVENT_BROADCAST_MEMORY_COUNT)
+		iter += (int)(uniqueness.count++);
+	else if (++uniqueness.base == EVENT_BROADCAST_MEMORY_COUNT)
+		uniqueness.base = 0;
+	memcpy(uniqueness.uuids[iter], uuid, sizeof(uuid_binary_t));
+	pthread_mutex_unlock(&uniqueness.mutex);
+#else
+	}
+#endif
+
+	/* create the structure for the job */
+	jb = make_job_broadcast(event, object, uuid, hop);
+	if (jb == NULL) {
+		ERROR("Cant't create broadcast string job item for %s(%s)",
+			event, json_object_to_json_string(object));
+		json_object_put(object);
+		return -1;
+	}
 
-	return result;
+	/* queue the job */
+	rc = jobs_queue(BROADCAST_JOB_GROUP, 0, broadcast_job, jb);
+	if (rc) {
+		ERROR("cant't queue broadcast string job item for %s(%s)",
+			event, json_object_to_json_string(object));
+		destroy_job_broadcast(jb);
+	}
+	return rc;
 }
 
 /*
@@ -194,9 +349,10 @@ static int hooked_broadcast(const char *event, struct json_object *obj, int id,
  */
 int afb_evt_evtid_broadcast(struct afb_evtid *evtid, struct json_object *object)
 {
-	return broadcast(evtid->fullname, object, evtid->id);
+	return unhooked_broadcast(evtid->fullname, object, NULL, 0);
 }
 
+#if WITH_AFB_HOOK
 /*
  * Broadcasts the event 'evtid' with its 'object'
  * 'object' is released (like json_object_put)
@@ -204,7 +360,40 @@ int afb_evt_evtid_broadcast(struct afb_evtid *evtid, struct json_object *object)
  */
 int afb_evt_evtid_hooked_broadcast(struct afb_evtid *evtid, struct json_object *object)
 {
-	return hooked_broadcast(evtid->fullname, object, evtid->id, evtid->hookflags);
+	int result;
+
+	json_object_get(object);
+
+	if (evtid->hookflags & afb_hook_flag_evt_broadcast_before)
+		afb_hook_evt_broadcast_before(evtid->fullname, evtid->id, object);
+
+	result = afb_evt_evtid_broadcast(evtid, object);
+
+	if (evtid->hookflags & afb_hook_flag_evt_broadcast_after)
+		afb_hook_evt_broadcast_after(evtid->fullname, evtid->id, object, result);
+
+	json_object_put(object);
+
+	return result;
+}
+#endif
+
+int afb_evt_rebroadcast(const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
+{
+	int result;
+
+#if WITH_AFB_HOOK
+	json_object_get(object);
+	afb_hook_evt_broadcast_before(event, 0, object);
+#endif
+
+	result = unhooked_broadcast(event, object, uuid, hop);
+
+#if WITH_AFB_HOOK
+	afb_hook_evt_broadcast_after(event, 0, object, result);
+	json_object_put(object);
+#endif
+	return result;
 }
 
 /*
@@ -214,37 +403,79 @@ int afb_evt_evtid_hooked_broadcast(struct afb_evtid *evtid, struct json_object *
  */
 int afb_evt_broadcast(const char *event, struct json_object *object)
 {
-	return hooked_broadcast(event, object, 0, -1);
+	return afb_evt_rebroadcast(event, object, NULL, 0);
 }
 
 /*
  * Pushes the event 'evtid' with 'obj' to its listeners
- * 'obj' is released (like json_object_put)
  * Returns the count of listener that received the event.
  */
-int afb_evt_evtid_push(struct afb_evtid *evtid, struct json_object *obj)
+static void push_evtid(struct afb_evtid *evtid, struct json_object *object)
 {
-	int result;
+	int has_client;
 	struct afb_evt_watch *watch;
 	struct afb_evt_listener *listener;
 
-	result = 0;
-	pthread_mutex_lock(&evtid->mutex);
+	has_client = 0;
+	pthread_rwlock_rdlock(&evtid->rwlock);
 	watch = evtid->watchs;
 	while(watch) {
 		listener = watch->listener;
 		assert(listener->itf->push != NULL);
 		if (watch->activity != 0) {
-			listener->itf->push(listener->closure, evtid->fullname, evtid->id, json_object_get(obj));
-			result++;
+			listener->itf->push(listener->closure, evtid->fullname, evtid->id, json_object_get(object));
+			has_client = 1;
 		}
 		watch = watch->next_by_evtid;
 	}
-	pthread_mutex_unlock(&evtid->mutex);
-	json_object_put(obj);
-	return result;
+	evtid->has_client = has_client;
+	pthread_rwlock_unlock(&evtid->rwlock);
+}
+
+/*
+ * Jobs callback for pushing evtid asynchronously
+ */
+static void push_job_evtid(int signum, void *closure)
+{
+	struct job_evtid *je = closure;
+
+	if (signum == 0)
+		push_evtid(je->evtid, je->object);
+	destroy_job_evtid(je);
+}
+
+/*
+ * Pushes the event 'evtid' with 'obj' to its listeners
+ * 'obj' is released (like json_object_put)
+ * Returns 1 if at least one listener exists or 0 if no listener exists or
+ * -1 in case of error and the event can't be delivered
+ */
+int afb_evt_evtid_push(struct afb_evtid *evtid, struct json_object *object)
+{
+	struct job_evtid *je;
+	int rc;
+
+	je = make_job_evtid(evtid, object);
+	if (je == NULL) {
+		ERROR("Cant't create push evtid job item for %s(%s)",
+			evtid->fullname, json_object_to_json_string(object));
+		json_object_put(object);
+		return -1;
+	}
+
+	rc = jobs_queue(PUSH_JOB_GROUP, 0, push_job_evtid, je);
+	if (rc == 0)
+		rc = evtid->has_client;
+	else {
+		ERROR("cant't queue push evtid job item for %s(%s)",
+			evtid->fullname, json_object_to_json_string(object));
+		destroy_job_evtid(je);
+	}
+
+	return rc;
 }
 
+#if WITH_AFB_HOOK
 /*
  * Pushes the event 'evtid' with 'obj' to its listeners
  * 'obj' is released (like json_object_put)
@@ -253,6 +484,7 @@ int afb_evt_evtid_push(struct afb_evtid *evtid, struct json_object *obj)
  */
 int afb_evt_evtid_hooked_push(struct afb_evtid *evtid, struct json_object *obj)
 {
+
 	int result;
 
 	/* lease the object */
@@ -273,6 +505,7 @@ int afb_evt_evtid_hooked_push(struct afb_evtid *evtid, struct json_object *obj)
 	json_object_put(obj);
 	return result;
 }
+#endif
 
 /*
  * remove the 'watch'
@@ -312,39 +545,51 @@ struct afb_evtid *afb_evt_evtid_create(const char *fullname)
 {
 	size_t len;
 	struct afb_evtid *evtid, *oevt;
+	uint16_t id;
 
 	/* allocates the event */
 	len = strlen(fullname);
-	evtid = malloc(len + sizeof * evtid);
+	evtid = malloc(len + 1 + sizeof * evtid);
 	if (evtid == NULL)
 		goto error;
 
 	/* allocates the id */
-	pthread_mutex_lock(&events_mutex);
+	pthread_rwlock_wrlock(&events_rwlock);
+	if (event_count == UINT16_MAX) {
+		pthread_rwlock_unlock(&events_rwlock);
+		free(evtid);
+		ERROR("Can't create more events");
+		return NULL;
+	}
+	event_count++;
 	do {
-		if (++event_id_counter < 0) {
-			event_id_wrapped = 1;
-			event_id_counter = 1024; /* heuristic: small numbers are not destroyed */
-		}
-		if (!event_id_wrapped)
-			break;
+		/* TODO add a guard (counting number of event created) */
+		id = ++event_genid;
+		if (!id)
+			id = event_genid = 1;
 		oevt = evtids;
-		while(oevt != NULL && oevt->id != event_id_counter)
+		while(oevt != NULL && oevt->id != id)
 			oevt = oevt->next;
 	} while (oevt != NULL);
 
 	/* initialize the event */
 	memcpy(evtid->fullname, fullname, len + 1);
 	evtid->next = evtids;
+	evtid->refcount = 1;
 	evtid->watchs = NULL;
-	evtid->id = event_id_counter;
-	pthread_mutex_init(&evtid->mutex, NULL);
+	evtid->id = id;
+	evtid->has_client = 0;
+	pthread_rwlock_init(&evtid->rwlock, NULL);
 	evtids = evtid;
+#if WITH_AFB_HOOK
 	evtid->hookflags = afb_hook_flags_evt(evtid->fullname);
-	evtid->eventid.itf = evtid->hookflags ? &afb_evt_hooked_eventid_itf : &afb_evt_eventid_itf;
+	evtid->eventid.itf = evtid->hookflags ? &afb_evt_hooked_event_x2_itf : &afb_evt_event_x2_itf;
 	if (evtid->hookflags & afb_hook_flag_evt_create)
 		afb_hook_evt_create(evtid->fullname, evtid->id);
-	pthread_mutex_unlock(&events_mutex);
+#else
+	evtid->eventid.itf = &afb_evt_event_x2_itf;
+#endif
+	pthread_rwlock_unlock(&events_rwlock);
 
 	/* returns the event */
 	return evtid;
@@ -352,6 +597,26 @@ error:
 	return NULL;
 }
 
+/*
+ * Creates an event of name 'prefix'/'name' and returns it or NULL on error.
+ */
+struct afb_evtid *afb_evt_evtid_create2(const char *prefix, const char *name)
+{
+	size_t prelen, postlen;
+	char *fullname;
+
+	/* makes the event fullname */
+	prelen = strlen(prefix);
+	postlen = strlen(name);
+	fullname = alloca(prelen + postlen + 2);
+	memcpy(fullname, prefix, prelen);
+	fullname[prelen] = '/';
+	memcpy(fullname + prelen + 1, name, postlen + 1);
+
+	/* create the event */
+	return afb_evt_evtid_create(fullname);
+}
+
 /*
  * increment the reference count of the event 'evtid'
  */
@@ -361,6 +626,7 @@ struct afb_evtid *afb_evt_evtid_addref(struct afb_evtid *evtid)
 	return evtid;
 }
 
+#if WITH_AFB_HOOK
 /*
  * increment the reference count of the event 'evtid'
  */
@@ -370,6 +636,7 @@ struct afb_evtid *afb_evt_evtid_hooked_addref(struct afb_evtid *evtid)
 		afb_hook_evt_addref(evtid->fullname, evtid->id);
 	return afb_evt_evtid_addref(evtid);
 }
+#endif
 
 /*
  * decrement the reference count of the event 'evtid'
@@ -383,14 +650,16 @@ void afb_evt_evtid_unref(struct afb_evtid *evtid)
 
 	if (!__atomic_sub_fetch(&evtid->refcount, 1, __ATOMIC_RELAXED)) {
 		/* unlinks the event if valid! */
-		pthread_mutex_lock(&events_mutex);
+		pthread_rwlock_wrlock(&events_rwlock);
 		found = 0;
 		prv = &evtids;
 		while (*prv && !(found = (*prv == evtid)))
 			prv = &(*prv)->next;
-		if (found)
+		if (found) {
 			*prv = evtid->next;
-		pthread_mutex_unlock(&events_mutex);
+			event_count--;
+		}
+		pthread_rwlock_unlock(&events_rwlock);
 
 		/* destroys the event */
 		if (!found)
@@ -399,20 +668,21 @@ void afb_evt_evtid_unref(struct afb_evtid *evtid)
 			/* removes all watchers */
 			while(evtid->watchs != NULL) {
 				listener = evtid->watchs->listener;
-				pthread_mutex_lock(&listener->mutex);
-				pthread_mutex_lock(&evtid->mutex);
+				pthread_rwlock_wrlock(&listener->rwlock);
+				pthread_rwlock_wrlock(&evtid->rwlock);
 				remove_watch(evtid->watchs);
-				pthread_mutex_unlock(&evtid->mutex);
-				pthread_mutex_unlock(&listener->mutex);
+				pthread_rwlock_unlock(&evtid->rwlock);
+				pthread_rwlock_unlock(&listener->rwlock);
 			}
 
 			/* free */
-			pthread_mutex_destroy(&evtid->mutex);
+			pthread_rwlock_destroy(&evtid->rwlock);
 			free(evtid);
 		}
 	}
 }
 
+#if WITH_AFB_HOOK
 /*
  * decrement the reference count of the event 'evtid'
  * and destroy it when the count reachs zero
@@ -423,6 +693,7 @@ void afb_evt_evtid_hooked_unref(struct afb_evtid *evtid)
 		afb_hook_evt_unref(evtid->fullname, evtid->id);
 	afb_evt_evtid_unref(evtid);
 }
+#endif
 
 /*
  * Returns the true name of the 'event'
@@ -441,6 +712,7 @@ const char *afb_evt_evtid_name(struct afb_evtid *evtid)
 	return name ? name + 1 : evtid->fullname;
 }
 
+#if WITH_AFB_HOOK
 /*
  * Returns the name associated to the event 'evtid'.
  */
@@ -451,11 +723,12 @@ const char *afb_evt_evtid_hooked_name(struct afb_evtid *evtid)
 		afb_hook_evt_name(evtid->fullname, evtid->id, result);
 	return result;
 }
+#endif
 
 /*
  * Returns the id of the 'event'
  */
-int afb_evt_evtid_id(struct afb_evtid *evtid)
+uint16_t afb_evt_evtid_id(struct afb_evtid *evtid)
 {
 	return evtid->id;
 }
@@ -470,7 +743,7 @@ struct afb_evt_listener *afb_evt_listener_create(const struct afb_evt_itf *itf,
 	struct afb_evt_listener *listener;
 
 	/* search if an instance already exists */
-	pthread_mutex_lock(&listeners_mutex);
+	pthread_rwlock_wrlock(&listeners_rwlock);
 	listener = listeners;
 	while (listener != NULL) {
 		if (listener->itf == itf && listener->closure == closure) {
@@ -488,12 +761,12 @@ struct afb_evt_listener *afb_evt_listener_create(const struct afb_evt_itf *itf,
 		listener->closure = closure;
 		listener->watchs = NULL;
 		listener->refcount = 1;
-		pthread_mutex_init(&listener->mutex, NULL);
+		pthread_rwlock_init(&listener->rwlock, NULL);
 		listener->next = listeners;
 		listeners = listener;
 	}
  found:
-	pthread_mutex_unlock(&listeners_mutex);
+	pthread_rwlock_unlock(&listeners_rwlock);
 	return listener;
 }
 
@@ -515,28 +788,28 @@ void afb_evt_listener_unref(struct afb_evt_listener *listener)
 	struct afb_evt_listener **prv;
 	struct afb_evtid *evtid;
 
-	if (!__atomic_sub_fetch(&listener->refcount, 1, __ATOMIC_RELAXED)) {
+	if (listener && !__atomic_sub_fetch(&listener->refcount, 1, __ATOMIC_RELAXED)) {
 
 		/* unlink the listener */
-		pthread_mutex_lock(&listeners_mutex);
+		pthread_rwlock_wrlock(&listeners_rwlock);
 		prv = &listeners;
 		while (*prv != listener)
 			prv = &(*prv)->next;
 		*prv = listener->next;
-		pthread_mutex_unlock(&listeners_mutex);
+		pthread_rwlock_unlock(&listeners_rwlock);
 
 		/* remove the watchers */
-		pthread_mutex_lock(&listener->mutex);
+		pthread_rwlock_wrlock(&listener->rwlock);
 		while (listener->watchs != NULL) {
 			evtid = listener->watchs->evtid;
-			pthread_mutex_lock(&evtid->mutex);
+			pthread_rwlock_wrlock(&evtid->rwlock);
 			remove_watch(listener->watchs);
-			pthread_mutex_unlock(&evtid->mutex);
+			pthread_rwlock_unlock(&evtid->rwlock);
 		}
-		pthread_mutex_unlock(&listener->mutex);
+		pthread_rwlock_unlock(&listener->rwlock);
 
 		/* free the listener */
-		pthread_mutex_destroy(&listener->mutex);
+		pthread_rwlock_destroy(&listener->rwlock);
 		free(listener);
 	}
 }
@@ -556,7 +829,7 @@ int afb_evt_watch_add_evtid(struct afb_evt_listener *listener, struct afb_evtid
 	}
 
 	/* search the existing watch for the listener */
-	pthread_mutex_lock(&listener->mutex);
+	pthread_rwlock_wrlock(&listener->rwlock);
 	watch = listener->watchs;
 	while(watch != NULL) {
 		if (watch->evtid == evtid)
@@ -567,7 +840,7 @@ int afb_evt_watch_add_evtid(struct afb_evt_listener *listener, struct afb_evtid
 	/* not found, allocate a new */
 	watch = malloc(sizeof *watch);
 	if (watch == NULL) {
-		pthread_mutex_unlock(&listener->mutex);
+		pthread_rwlock_unlock(&listener->rwlock);
 		errno = ENOMEM;
 		return -1;
 	}
@@ -578,16 +851,17 @@ int afb_evt_watch_add_evtid(struct afb_evt_listener *listener, struct afb_evtid
 	watch->listener = listener;
 	watch->next_by_listener = listener->watchs;
 	listener->watchs = watch;
-	pthread_mutex_lock(&evtid->mutex);
+	pthread_rwlock_wrlock(&evtid->rwlock);
 	watch->next_by_evtid = evtid->watchs;
 	evtid->watchs = watch;
-	pthread_mutex_unlock(&evtid->mutex);
+	pthread_rwlock_unlock(&evtid->rwlock);
 
 found:
 	if (watch->activity == 0 && listener->itf->add != NULL)
 		listener->itf->add(listener->closure, evtid->fullname, evtid->id);
 	watch->activity++;
-	pthread_mutex_unlock(&listener->mutex);
+	evtid->has_client = 1;
+	pthread_rwlock_unlock(&listener->rwlock);
 
 	return 0;
 }
@@ -601,7 +875,7 @@ int afb_evt_watch_sub_evtid(struct afb_evt_listener *listener, struct afb_evtid
 	struct afb_evt_watch *watch;
 
 	/* search the existing watch */
-	pthread_mutex_lock(&listener->mutex);
+	pthread_rwlock_wrlock(&listener->rwlock);
 	watch = listener->watchs;
 	while(watch != NULL) {
 		if (watch->evtid == evtid) {
@@ -610,16 +884,47 @@ int afb_evt_watch_sub_evtid(struct afb_evt_listener *listener, struct afb_evtid
 				if (watch->activity == 0 && listener->itf->remove != NULL)
 					listener->itf->remove(listener->closure, evtid->fullname, evtid->id);
 			}
-			pthread_mutex_unlock(&listener->mutex);
+			pthread_rwlock_unlock(&listener->rwlock);
 			return 0;
 		}
 		watch = watch->next_by_listener;
 	}
-	pthread_mutex_unlock(&listener->mutex);
+	pthread_rwlock_unlock(&listener->rwlock);
 	errno = ENOENT;
 	return -1;
 }
 
+/*
+ * Avoids the 'listener' to watch 'eventid'
+ * Returns 0 in case of success or else -1.
+ */
+int afb_evt_watch_sub_eventid(struct afb_evt_listener *listener, uint16_t eventid)
+{
+	struct afb_evt_watch *watch;
+	struct afb_evtid *evtid;
+
+	/* search the existing watch */
+	pthread_rwlock_wrlock(&listener->rwlock);
+	watch = listener->watchs;
+	while(watch != NULL) {
+		evtid = watch->evtid;
+		if (evtid->id == eventid) {
+			if (watch->activity != 0) {
+				watch->activity--;
+				if (watch->activity == 0 && listener->itf->remove != NULL)
+					listener->itf->remove(listener->closure, evtid->fullname, evtid->id);
+			}
+			pthread_rwlock_unlock(&listener->rwlock);
+			return 0;
+		}
+		watch = watch->next_by_listener;
+	}
+	pthread_rwlock_unlock(&listener->rwlock);
+	errno = ENOENT;
+	return -1;
+}
+
+#if WITH_AFB_HOOK
 /*
  * update the hooks for events
  */
@@ -627,58 +932,68 @@ void afb_evt_update_hooks()
 {
 	struct afb_evtid *evtid;
 
-	pthread_mutex_lock(&events_mutex);
+	pthread_rwlock_rdlock(&events_rwlock);
 	for (evtid = evtids ; evtid ; evtid = evtid->next) {
 		evtid->hookflags = afb_hook_flags_evt(evtid->fullname);
-		evtid->eventid.itf = evtid->hookflags ? &afb_evt_hooked_eventid_itf : &afb_evt_eventid_itf;
+		evtid->eventid.itf = evtid->hookflags ? &afb_evt_hooked_event_x2_itf : &afb_evt_event_x2_itf;
 	}
-	pthread_mutex_unlock(&events_mutex);
+	pthread_rwlock_unlock(&events_rwlock);
 }
+#endif
 
-struct afb_evtid *afb_evt_to_evtid(struct afb_event event)
+inline struct afb_evtid *afb_evt_event_x2_to_evtid(struct afb_event_x2 *eventid)
 {
-	return (struct afb_evtid*)(event.itf == &afb_evt_hooked_eventid_itf ? event.closure : NULL);
+	return (struct afb_evtid*)eventid;
 }
 
-struct afb_event afb_evt_from_evtid(struct afb_evtid *evtid)
+inline struct afb_event_x2 *afb_evt_event_x2_from_evtid(struct afb_evtid *evtid)
 {
-	return (struct afb_event){ .itf = evtid ? &afb_evt_hooked_eventid_itf : NULL, .closure = &evtid->eventid };
+	return &evtid->eventid;
 }
 
 /*
  * Creates an event of 'fullname' and returns it.
  * Returns an event with closure==NULL in case of error.
  */
-struct afb_event afb_evt_create_event(const char *fullname)
+struct afb_event_x2 *afb_evt_event_x2_create(const char *fullname)
+{
+	return afb_evt_event_x2_from_evtid(afb_evt_evtid_create(fullname));
+}
+
+/*
+ * Creates an event of name 'prefix'/'name' and returns it.
+ * Returns an event with closure==NULL in case of error.
+ */
+struct afb_event_x2 *afb_evt_event_x2_create2(const char *prefix, const char *name)
 {
-	return afb_evt_from_evtid(afb_evt_evtid_create(fullname));
+	return afb_evt_event_x2_from_evtid(afb_evt_evtid_create2(prefix, name));
 }
 
 /*
- * Returns the fullname of the 'event'
+ * Returns the fullname of the 'eventid'
  */
-const char *afb_evt_event_fullname(struct afb_event event)
+const char *afb_evt_event_x2_fullname(struct afb_event_x2 *eventid)
 {
-	struct afb_evtid *evtid = afb_evt_to_evtid(event);
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
 	return evtid ? evtid->fullname : NULL;
 }
 
 /*
- * Returns the id of the 'event'
+ * Returns the id of the 'eventid'
  */
-int afb_evt_event_id(struct afb_event event)
+uint16_t afb_evt_event_x2_id(struct afb_event_x2 *eventid)
 {
-	struct afb_evtid *evtid = afb_evt_to_evtid(event);
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
 	return evtid ? evtid->id : 0;
 }
 
 /*
- * Makes the 'listener' watching 'event'
+ * Makes the 'listener' watching 'eventid'
  * Returns 0 in case of success or else -1.
  */
-int afb_evt_add_watch(struct afb_evt_listener *listener, struct afb_event event)
+int afb_evt_event_x2_add_watch(struct afb_evt_listener *listener, struct afb_event_x2 *eventid)
 {
-	struct afb_evtid *evtid = afb_evt_to_evtid(event);
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
 
 	/* check parameter */
 	if (!evtid) {
@@ -691,12 +1006,12 @@ int afb_evt_add_watch(struct afb_evt_listener *listener, struct afb_event event)
 }
 
 /*
- * Avoids the 'listener' to watch 'event'
+ * Avoids the 'listener' to watch 'eventid'
  * Returns 0 in case of success or else -1.
  */
-int afb_evt_remove_watch(struct afb_evt_listener *listener, struct afb_event event)
+int afb_evt_event_x2_remove_watch(struct afb_evt_listener *listener, struct afb_event_x2 *eventid)
 {
-	struct afb_evtid *evtid = afb_evt_to_evtid(event);
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
 
 	/* check parameter */
 	if (!evtid) {
@@ -708,21 +1023,53 @@ int afb_evt_remove_watch(struct afb_evt_listener *listener, struct afb_event eve
 	return afb_evt_watch_sub_evtid(listener, evtid);
 }
 
-int afb_evt_push(struct afb_event event, struct json_object *object)
+int afb_evt_event_x2_push(struct afb_event_x2 *eventid, struct json_object *object)
+#if WITH_AFB_HOOK
 {
-	struct afb_evtid *evtid = afb_evt_to_evtid(event);
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
 	if (evtid)
 		return afb_evt_evtid_hooked_push(evtid, object);
 	json_object_put(object);
 	return 0;
 }
+#else
+	__attribute__((alias("afb_evt_event_x2_unhooked_push")));
+#endif
 
-int afb_evt_unhooked_push(struct afb_event event, struct json_object *object)
+int afb_evt_event_x2_unhooked_push(struct afb_event_x2 *eventid, struct json_object *object)
 {
-	struct afb_evtid *evtid = afb_evt_to_evtid(event);
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
 	if (evtid)
 		return afb_evt_evtid_push(evtid, object);
 	json_object_put(object);
 	return 0;
 }
 
+#if WITH_LEGACY_BINDING_V1 || WITH_LEGACY_BINDING_V2
+struct afb_event_x1 afb_evt_event_from_evtid(struct afb_evtid *evtid)
+{
+	return evtid
+#if WITH_AFB_HOOK
+		? (struct afb_event_x1){ .itf = &afb_evt_hooked_event_x2_itf, .closure = &evtid->eventid }
+#else
+		? (struct afb_event_x1){ .itf = &afb_evt_event_x2_itf, .closure = &evtid->eventid }
+#endif
+		: (struct afb_event_x1){ .itf = NULL, .closure = NULL };
+}
+#endif
+
+void afb_evt_event_x2_unref(struct afb_event_x2 *eventid)
+{
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
+	if (evtid)
+		afb_evt_evtid_unref(evtid);
+}
+
+struct afb_event_x2 *afb_evt_event_x2_addref(struct afb_event_x2 *eventid)
+{
+	struct afb_evtid *evtid = afb_evt_event_x2_to_evtid(eventid);
+	if (evtid)
+		afb_evt_evtid_addref(evtid);
+	return eventid;
+}
+