#include "afb-xreq.h"
#include "afb-cred.h"
#include "afb-apiset.h"
+#include "afb-hook.h"
#include "jobs.h"
#include "verbose.h"
-/*
- * Structure for recording service
- */
-struct afb_svc
-{
- /* session of the service */
- struct afb_session *session;
- /* the apiset for the service */
- struct afb_apiset *apiset;
-
- /* event listener of the service or NULL */
- struct afb_evt_listener *listener;
-
- /* on event callback for the service */
- void (*on_event)(const char *event, struct json_object *object);
-};
+#define HOOK(x,...) if((svc)->hookflags & afb_hook_flag_svc_##x) afb_hook_svc_##x(__VA_ARGS__)
/*
* Structure for requests initiated by the service
/* sync */
struct jobloop *jobloop;
struct json_object *result;
- int iserror;
+ int status;
+ int async;
};
/* functions for services */
/* functions for requests of services */
static void svcreq_destroy(struct afb_xreq *xreq);
-static void svcreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj);
+static void svcreq_reply(struct afb_xreq *xreq, int status, json_object *obj);
/* interface for requests of services */
const struct afb_xreq_query_itf afb_svc_xreq_itf = {
/*
* Frees a service
*/
-static void svc_free(struct afb_svc *svc)
+void afb_svc_destroy(struct afb_svc *svc, struct afb_service *service)
{
- if (svc->listener != NULL)
- afb_evt_listener_unref(svc->listener);
- if (svc->session)
- afb_session_unref(svc->session);
- afb_apiset_unref(svc->apiset);
- free(svc);
+ if (service)
+ *service = (struct afb_service){ .itf = NULL, .closure = NULL };
+ if (svc) {
+ if (svc->listener != NULL)
+ afb_evt_listener_unref(svc->listener);
+ if (svc->session)
+ afb_session_unref(svc->session);
+ afb_apiset_unref(svc->apiset);
+ free(svc);
+ }
}
/*
- * Allocates a new service
+ * Creates a new service
*/
-static struct afb_svc *afb_svc_alloc(
+struct afb_svc *afb_svc_create(
+ const char *api,
struct afb_apiset *apiset,
- int share_session
+ int share_session,
+ void (*on_event)(const char *event, struct json_object *object),
+ struct afb_service *service
)
{
struct afb_svc *svc;
}
/* instanciate the apiset */
+ svc->api = api;
svc->apiset = afb_apiset_addref(apiset);
/* instanciate the session */
goto error;
}
- return svc;
-
-error:
- svc_free(svc);
- return NULL;
-}
-
-/*
- * Creates a new service
- */
-struct afb_svc *afb_svc_create_v1(
- struct afb_apiset *apiset,
- int share_session,
- int (*start)(struct afb_service service),
- void (*on_event)(const char *event, struct json_object *object)
-)
-{
- int rc;
- struct afb_svc *svc;
-
- /* allocates the svc handler */
- svc = afb_svc_alloc(apiset, share_session);
- if (svc == NULL)
- goto error;
+ svc->hookflags = afb_hook_flags_svc(svc->api);
+ if (service)
+ *service = to_afb_service(svc);
/* initialises the listener if needed */
if (on_event) {
goto error;
}
- /* initialises the svc now */
- rc = start(to_afb_service(svc));
- if (rc < 0)
- goto error;
-
return svc;
error:
- svc_free(svc);
+ afb_svc_destroy(svc, service);
return NULL;
}
/*
- * Creates a new service
+ * Starts a new service (v1)
*/
-struct afb_svc *afb_svc_create_v2(
- struct afb_apiset *apiset,
- int share_session,
- int (*start)(),
- void (*on_event)(const char *event, struct json_object *object),
- struct afb_binding_data_v2 *data
-)
+int afb_svc_start_v1(struct afb_svc *svc, int (*start)(struct afb_service))
{
int rc;
- struct afb_svc *svc;
-
- /* allocates the svc handler */
- svc = afb_svc_alloc(apiset, share_session);
- if (svc == NULL)
- goto error;
- data->service = to_afb_service(svc);
- /* initialises the listener if needed */
- if (on_event) {
- svc->on_event = on_event;
- svc->listener = afb_evt_listener_create(&evt_itf, svc);
- if (svc->listener == NULL)
- goto error;
- }
+ HOOK(start_before, svc);
+ rc = start(to_afb_service(svc));
+ HOOK(start_after, svc, rc);
+ return rc;
+}
- /* starts the svc if needed */
- if (start) {
- rc = start();
- if (rc < 0)
- goto error;
- }
+/*
+ * Starts a new service (v2)
+ */
+int afb_svc_start_v2(struct afb_svc *svc, int (*start)())
+{
+ int rc;
- return svc;
+ HOOK(start_before, svc);
+ rc = start();
+ HOOK(start_after, svc, rc);
+ return rc;
+}
-error:
- svc_free(svc);
- return NULL;
+/*
+ * Request to updates the hooks
+ */
+void afb_svc_update_hook(struct afb_svc *svc)
+{
+ svc->hookflags = afb_hook_flags_svc(svc->api);
}
/*
static void svc_on_event(void *closure, const char *event, int eventid, struct json_object *object)
{
struct afb_svc *svc = closure;
+
+ HOOK(on_event_before, svc, event, eventid, object);
svc->on_event(event, object);
+ HOOK(on_event_after, svc, event, eventid, object);
json_object_put(object);
}
}
}
-static void svcreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj)
+static void svcreq_reply(struct afb_xreq *xreq, int status, json_object *obj)
{
struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
- if (svcreq->callback) {
- svcreq->callback(svcreq->closure, iserror, obj);
+ if (svcreq->async) {
+ struct afb_svc *svc = svcreq->svc;
+ if (svcreq->callback)
+ svcreq->callback(svcreq->closure, status, obj);
+ HOOK(call_result, svc, status, obj);
json_object_put(obj);
} else {
- svcreq->iserror = iserror;
+ svcreq->status = status;
svcreq->result = obj;
svcreq_sync_leave(svcreq);
}
afb_xreq_process(&svcreq->xreq, svcreq->svc->apiset);
} else {
svcreq->result = afb_msg_json_internal_error();
- svcreq->iserror = 1;
+ svcreq->status = -1;
svcreq_sync_leave(svcreq);
}
}
struct svc_req *svcreq;
struct json_object *ierr;
+ HOOK(call, svc, api, verb, args);
+
/* allocates the request */
svcreq = svcreq_create(svc, api, verb, args);
if (svcreq == NULL) {
ERROR("out of memory");
json_object_put(args);
ierr = afb_msg_json_internal_error();
- callback(cbclosure, 1, ierr);
+ if (callback)
+ callback(cbclosure, -1, ierr);
+ HOOK(call_result, svc, -1, ierr);
json_object_put(ierr);
return;
}
svcreq->jobloop = NULL;
svcreq->callback = callback;
svcreq->closure = cbclosure;
+ svcreq->async = 1;
/* terminates and frees ressources if needed */
afb_xreq_process(&svcreq->xreq, svc->apiset);
{
struct afb_svc *svc = closure;
struct svc_req *svcreq;
+ struct json_object *resu;
int rc;
+ HOOK(callsync, svc, api, verb, args);
+
/* allocates the request */
svcreq = svcreq_create(svc, api, verb, args);
if (svcreq == NULL) {
ERROR("out of memory");
errno = ENOMEM;
json_object_put(args);
- *result = afb_msg_json_internal_error();
- return -1;
+ resu = afb_msg_json_internal_error();
+ rc = -1;
+ } else {
+ /* initialises the request */
+ svcreq->jobloop = NULL;
+ svcreq->callback = NULL;
+ svcreq->result = NULL;
+ svcreq->status = 0;
+ svcreq->async = 0;
+ afb_xreq_addref(&svcreq->xreq);
+ rc = jobs_enter(NULL, 0, svcreq_sync_enter, svcreq);
+ if (rc >= 0)
+ rc = svcreq->status;
+ resu = (rc >= 0 || svcreq->result) ? svcreq->result : afb_msg_json_internal_error();
+ afb_xreq_unref(&svcreq->xreq);
}
-
- /* initialises the request */
- svcreq->jobloop = NULL;
- svcreq->callback = NULL;
- svcreq->result = NULL;
- svcreq->iserror = 1;
- afb_xreq_addref(&svcreq->xreq);
- rc = jobs_enter(NULL, 0, svcreq_sync_enter, svcreq);
- rc = rc >= 0 && !svcreq->iserror;
- *result = (rc || svcreq->result) ? svcreq->result : afb_msg_json_internal_error();
- afb_xreq_unref(&svcreq->xreq);
+ HOOK(callsync_result, svc, rc, resu);
+ if (result)
+ *result = resu;
+ else
+ json_object_put(resu);
return rc;
}
Code Review / src / app-framework-binder.git / blobdiff