X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-svc.c;h=d4932802e74186857942cdaac8c58cc09ebf79e0;hb=03f863dd080d32f71c4a0755c02e23c72e4cb342;hp=11e6872f2d7d5ecfb693ff454e1b728f58301fec;hpb=c9ba2ce49808a19a4ef982280a46256797b830ae;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-svc.c b/src/afb-svc.c
index 11e6872f..d4932802 100644
--- a/src/afb-svc.c
+++ b/src/afb-svc.c
@@ -27,8 +27,11 @@
 #include "afb-session.h"
 #include "afb-context.h"
 #include "afb-evt.h"
-#include "afb-subcall.h"
+#include "afb-msg-json.h"
 #include "afb-svc.h"
+#include "afb-xreq.h"
+#include "afb-apis.h"
+#include "verbose.h"
 
 /*
  * Structure for recording service
@@ -50,17 +53,11 @@ 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 service */
-	struct afb_svc *svc;
-
-	/* the count of references to the request */
-	int refcount;
+	/* the args */
+	void (*callback)(void*, int, struct json_object*);
+	void *closure;
 };
 
 /* functions for services */
@@ -80,24 +77,13 @@ static const struct afb_evt_itf evt_itf = {
 };
 
 /* 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 void svcreq_destroy(struct afb_xreq *xreq);
+static void svcreq_reply(struct afb_xreq *xreq, 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,
+	.reply = svcreq_reply
 };
 
 /* the common session for services sharing their session */
@@ -232,52 +218,42 @@ static void svc_call(void *closure, const char *api, const char *verb, struct js
 	struct svc_req *svcreq;
 
 	/* allocates the request */
-	svcreq = malloc(sizeof *svcreq);
-	if (svcreq == NULL)
-		return afb_subcall_internal_error(callback, cbclosure);
+	svcreq = calloc(1, sizeof *svcreq);
+	if (svcreq == NULL) {
+		ERROR("out of memory");
+		json_object_put(args);
+		callback(cbclosure, 1, afb_msg_json_internal_error());
+		return;
+	}
 
 	/* initialises the request */
-	afb_context_init(&svcreq->context, svc->session, NULL);
-	svcreq->context.validated = 1;
-	svcreq->svc = svc;
-	svcreq->refcount = 1;
-
-	/* makes the call */
-	afb_subcall(&svcreq->context, api, verb, args, callback, cbclosure, (struct afb_req){ .itf = &afb_svc_req_itf, .closure = svcreq });
+	afb_xreq_init(&svcreq->xreq, &afb_svc_xreq_itf);
+	afb_context_init(&svcreq->xreq.context, svc->session, NULL);
+	svcreq->xreq.context.validated = 1;
+	svcreq->xreq.api = api;
+	svcreq->xreq.verb = verb;
+	svcreq->xreq.listener = svc->listener;
+	svcreq->xreq.json = args;
+	svcreq->callback = callback;
+	svcreq->closure = cbclosure;
 
 	/* 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);
-	}
-}
-
-static int svcreq_subscribe(struct svc_req *svcreq, struct afb_event event)
-{
-	if (svcreq->svc->listener == NULL)
-		return -1;
-	return afb_evt_add_watch(svcreq->svc->listener, event);
+	afb_apis_call(&svcreq->xreq);
+	afb_xreq_unref(&svcreq->xreq);
 }
 
-static int svcreq_unsubscribe(struct svc_req *svcreq, struct afb_event event)
+static void svcreq_destroy(struct afb_xreq *xreq)
 {
-	if (svcreq->svc->listener == NULL)
-		return -1;
-	return afb_evt_remove_watch(svcreq->svc->listener, event);
+	struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
+	afb_context_disconnect(&svcreq->xreq.context);
+	json_object_put(svcreq->xreq.json);
+	free(svcreq);
 }
 
-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(struct afb_xreq *xreq, 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 = CONTAINER_OF_XREQ(struct svc_req, xreq);
+	svcreq->callback(svcreq->closure, iserror, obj);
+	json_object_put(obj);
 }