X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=b64cefbe3be97b8851e7e02c1fa8a55bf9d87411;hb=7effe02be236921437fb77d8fbeb21eb62e35939;hp=6364018d3bcfe87c51536f28ee9c888d7810c646;hpb=7087ad1b81b55fb2c1c14e7d9cbb49c0bf75e28e;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 6364018d..b64cefbe 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -30,7 +30,6 @@
 #include "afb-evt.h"
 #include "afb-msg-json.h"
 #include "afb-subcall.h"
-#include "jobs.h"
 #include "verbose.h"
 
 
@@ -63,6 +62,13 @@ static void xreq_subcall_cb(
 		void (*callback)(void*, int, struct json_object*),
 		void *cb_closure);
 
+static int xreq_subcallsync_cb(
+		void *closure,
+		const char *api,
+		const char *verb,
+		struct json_object *args,
+		struct json_object **result);
+
 const struct afb_req_itf xreq_itf = {
 	.json = xreq_json_cb,
 	.get = xreq_get_cb,
@@ -78,14 +84,14 @@ const struct afb_req_itf xreq_itf = {
 	.session_set_LOA = xreq_session_set_LOA_cb,
 	.subscribe = xreq_subscribe_cb,
 	.unsubscribe = xreq_unsubscribe_cb,
-	.subcall = xreq_subcall_cb
+	.subcall = xreq_subcall_cb,
+	.subcallsync = xreq_subcallsync_cb
 };
 
-
 static struct json_object *xreq_json_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
-	return xreq->queryitf->json(xreq->query);
+	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq->query));
 }
 
 static struct afb_arg xreq_get_cb(void *closure, const char *name)
@@ -100,6 +106,11 @@ static struct afb_arg xreq_get_cb(void *closure, const char *name)
 static void xreq_success_cb(void *closure, struct json_object *obj, const char *info)
 {
 	struct afb_xreq *xreq = closure;
+	afb_xreq_success(xreq, obj, info);
+}
+
+void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
+{
 	if (xreq->replied) {
 		ERROR("reply called more than one time!!");
 		json_object_put(obj);
@@ -115,6 +126,11 @@ static void xreq_success_cb(void *closure, struct json_object *obj, const char *
 static void xreq_fail_cb(void *closure, const char *status, const char *info)
 {
 	struct afb_xreq *xreq = closure;
+	afb_xreq_fail(xreq, status, info);
+}
+
+void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
+{
 	if (xreq->replied) {
 		ERROR("reply called more than one time!!");
 	} else {
@@ -129,7 +145,12 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info)
 static const char *xreq_raw_cb(void *closure, size_t *size)
 {
 	struct afb_xreq *xreq = closure;
-	const char *result = json_object_to_json_string(xreq->queryitf->json(xreq->query));
+	return afb_xreq_raw(xreq, size);
+}
+
+const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
+{
+	const char *result = json_object_to_json_string(xreq_json_cb(xreq));
 	if (size != NULL)
 		*size = strlen(result);
 	return result;
@@ -195,8 +216,15 @@ static int xreq_session_set_LOA_cb(void *closure, unsigned level)
 static int xreq_subscribe_cb(void *closure, struct afb_event event)
 {
 	struct afb_xreq *xreq = closure;
+	return afb_xreq_subscribe(xreq, event);
+}
+
+int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event event)
+{
 	if (xreq->listener)
 		return afb_evt_add_watch(xreq->listener, event);
+	if (xreq->queryitf->subscribe)
+		return xreq->queryitf->subscribe(xreq->query, event);
 	ERROR("no event listener, subscription impossible");
 	errno = EINVAL;
 	return -1;
@@ -205,8 +233,15 @@ static int xreq_subscribe_cb(void *closure, struct afb_event event)
 static int xreq_unsubscribe_cb(void *closure, struct afb_event event)
 {
 	struct afb_xreq *xreq = closure;
+	return afb_xreq_unsubscribe(xreq, event);
+}
+
+int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
+{
 	if (xreq->listener)
 		return afb_evt_remove_watch(xreq->listener, event);
+	if (xreq->queryitf->unsubscribe)
+		return xreq->queryitf->unsubscribe(xreq->query, event);
 	ERROR("no event listener, unsubscription impossible");
 	errno = EINVAL;
 	return -1;
@@ -215,10 +250,22 @@ static int xreq_unsubscribe_cb(void *closure, struct afb_event event)
 static void xreq_subcall_cb(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
 {
 	struct afb_xreq *xreq = closure;
+
+	afb_xreq_subcall(xreq, api, verb, args, callback, cb_closure);
+}
+
+void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+{
 	if (xreq->queryitf->subcall)
 		xreq->queryitf->subcall(xreq->query, api, verb, args, callback, cb_closure);
 	else
-		afb_subcall(&xreq->context, api, verb, args, callback, cb_closure, (struct afb_req){ .itf = &xreq_itf, .closure = xreq });
+		afb_subcall(xreq, api, verb, args, callback, cb_closure);
+}
+
+static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+	struct afb_xreq *xreq = closure;
+	return afb_subcall_sync(xreq, api, verb, args, result);
 }
 
 void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
@@ -229,7 +276,7 @@ void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const ch
 	if (info == NULL || vasprintf(&message, info, args) < 0)
 		message = NULL;
 	va_end(args);
-	xreq_success_cb(xreq, obj, message);
+	afb_xreq_success(xreq, obj, message);
 	free(message);
 }
 
@@ -241,14 +288,12 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info
 	if (info == NULL || vasprintf(&message, info, args) < 0)
 		message = NULL;
 	va_end(args);
-	xreq_fail_cb(xreq, status, message);
+	afb_xreq_fail(xreq, status, message);
 	free(message);
 }
 
-static int xcheck(struct afb_xreq *xreq)
+static int xcheck(struct afb_xreq *xreq, int stag)
 {
-	int stag = xreq->sessionflags;
-
 	if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
 		if (!afb_context_check(&xreq->context)) {
 			afb_context_close(&xreq->context);
@@ -292,31 +337,9 @@ static int xcheck(struct afb_xreq *xreq)
 	return 1;
 }
 
-static void xreq_run_cb(int signum, void *arg)
+void afb_xreq_call(struct afb_xreq *xreq, int sessionflags, void (*callback)(struct afb_req req))
 {
-	struct afb_xreq *xreq = arg;
-
-	if (signum == 0)
-		xreq->callback((struct afb_req){ .itf = &xreq_itf, .closure = xreq });
-	else {
-		afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
-		
-	}
-	afb_xreq_unref(xreq);
-}
-
-void afb_xreq_call(struct afb_xreq *xreq)
-{
-	int rc;
-	if (xcheck(xreq)) {
-		afb_xreq_addref(xreq);
-		rc = jobs_queue(xreq->group, xreq->timeout, xreq_run_cb, xreq);
-		if (rc < 0) {
-			/* TODO: allows or not to proccess it directly as when no threading? (see above) */
-			ERROR("can't process job with threads: %m");
-			afb_xreq_fail_f(xreq, "cancelled", "not able to pipe a job for the task");
-			xreq_unref_cb(xreq);
-		}
-	}
+	if (xcheck(xreq, sessionflags))
+		callback((struct afb_req){ .itf = &xreq_itf, .closure = xreq });
 }