X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-xreq.c;h=b64cefbe3be97b8851e7e02c1fa8a55bf9d87411;hb=9fe2dfd3c4df334607083f989346090e1051a565;hp=b055f8a9a795b066db7fd507e23b74e0a1789ab2;hpb=8d322ebdd04d6de2d5649626bbc23aae0d0ed556;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index b055f8a9..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,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)
@@ -243,10 +250,22 @@ int afb_xreq_unsubscribe(struct afb_xreq *xreq, 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, ...)
@@ -273,10 +292,8 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info
 	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);
@@ -320,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 });
 }