X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-evt.c;h=46bcf6dbc426bc58bbbd70629c6aed35638ce3e7;hb=5b5968815dc672467f40ed6b49f05a590bdb8b4d;hp=e06d06e150e9a45cd90d62a495c22f3437b5b115;hpb=7b6940f1524cac6172e71529a989424ff18fb850;p=src%2Fapp-framework-binder.git diff --git a/src/afb-evt.c b/src/afb-evt.c index e06d06e1..46bcf6db 100644 --- a/src/afb-evt.c +++ b/src/afb-evt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2018 "IoT.bzh" + * Copyright (C) 2015-2019 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,6 +30,7 @@ #include "afb-evt.h" #include "afb-hook.h" #include "verbose.h" +#include "jobs.h" struct afb_evt_watch; @@ -74,8 +75,10 @@ struct afb_evtid { /* rwlock of the event */ pthread_rwlock_t rwlock; +#if WITH_AFB_HOOK /* hooking */ int hookflags; +#endif /* refcount */ int refcount; @@ -83,8 +86,11 @@ struct afb_evtid { /* id of the event */ int id; + /* has client? */ + int has_client; + /* fullname of the event */ - char fullname[1]; + char fullname[]; }; /* @@ -108,6 +114,30 @@ struct afb_evt_watch { unsigned activity; }; +/* + * structure for job of broadcasting events + */ +struct job_broadcast +{ + /** object atached to the event */ + struct json_object *object; + + /** 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_event_x2_itf afb_evt_event_x2_itf = { .broadcast = (void*)afb_evt_evtid_broadcast, @@ -117,14 +147,20 @@ static struct afb_event_x2_itf afb_evt_event_x2_itf = { .addref = (void*)afb_evt_evtid_addref }; +#if WITH_AFB_HOOK /* the interface for events */ -static struct afb_event_x2_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_rwlock_t listeners_rwlock = PTHREAD_RWLOCK_INITIALIZER; @@ -137,54 +173,105 @@ static int event_id_counter = 0; static int event_id_wrapped = 0; /* - * 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) { - int result; - struct afb_evt_listener *listener; + size_t sz = 1 + strlen(event); + struct job_broadcast *jb = malloc(sz + sizeof *jb); + if (jb) { + jb->object = object; + memcpy(jb->event, event, sz); + } + return jb; +} - result = 0; +/* + * 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(const char *event, struct json_object *object) +{ + struct afb_evt_listener *listener; 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, event, json_object_get(object)); listener = listener->next; } pthread_rwlock_unlock(&listeners_rwlock); - json_object_put(obj); - return result; } /* - * 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); + struct job_broadcast *jb = closure; - if (hookflags & afb_hook_flag_evt_broadcast_before) - afb_hook_evt_broadcast_before(event, id, obj); - - result = broadcast(event, obj, id); + if (signum == 0) + broadcast(jb->event, jb->object); + destroy_job_broadcast(jb); +} - if (hookflags & afb_hook_flag_evt_broadcast_after) - afb_hook_evt_broadcast_after(event, id, obj, result); +/* + * Broadcasts the string 'event' with its 'object' + */ +static int unhooked_broadcast(const char *event, struct json_object *object) +{ + struct job_broadcast *jb; + int rc; - json_object_put(obj); + jb = make_job_broadcast(event, object); + 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; + 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 +281,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); } +#if WITH_AFB_HOOK /* * Broadcasts the event 'evtid' with its 'object' * 'object' is released (like json_object_put) @@ -204,8 +292,23 @@ 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 /* * Broadcasts the 'event' with its 'object' @@ -214,37 +317,92 @@ 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); + int result; + +#if WITH_AFB_HOOK + json_object_get(object); + afb_hook_evt_broadcast_before(event, 0, object); +#endif + + result = unhooked_broadcast(event, object); + +#if WITH_AFB_HOOK + afb_hook_evt_broadcast_after(event, 0, object, result); + json_object_put(object); +#endif + return result; } /* * 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; + 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; } + evtid->has_client = has_client; pthread_rwlock_unlock(&evtid->rwlock); - json_object_put(obj); - return result; } +/* + * 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) @@ -274,6 +432,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' @@ -316,7 +475,7 @@ struct afb_evtid *afb_evt_evtid_create(const char *fullname) /* allocates the event */ len = strlen(fullname); - evtid = malloc(len + sizeof * evtid); + evtid = malloc(len + 1 + sizeof * evtid); if (evtid == NULL) goto error; @@ -340,12 +499,17 @@ struct afb_evtid *afb_evt_evtid_create(const char *fullname) evtid->refcount = 1; evtid->watchs = NULL; evtid->id = event_id_counter; + 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_event_x2_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); +#else + evtid->eventid.itf = &afb_evt_event_x2_itf; +#endif pthread_rwlock_unlock(&events_rwlock); /* returns the event */ @@ -383,6 +547,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' */ @@ -392,6 +557,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' @@ -435,6 +601,7 @@ void afb_evt_evtid_unref(struct afb_evtid *evtid) } } +#if WITH_AFB_HOOK /* * decrement the reference count of the event 'evtid' * and destroy it when the count reachs zero @@ -445,6 +612,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' @@ -463,6 +631,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'. */ @@ -473,6 +642,7 @@ 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' @@ -609,6 +779,7 @@ found: if (watch->activity == 0 && listener->itf->add != NULL) listener->itf->add(listener->closure, evtid->fullname, evtid->id); watch->activity++; + evtid->has_client = 1; pthread_rwlock_unlock(&listener->rwlock); return 0; @@ -642,6 +813,7 @@ int afb_evt_watch_sub_evtid(struct afb_evt_listener *listener, struct afb_evtid return -1; } +#if WITH_AFB_HOOK /* * update the hooks for events */ @@ -652,10 +824,11 @@ void afb_evt_update_hooks() 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_event_x2_itf; + evtid->eventid.itf = evtid->hookflags ? &afb_evt_hooked_event_x2_itf : &afb_evt_event_x2_itf; } pthread_rwlock_unlock(&events_rwlock); } +#endif inline struct afb_evtid *afb_evt_event_x2_to_evtid(struct afb_event_x2 *eventid) { @@ -740,6 +913,7 @@ int afb_evt_event_x2_remove_watch(struct afb_evt_listener *listener, struct afb_ } 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_event_x2_to_evtid(eventid); if (evtid) @@ -747,6 +921,9 @@ int afb_evt_event_x2_push(struct afb_event_x2 *eventid, struct json_object *obje json_object_put(object); return 0; } +#else + __attribute__((alias("afb_evt_event_x2_unhooked_push"))); +#endif int afb_evt_event_x2_unhooked_push(struct afb_event_x2 *eventid, struct json_object *object) { @@ -757,12 +934,18 @@ int afb_evt_event_x2_unhooked_push(struct afb_event_x2 *eventid, struct json_obj 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 - ? (struct afb_event_x1){ .itf = &afb_evt_hooked_eventid_itf, .closure = &evtid->eventid } +#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) {