X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-xreq.c;h=15ebae056a4f140ef0c25ff5d1d0029efa1763fb;hb=ede362db9ea82b85a531849c21582f1692bf0d4d;hp=1a70fe7a951e7829173515019fd72441757c8784;hpb=5e7d680c173ddbb26db4e49f7738f82e89299362;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 1a70fe7a..15ebae05 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,7 +84,8 @@ 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)
@@ -249,6 +256,17 @@ static void xreq_subcall_cb(void *closure, const char *api, const char *verb, st
 		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;
+/*
+	if (xreq->queryitf->subcallsync)
+		xreq->queryitf->subcall(xreq->query, api, verb, args, callback, cb_closure);
+	else
+*/
+		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, ...)
 {
 	char *message;
@@ -320,31 +338,9 @@ static int xcheck(struct afb_xreq *xreq)
 	return 1;
 }
 
-static void xreq_run_cb(int signum, void *arg)
-{
-	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))
+		xreq->callback((struct afb_req){ .itf = &xreq_itf, .closure = xreq });
 }