X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-svc.c;h=58e2b6d31392ef46dd5904dd0a983f274de83338;hb=7087ad1b81b55fb2c1c14e7d9cbb49c0bf75e28e;hp=95617d5db946f3f538af3ae20f865dc989d060e9;hpb=d8ef25780bffa6f91f013ef71b1ede908325e59d;p=src%2Fapp-framework-binder.git diff --git a/src/afb-svc.c b/src/afb-svc.c index 95617d5d..58e2b6d3 100644 --- a/src/afb-svc.c +++ b/src/afb-svc.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 "IoT.bzh" + * Copyright (C) 2016, 2017 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,11 +24,14 @@ #include #include -#include "session.h" +#include "afb-session.h" #include "afb-context.h" #include "afb-evt.h" #include "afb-subcall.h" #include "afb-svc.h" +#include "afb-xreq.h" +#include "afb-apis.h" +#include "verbose.h" /* * Structure for recording service @@ -36,7 +39,7 @@ struct afb_svc { /* session of the service */ - struct AFB_clientCtx *session; + struct afb_session *session; /* event listener of the service or NULL */ struct afb_evt_listener *listener; @@ -50,65 +53,53 @@ struct afb_svc */ struct svc_req { - /* - * CAUTION: 'context' field should be the first because there - * is an implicit convertion to struct afb_context - */ - struct afb_context context; + struct afb_xreq xreq; + + /* the args */ + struct json_object *args; + void (*callback)(void*, int, struct json_object*); + void *closure; /* the service */ struct afb_svc *svc; - - /* the count of references to the request */ - int refcount; }; /* functions for services */ -static void svc_on_event(struct afb_svc *svc, const char *event, int eventid, struct json_object *object); -static void svc_call(struct afb_svc *svc, const char *api, const char *verb, struct json_object *args, - void (*callback)(void*, int, struct json_object*), void *closure); +static void svc_on_event(void *closure, const char *event, int eventid, struct json_object *object); +static void svc_call(void *closure, const char *api, const char *verb, struct json_object *args, + void (*callback)(void*, int, struct json_object*), void *cbclosure); /* the interface for services */ static const struct afb_service_itf service_itf = { - .call = (void*)svc_call + .call = svc_call }; /* the interface for events */ static const struct afb_evt_itf evt_itf = { - .broadcast = (void*)svc_on_event, - .push = (void*)svc_on_event + .broadcast = svc_on_event, + .push = svc_on_event }; /* functions for requests of services */ -static void svcreq_addref(struct svc_req *svcreq); -static void svcreq_unref(struct svc_req *svcreq); -static int svcreq_subscribe(struct svc_req *svcreq, struct afb_event event); -static int svcreq_unsubscribe(struct svc_req *svcreq, struct afb_event event); -static void svcreq_subcall(struct svc_req *svcreq, const char *api, const char *verb, struct json_object *args, - void (*callback)(void*, int, struct json_object*), void *closure); +static struct json_object *svcreq_json(void *closure); +static void svcreq_destroy(void *closure); +static void svcreq_reply(void *closure, int iserror, json_object *obj); /* interface for requests of services */ -const struct afb_req_itf afb_svc_req_itf = { - .addref = (void*)svcreq_addref, - .unref = (void*)svcreq_unref, - .context_get = (void*)afb_context_get, - .context_set = (void*)afb_context_set, - .session_close = (void*)afb_context_close, - .session_set_LOA = (void*)afb_context_change_loa, - .subscribe = (void*)svcreq_subscribe, - .unsubscribe = (void*)svcreq_unsubscribe, - .subcall = (void*)svcreq_subcall +const struct afb_xreq_query_itf afb_svc_xreq_itf = { + .unref = svcreq_destroy, + .json = svcreq_json, + .reply = svcreq_reply }; -/* the common session for services sahring their session */ -static struct AFB_clientCtx *common_session; +/* the common session for services sharing their session */ +static struct afb_session *common_session; /* - * Creates a new service + * Allocates a new service */ -struct afb_svc *afb_svc_create(int share_session, int (*init)(struct afb_service service), void (*on_event)(const char *event, struct json_object *object)) +static struct afb_svc *afb_svc_alloc(int share_session, void (*on_event)(const char *event, struct json_object *object)) { - int rc; struct afb_svc *svc; /* allocates the svc handler */ @@ -120,19 +111,20 @@ struct afb_svc *afb_svc_create(int share_session, int (*init)(struct afb_service if (share_session) { /* session shared with other svcs */ if (common_session == NULL) { - common_session = ctxClientCreate (NULL, 0); + common_session = afb_session_create (NULL, 0); if (common_session == NULL) goto error2; } - svc->session = ctxClientAddRef(common_session); + svc->session = afb_session_addref(common_session); } else { /* session dedicated to the svc */ - svc->session = ctxClientCreate (NULL, 0); + svc->session = afb_session_create (NULL, 0); if (svc->session == NULL) goto error2; } /* initialises the listener if needed */ + svc->on_event = on_event; if (on_event == NULL) svc->listener = NULL; else { @@ -141,19 +133,73 @@ struct afb_svc *afb_svc_create(int share_session, int (*init)(struct afb_service goto error3; } + return svc; + +error3: + afb_session_unref(svc->session); +error2: + free(svc); +error: + return NULL; +} + +/* + * Creates a new service + */ +struct afb_svc *afb_svc_create(int share_session, int (*init)(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(share_session, on_event); + if (svc == NULL) + goto error; + /* initialises the svc now */ rc = init((struct afb_service){ .itf = &service_itf, .closure = svc }); if (rc < 0) - goto error4; + goto error2; return svc; -error4: +error2: if (svc->listener != NULL) afb_evt_listener_unref(svc->listener); -error3: - ctxClientUnref(svc->session); + afb_session_unref(svc->session); + free(svc); +error: + return NULL; +} + +/* + * Creates a new service + */ +struct afb_svc *afb_svc_create_v2( + int share_session, + void (*on_event)(const char *event, struct json_object *object), + int (*start)(const struct afb_binding_interface *interface, struct afb_service service), + const struct afb_binding_interface *interface) +{ + int rc; + struct afb_svc *svc; + + /* allocates the svc handler */ + svc = afb_svc_alloc(share_session, on_event); + if (svc == NULL) + goto error; + + /* initialises the svc now */ + rc = start(interface, (struct afb_service){ .itf = &service_itf, .closure = svc }); + if (rc < 0) + goto error2; + + return svc; + error2: + if (svc->listener != NULL) + afb_evt_listener_unref(svc->listener); + afb_session_unref(svc->session); free(svc); error: return NULL; @@ -162,65 +208,66 @@ error: /* * Propagates the event to the service */ -static void svc_on_event(struct afb_svc *svc, const char *event, int eventid, struct json_object *object) +static void svc_on_event(void *closure, const char *event, int eventid, struct json_object *object) { + struct afb_svc *svc = closure; svc->on_event(event, object); + json_object_put(object); } /* * Initiates a call for the service */ -static void svc_call(struct afb_svc *svc, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure) +static void svc_call(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cbclosure) { + struct afb_svc *svc = closure; struct svc_req *svcreq; /* allocates the request */ - svcreq = malloc(sizeof *svcreq); - if (svcreq == NULL) - return afb_subcall_internal_error(callback, closure); + svcreq = calloc(1, sizeof *svcreq); + if (svcreq == NULL) { + ERROR("out of memory"); + json_object_put(args); + return afb_subcall_internal_error(callback, cbclosure); + } /* initialises the request */ - afb_context_init(&svcreq->context, svc->session, NULL); - svcreq->context.validated = 1; + afb_context_init(&svcreq->xreq.context, svc->session, NULL); + svcreq->xreq.context.validated = 1; + svcreq->xreq.refcount = 1; + svcreq->xreq.query = svcreq; + svcreq->xreq.queryitf = &afb_svc_xreq_itf; + svcreq->xreq.api = api; + svcreq->xreq.verb = verb; + svcreq->xreq.listener = svc->listener; + svcreq->args = args; + svcreq->callback = callback; + svcreq->closure = cbclosure; svcreq->svc = svc; - svcreq->refcount = 1; - - /* makes the call */ - afb_subcall(&svcreq->context, api, verb, args, callback, closure, (struct afb_req){ .itf = &afb_svc_req_itf, .closure = svcreq }); /* terminates and frees ressources if needed */ - svcreq_unref(svcreq); -} - -static void svcreq_addref(struct svc_req *svcreq) -{ - svcreq->refcount++; -} - -static void svcreq_unref(struct svc_req *svcreq) -{ - if (0 == --svcreq->refcount) { - afb_context_disconnect(&svcreq->context); - free(svcreq); - } + afb_apis_xcall(&svcreq->xreq); + afb_xreq_unref(&svcreq->xreq); } -static int svcreq_subscribe(struct svc_req *svcreq, struct afb_event event) +static void svcreq_destroy(void *closure) { - if (svcreq->svc->listener == NULL) - return -1; - return afb_evt_add_watch(svcreq->svc->listener, event); + struct svc_req *svcreq = closure; + afb_context_disconnect(&svcreq->xreq.context); + json_object_put(svcreq->args); + free(svcreq); } -static int svcreq_unsubscribe(struct svc_req *svcreq, struct afb_event event) +static struct json_object *svcreq_json(void *closure) { - if (svcreq->svc->listener == NULL) - return -1; - return afb_evt_remove_watch(svcreq->svc->listener, event); + struct svc_req *svcreq = closure; + return svcreq->args; } -static void svcreq_subcall(struct svc_req *svcreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure) +static void svcreq_reply(void *closure, int iserror, json_object *obj) { - afb_subcall(&svcreq->context, api, verb, args, callback, closure, (struct afb_req){ .itf = &afb_svc_req_itf, .closure = svcreq }); + struct svc_req *svcreq = closure; + svcreq->callback(svcreq->closure, iserror, obj); + json_object_put(obj); }