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

diff --git a/src/afb-svc.c b/src/afb-svc.c
index d4932802..ac012914 100644
--- a/src/afb-svc.c
+++ b/src/afb-svc.c
@@ -18,11 +18,13 @@
 #define _GNU_SOURCE
 
 #include <stdlib.h>
+#include <string.h>
+#include <errno.h>
 
 #include <json-c/json.h>
 
-#include <afb/afb-req-itf.h>
-#include <afb/afb-service-itf.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
 
 #include "afb-session.h"
 #include "afb-context.h"
@@ -30,7 +32,9 @@
 #include "afb-msg-json.h"
 #include "afb-svc.h"
 #include "afb-xreq.h"
-#include "afb-apis.h"
+#include "afb-cred.h"
+#include "afb-apiset.h"
+#include "jobs.h"
 #include "verbose.h"
 
 /*
@@ -41,6 +45,9 @@ 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;
 
@@ -55,19 +62,29 @@ struct svc_req
 {
 	struct afb_xreq xreq;
 
+	struct afb_svc *svc;
+
 	/* the args */
 	void (*callback)(void*, int, struct json_object*);
 	void *closure;
+
+	/* sync */
+	struct jobloop *jobloop;
+	struct json_object *result;
+	int iserror;
 };
 
 /* functions for services */
 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);
+static int svc_call_sync(void *closure, const char *api, const char *verb, struct json_object *args,
+				struct json_object **result);
 
 /* the interface for services */
 static const struct afb_service_itf service_itf = {
-	.call = svc_call
+	.call = svc_call,
+	.call_sync = svc_call_sync
 };
 
 /* the interface for events */
@@ -89,17 +106,43 @@ const struct afb_xreq_query_itf afb_svc_xreq_itf = {
 /* the common session for services sharing their session */
 static struct afb_session *common_session;
 
+static inline struct afb_service to_afb_service(struct afb_svc *svc)
+{
+	return (struct afb_service){ .itf = &service_itf, .closure = svc };
+}
+
+/*
+ * Frees a service
+ */
+static void svc_free(struct afb_svc *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
  */
-static struct afb_svc *afb_svc_alloc(int share_session, void (*on_event)(const char *event, struct json_object *object))
+static struct afb_svc *afb_svc_alloc(
+			struct afb_apiset *apiset,
+			int share_session
+)
 {
 	struct afb_svc *svc;
 
 	/* allocates the svc handler */
-	svc = malloc(sizeof * svc);
-	if (svc == NULL)
-		goto error;
+	svc = calloc(1, sizeof * svc);
+	if (svc == NULL) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	/* instanciate the apiset */
+	svc->apiset = afb_apiset_addref(apiset);
 
 	/* instanciate the session */
 	if (share_session) {
@@ -107,62 +150,58 @@ static struct afb_svc *afb_svc_alloc(int share_session, void (*on_event)(const c
 		if (common_session == NULL) {
 			common_session = afb_session_create (NULL, 0);
 			if (common_session == NULL)
-				goto error2;
+				goto error;
 		}
 		svc->session = afb_session_addref(common_session);
 	} else {
 		/* session dedicated to the svc */
 		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 {
-		svc->listener = afb_evt_listener_create(&evt_itf, svc);
-		if (svc->listener == NULL)
-			goto error3;
+			goto error;
 	}
 
 	return svc;
 
-error3:
-	afb_session_unref(svc->session);
-error2:
-	free(svc);
 error:
+	svc_free(svc);
 	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))
+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(share_session, on_event);
+	svc = afb_svc_alloc(apiset, share_session);
 	if (svc == NULL)
 		goto error;
 
+	/* 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;
+	}
+
 	/* initialises the svc now */
-	rc = init((struct afb_service){ .itf = &service_itf, .closure = svc });
+	rc = start(to_afb_service(svc));
 	if (rc < 0)
-		goto error2;
+		goto error;
 
 	return svc;
 
-error2:
-	if (svc->listener != NULL)
-		afb_evt_listener_unref(svc->listener);
-	afb_session_unref(svc->session);
-	free(svc);
 error:
+	svc_free(svc);
 	return NULL;
 }
 
@@ -170,32 +209,41 @@ error:
  * Creates a new service
  */
 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),
-			int (*start)(const struct afb_binding_interface *interface, struct afb_service service),
-			const struct afb_binding_interface *interface)
+			struct afb_binding_data_v2 *data
+)
 {
 	int rc;
 	struct afb_svc *svc;
 
 	/* allocates the svc handler */
-	svc = afb_svc_alloc(share_session, on_event);
+	svc = afb_svc_alloc(apiset, share_session);
 	if (svc == NULL)
 		goto error;
+	data->service = to_afb_service(svc);
 
-	/* initialises the svc now */
-	rc = start(interface, (struct afb_service){ .itf = &service_itf, .closure = svc });
-	if (rc < 0)
-		goto error2;
+	/* 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;
+	}
+
+	/* starts the svc if needed */
+	if (start) {
+		rc = start();
+		if (rc < 0)
+			goto error;
+	}
 
 	return svc;
 
-error2:
-	if (svc->listener != NULL)
-		afb_evt_listener_unref(svc->listener);
-	afb_session_unref(svc->session);
-	free(svc);
 error:
+	svc_free(svc);
 	return NULL;
 }
 
@@ -209,6 +257,88 @@ static void svc_on_event(void *closure, const char *event, int eventid, struct j
 	json_object_put(object);
 }
 
+/*
+ * create an svc_req
+ */
+static struct svc_req *svcreq_create(struct afb_svc *svc, const char *api, const char *verb, struct json_object *args)
+{
+	struct svc_req *svcreq;
+	size_t lenapi, lenverb;
+	char *copy;
+
+	/* allocates the request */
+	lenapi = 1 + strlen(api);
+	lenverb = 1 + strlen(verb);
+	svcreq = malloc(lenapi + lenverb + sizeof *svcreq);
+	if (svcreq != NULL) {
+		/* initialises the request */
+		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.cred = afb_cred_current();
+		copy = (char*)&svcreq[1];
+		memcpy(copy, api, lenapi);
+		svcreq->xreq.api = copy;
+		copy = &copy[lenapi];
+		memcpy(copy, verb, lenverb);
+		svcreq->xreq.verb = copy;
+		svcreq->xreq.listener = svc->listener;
+		svcreq->xreq.json = args;
+		svcreq->svc = svc;
+	}
+	return svcreq;
+}
+
+/*
+ * destroys the svc_req
+ */
+static void svcreq_destroy(struct afb_xreq *xreq)
+{
+	struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
+
+	afb_context_disconnect(&svcreq->xreq.context);
+	json_object_put(svcreq->xreq.json);
+	afb_cred_unref(svcreq->xreq.cred);
+	free(svcreq);
+}
+
+static void svcreq_sync_leave(struct svc_req *svcreq)
+{
+	struct jobloop *jobloop = svcreq->jobloop;
+
+	if (jobloop) {
+		svcreq->jobloop = NULL;
+		jobs_leave(jobloop);
+	}
+}
+
+static void svcreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj)
+{
+	struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
+	if (svcreq->callback) {
+		svcreq->callback(svcreq->closure, iserror, obj);
+		json_object_put(obj);
+	} else {
+		svcreq->iserror = iserror;
+		svcreq->result = obj;
+		svcreq_sync_leave(svcreq);
+	}
+}
+
+static void svcreq_sync_enter(int signum, void *closure, struct jobloop *jobloop)
+{
+	struct svc_req *svcreq = closure;
+
+	if (!signum) {
+		svcreq->jobloop = jobloop;
+		afb_xreq_process(&svcreq->xreq, svcreq->svc->apiset);
+	} else {
+		svcreq->result = afb_msg_json_internal_error();
+		svcreq->iserror = 1;
+		svcreq_sync_leave(svcreq);
+	}
+}
+
 /*
  * Initiates a call for the service
  */
@@ -216,44 +346,55 @@ static void svc_call(void *closure, const char *api, const char *verb, struct js
 {
 	struct afb_svc *svc = closure;
 	struct svc_req *svcreq;
+	struct json_object *ierr;
 
 	/* allocates the request */
-	svcreq = calloc(1, sizeof *svcreq);
+	svcreq = svcreq_create(svc, api, verb, args);
 	if (svcreq == NULL) {
 		ERROR("out of memory");
 		json_object_put(args);
-		callback(cbclosure, 1, afb_msg_json_internal_error());
+		ierr = afb_msg_json_internal_error();
+		callback(cbclosure, 1, ierr);
+		json_object_put(ierr);
 		return;
 	}
 
 	/* initialises the request */
-	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->jobloop = NULL;
 	svcreq->callback = callback;
 	svcreq->closure = cbclosure;
 
 	/* terminates and frees ressources if needed */
-	afb_apis_call(&svcreq->xreq);
-	afb_xreq_unref(&svcreq->xreq);
+	afb_xreq_process(&svcreq->xreq, svc->apiset);
 }
 
-static void svcreq_destroy(struct afb_xreq *xreq)
+static int svc_call_sync(void *closure, const char *api, const char *verb, struct json_object *args,
+				struct json_object **result)
 {
-	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);
-}
+	struct afb_svc *svc = closure;
+	struct svc_req *svcreq;
+	int rc;
 
-static void svcreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj)
-{
-	struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
-	svcreq->callback(svcreq->closure, iserror, obj);
-	json_object_put(obj);
+	/* 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;
+	}
+
+	/* 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);
+	return rc;
 }