X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-svc.c;h=93e85533856b0a9df4f41c2531242adab31105ff;hb=0b838a6101edc810098ee0645d3bfd966096ae07;hp=c52ad654a0fb2eff8ab0b9799331d53dfe644381;hpb=a758d774aa5dacc07d2840f1b7ccef793863389f;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-svc.c b/src/afb-svc.c
index c52ad654..93e85533 100644
--- a/src/afb-svc.c
+++ b/src/afb-svc.c
@@ -29,6 +29,9 @@
 #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
@@ -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 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 */
@@ -142,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:
 	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;
@@ -163,8 +208,9 @@ 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);
 }
@@ -172,57 +218,56 @@ static void svc_on_event(struct afb_svc *svc, const char *event, int eventid, st
 /*
  * 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_call(&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);
 }