diff options
| -rw-r--r-- | include/afb/afb-binding-v1.h | 2 | ||||
| -rw-r--r-- | include/afb/afb-binding-v2.h | 2 | ||||
| -rw-r--r-- | include/afb/afb-event-itf.h | 102 | ||||
| -rw-r--r-- | include/afb/afb-event.h | 98 | ||||
| -rw-r--r-- | include/afb/afb-eventid-itf.h | 48 | ||||
| -rw-r--r-- | include/afb/afb-eventid.h | 76 | ||||
| -rw-r--r-- | include/afb/afb-req-common.h | 2 | ||||
| -rw-r--r-- | src/afb-api-dbus.c | 2 | ||||
| -rw-r--r-- | src/afb-evt.c | 25 | ||||
| -rw-r--r-- | src/afb-hook.c | 2 | ||||
| -rw-r--r-- | src/afb-stub-ws.c | 2 | ||||
| -rw-r--r-- | src/afb-ws-json1.c | 2 |
12 files changed, 246 insertions, 117 deletions
diff --git a/include/afb/afb-binding-v1.h b/include/afb/afb-binding-v1.h index 6c9b5c19..4f881cd9 100644 --- a/include/afb/afb-binding-v1.h +++ b/include/afb/afb-binding-v1.h @@ -20,7 +20,7 @@ struct json_object; #include "afb-req-common.h" -#include "afb-event-itf.h" +#include "afb-event.h" #include "afb-service-common.h" #include "afb-daemon-common.h" diff --git a/include/afb/afb-binding-v2.h b/include/afb/afb-binding-v2.h index 4780b4ef..8e88b4fd 100644 --- a/include/afb/afb-binding-v2.h +++ b/include/afb/afb-binding-v2.h @@ -20,7 +20,7 @@ #include <stdint.h> #include "afb-auth.h" -#include "afb-event-itf.h" +#include "afb-event.h" #include "afb-req-common.h" #include "afb-service-common.h" #include "afb-daemon-common.h" diff --git a/include/afb/afb-event-itf.h b/include/afb/afb-event-itf.h index 6827d86a..8f2bfc78 100644 --- a/include/afb/afb-event-itf.h +++ b/include/afb/afb-event-itf.h @@ -17,102 +17,10 @@ #pragma once -/* avoid inclusion of <json-c/json.h> */ -struct json_object; +#pragma GCC warning "\n\n\ + This header file <afb/afb-event-itf.h> is OBSOLETE.\n\ + It is provided for COMPATIBILITY ONLY.\n\n\ + Please USE <afb/afb-binding.h> and ADAPT YOUR CODE to new names.\n" -/* - * Interface for handling requests. - * It records the functions to be called for the request. - * Don't use this structure directly. - * Use the helper functions documented below. - */ -struct afb_event_itf -{ - /* CAUTION: respect the order, add at the end */ - - int (*broadcast)(void *closure, struct json_object *obj); - int (*push)(void *closure, struct json_object *obj); - void (*unref)(void *closure); - const char *(*name)(void *closure); - void (*addref)(void *closure); -}; - -/* - * Describes the request of afb-daemon for bindings - */ -struct afb_event -{ - const struct afb_event_itf *itf; /* the interface to use */ - void *closure; /* the closure argument for functions of 'itf' */ -}; - -/* - * Checks wether the 'event' is valid or not. - * - * Returns 0 if not valid or 1 if valid. - */ -static inline int afb_event_is_valid(struct afb_event event) -{ - return !!event.itf; -} - -/* - * Broadcasts widely the 'event' with the data 'object'. - * 'object' can be NULL. - * - * For convenience, the function calls 'json_object_put' for 'object'. - * Thus, in the case where 'object' should remain available after - * the function returns, the function 'json_object_get' shall be used. - * - * Returns the count of clients that received the event. - */ -static inline int afb_event_broadcast(struct afb_event event, struct json_object *object) -{ - return event.itf->broadcast(event.closure, object); -} - -/* - * Pushes the 'event' with the data 'object' to its observers. - * 'object' can be NULL. - * - * For convenience, the function calls 'json_object_put' for 'object'. - * Thus, in the case where 'object' should remain available after - * the function returns, the function 'json_object_get' shall be used. - * - * Returns the count of clients that received the event. - */ -static inline int afb_event_push(struct afb_event event, struct json_object *object) -{ - return event.itf->push(event.closure, object); -} - -/* OBSOLETE */ -#define afb_event_drop afb_event_unref - -/* - * Gets the name associated to the 'event'. - */ -static inline const char *afb_event_name(struct afb_event event) -{ - return event.itf->name(event.closure); -} - -/* - * Decrease the count of reference to 'event' and - * destroys the event when the reference count falls to zero. - */ -static inline void afb_event_unref(struct afb_event event) -{ - event.itf->unref(event.closure); -} - -/* - * remove one reference to the data associated to the 'event' - * After calling this function, the event - * MUST NOT BE USED ANYMORE. - */ -static inline void afb_event_addref(struct afb_event event) -{ - event.itf->addref(event.closure); -} +#include "afb-binding.h" diff --git a/include/afb/afb-event.h b/include/afb/afb-event.h new file mode 100644 index 00000000..c3686fdd --- /dev/null +++ b/include/afb/afb-event.h @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2016, 2017 "IoT.bzh" + * Author: José Bollo <jose.bollo@iot.bzh> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#include "afb-eventid-itf.h" + +/* + * Describes the request of afb-daemon for bindings + */ +struct afb_event +{ + const struct afb_eventid_itf *itf; /* the interface to use */ + struct afb_eventid *closure; /* the closure argument for functions of 'itf' */ +}; + +/* + * Checks wether the 'event' is valid or not. + * + * Returns 0 if not valid or 1 if valid. + */ +static inline int afb_event_is_valid(struct afb_event event) +{ + return !!event.itf; +} + +/* + * Broadcasts widely the 'event' with the data 'object'. + * 'object' can be NULL. + * + * For convenience, the function calls 'json_object_put' for 'object'. + * Thus, in the case where 'object' should remain available after + * the function returns, the function 'json_object_get' shall be used. + * + * Returns the count of clients that received the event. + */ +static inline int afb_event_broadcast(struct afb_event event, struct json_object *object) +{ + return event.itf->broadcast(event.closure, object); +} + +/* + * Pushes the 'event' with the data 'object' to its observers. + * 'object' can be NULL. + * + * For convenience, the function calls 'json_object_put' for 'object'. + * Thus, in the case where 'object' should remain available after + * the function returns, the function 'json_object_get' shall be used. + * + * Returns the count of clients that received the event. + */ +static inline int afb_event_push(struct afb_event event, struct json_object *object) +{ + return event.itf->push(event.closure, object); +} + +/* OBSOLETE */ +#define afb_event_drop afb_event_unref + +/* + * Gets the name associated to the 'event'. + */ +static inline const char *afb_event_name(struct afb_event event) +{ + return event.itf->name(event.closure); +} + +/* + * Decreases the count of reference to 'event' and + * destroys the event when the reference count falls to zero. + */ +static inline void afb_event_unref(struct afb_event event) +{ + event.itf->unref(event.closure); +} + +/* + * Increases the count of reference to 'event' + */ +static inline void afb_event_addref(struct afb_event event) +{ + event.itf->addref(event.closure); +} + diff --git a/include/afb/afb-eventid-itf.h b/include/afb/afb-eventid-itf.h new file mode 100644 index 00000000..84ba2f97 --- /dev/null +++ b/include/afb/afb-eventid-itf.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2016, 2017 "IoT.bzh" + * Author: José Bollo <jose.bollo@iot.bzh> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +struct json_object; +struct afb_eventid; +struct afb_eventid_itf; + +/* + * Interface for handling requests. + * It records the functions to be called for the request. + * Don't use this structure directly. + * Use the helper functions documented below. + */ +struct afb_eventid_itf +{ + /* CAUTION: respect the order, add at the end */ + + int (*broadcast)(struct afb_eventid *eventid, struct json_object *obj); + int (*push)(struct afb_eventid *eventid, struct json_object *obj); + void (*unref)(struct afb_eventid *eventid); /* aka drop */ + const char *(*name)(struct afb_eventid *eventid); + struct afb_eventid *(*addref)(struct afb_eventid *eventid); +}; + +/* + * Describes the request of afb-daemon for bindings + */ +struct afb_eventid +{ + const struct afb_eventid_itf *itf; /* the interface to use */ +}; + diff --git a/include/afb/afb-eventid.h b/include/afb/afb-eventid.h new file mode 100644 index 00000000..6f0ed329 --- /dev/null +++ b/include/afb/afb-eventid.h @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2016, 2017 "IoT.bzh" + * Author: José Bollo <jose.bollo@iot.bzh> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#include "afb-eventid-itf.h" + +/* + * Broadcasts widely an event of 'eventid' with the data 'object'. + * 'object' can be NULL. + * + * For convenience, the function calls 'json_object_put' for 'object'. + * Thus, in the case where 'object' should remain available after + * the function returns, the function 'json_object_get' shall be used. + * + * Returns the count of clients that received the event. + */ +static inline int afb_eventid_broadcast(struct afb_eventid *eventid, struct json_object *object) +{ + return eventid->itf->broadcast(eventid, object); +} + +/* + * Pushes an event of 'eventid' with the data 'object' to its observers. + * 'object' can be NULL. + * + * For convenience, the function calls 'json_object_put' for 'object'. + * Thus, in the case where 'object' should remain available after + * the function returns, the function 'json_object_get' shall be used. + * + * Returns the count of clients that received the event. + */ +static inline int afb_eventid_push(struct afb_eventid *eventid, struct json_object *object) +{ + return eventid->itf->push(eventid, object); +} + +/* + * Gets the name associated to 'eventid'. + */ +static inline const char *afb_eventid_name(struct afb_eventid *eventid) +{ + return eventid->itf->name(eventid); +} + +/* + * Decrease the count of reference to 'eventid' and + * destroys the eventid when the reference count falls to zero. + */ +static inline void afb_eventid_unref(struct afb_eventid *eventid) +{ + eventid->itf->unref(eventid); +} + +/* + * Increases the count of reference to 'eventid' + */ +static inline struct afb_eventid *afb_eventid_addref(struct afb_eventid *eventid) +{ + return eventid->itf->addref(eventid); +} + diff --git a/include/afb/afb-req-common.h b/include/afb/afb-req-common.h index adb0acf4..6784a3b1 100644 --- a/include/afb/afb-req-common.h +++ b/include/afb/afb-req-common.h @@ -19,7 +19,7 @@ #include <stdarg.h> -#include "afb-event-itf.h" +#include "afb-event.h" struct json_object; struct afb_stored_req; diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c index a9401570..33435a96 100644 --- a/src/afb-api-dbus.c +++ b/src/afb-api-dbus.c @@ -27,7 +27,7 @@ #include <systemd/sd-bus.h> #include <json-c/json.h> -#include <afb/afb-event-itf.h> +#include <afb/afb-event.h> #include "afb-common.h" diff --git a/src/afb-evt.c b/src/afb-evt.c index 96366de6..aba5e9b6 100644 --- a/src/afb-evt.c +++ b/src/afb-evt.c @@ -25,7 +25,8 @@ #include <pthread.h> #include <json-c/json.h> -#include <afb/afb-event-itf.h> +#include <afb/afb-eventid-itf.h> +#include <afb/afb-event.h> #include "afb-evt.h" #include "afb-hook.h" @@ -63,7 +64,7 @@ struct afb_evt_listener { struct afb_evtid { /* interface */ - struct afb_event_itf *itf; + struct afb_eventid eventid; /* next event */ struct afb_evtid *next; @@ -71,8 +72,8 @@ struct afb_evtid { /* head of the list of listeners watching the event */ struct afb_evt_watch *watchs; - /* id of the event */ - int id; + /* mutex of the event */ + pthread_mutex_t mutex; /* hooking */ int hookflags; @@ -80,8 +81,8 @@ struct afb_evtid { /* refcount */ int refcount; - /* mutex of the event */ - pthread_mutex_t mutex; + /* id of the event */ + int id; /* fullname of the event */ char fullname[1]; @@ -109,7 +110,7 @@ struct afb_evt_watch { }; /* the interface for events */ -static struct afb_event_itf afb_evt_event_itf = { +static struct afb_eventid_itf afb_evt_eventid_itf = { .broadcast = (void*)afb_evt_evtid_broadcast, .push = (void*)afb_evt_evtid_push, .unref = (void*)afb_evt_evtid_unref, @@ -118,7 +119,7 @@ static struct afb_event_itf afb_evt_event_itf = { }; /* the interface for events */ -static struct afb_event_itf afb_evt_hooked_event_itf = { +static struct afb_eventid_itf afb_evt_hooked_eventid_itf = { .broadcast = (void*)afb_evt_evtid_hooked_broadcast, .push = (void*)afb_evt_evtid_hooked_push, .unref = (void*)afb_evt_evtid_hooked_unref, @@ -340,7 +341,7 @@ struct afb_evtid *afb_evt_evtid_create(const char *fullname) pthread_mutex_init(&evtid->mutex, NULL); evtids = evtid; evtid->hookflags = afb_hook_flags_evt(evtid->fullname); - evtid->itf = evtid->hookflags ? &afb_evt_hooked_event_itf : &afb_evt_event_itf; + evtid->eventid.itf = evtid->hookflags ? &afb_evt_hooked_eventid_itf : &afb_evt_eventid_itf; if (evtid->hookflags & afb_hook_flag_evt_create) afb_hook_evt_create(evtid->fullname, evtid->id); pthread_mutex_unlock(&events_mutex); @@ -629,19 +630,19 @@ void afb_evt_update_hooks() pthread_mutex_lock(&events_mutex); for (evtid = evtids ; evtid ; evtid = evtid->next) { evtid->hookflags = afb_hook_flags_evt(evtid->fullname); - evtid->itf = evtid->hookflags ? &afb_evt_hooked_event_itf : &afb_evt_event_itf; + evtid->eventid.itf = evtid->hookflags ? &afb_evt_hooked_eventid_itf : &afb_evt_eventid_itf; } pthread_mutex_unlock(&events_mutex); } struct afb_evtid *afb_evt_to_evtid(struct afb_event event) { - return (struct afb_evtid*)(event.itf == &afb_evt_hooked_event_itf ? event.closure : NULL); + return (struct afb_evtid*)(event.itf == &afb_evt_hooked_eventid_itf ? event.closure : NULL); } struct afb_event afb_evt_from_evtid(struct afb_evtid *evtid) { - return (struct afb_event){ .itf = evtid ? &afb_evt_hooked_event_itf : NULL, .closure = evtid }; + return (struct afb_event){ .itf = evtid ? &afb_evt_hooked_eventid_itf : NULL, .closure = &evtid->eventid }; } /* diff --git a/src/afb-hook.c b/src/afb-hook.c index 3c015dcf..68e524fd 100644 --- a/src/afb-hook.c +++ b/src/afb-hook.c @@ -29,7 +29,7 @@ #include <json-c/json.h> #include <afb/afb-req-common.h> -#include <afb/afb-event-itf.h> +#include <afb/afb-event.h> #include "afb-context.h" #include "afb-hook.h" diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c index d1ce80b2..e7c8997e 100644 --- a/src/afb-stub-ws.c +++ b/src/afb-stub-ws.c @@ -35,7 +35,7 @@ #include <json-c/json.h> #include <systemd/sd-event.h> -#include <afb/afb-event-itf.h> +#include <afb/afb-event.h> #include "afb-common.h" diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index 7c05cf70..774349ac 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -25,8 +25,6 @@ #include <json-c/json.h> -#include <afb/afb-event-itf.h> - #include "afb-wsj1.h" #include "afb-ws-json1.h" #include "afb-common.h" |