X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=4282f624afe2c8116c611bc9929938462a30dff4;hb=03f863dd080d32f71c4a0755c02e23c72e4cb342;hp=95d089abfb9a900a72d5658ba3b56ebebc735e64;hpb=522569c5a9da8566f5213fa5b9b3abadf746331d;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 95d089ab..4282f624 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -37,14 +37,14 @@
 static struct json_object *xreq_json_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
-	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq->query));
+	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq));
 }
 
 static struct afb_arg xreq_get_cb(void *closure, const char *name)
 {
 	struct afb_xreq *xreq = closure;
 	if (xreq->queryitf->get)
-		return xreq->queryitf->get(xreq->query, name);
+		return xreq->queryitf->get(xreq, name);
 	else
 		return afb_msg_json_get_arg(xreq_json_cb(closure), name);
 }
@@ -52,50 +52,37 @@ 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);
 	} else {
 		xreq->replied = 1;
 		if (xreq->queryitf->success)
-			xreq->queryitf->success(xreq->query, obj, info);
+			xreq->queryitf->success(xreq, obj, info);
 		else
-			xreq->queryitf->reply(xreq->query, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL));
+			xreq->queryitf->reply(xreq, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL));
 	}
 }
 
 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 {
 		xreq->replied = 1;
 		if (xreq->queryitf->fail)
-			xreq->queryitf->fail(xreq->query, status, info);
+			xreq->queryitf->fail(xreq, status, info);
 		else
-			xreq->queryitf->reply(xreq->query, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
+			xreq->queryitf->reply(xreq, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
 	}
 }
 
 static const char *xreq_raw_cb(void *closure, size_t *size)
 {
 	struct afb_xreq *xreq = closure;
-	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);
@@ -126,24 +113,14 @@ static void xreq_context_set_cb(void *closure, void *value, void (*free_value)(v
 static void xreq_addref_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
-	afb_xreq_addref(xreq);
-}
-
-void afb_xreq_addref(struct afb_xreq *xreq)
-{
-	xreq->refcount++;
+	__atomic_add_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED);
 }
 
 static void xreq_unref_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
-	afb_xreq_unref(xreq);
-}
-
-void afb_xreq_unref(struct afb_xreq *xreq)
-{
-	if (!--xreq->refcount) {
-		xreq->queryitf->unref(xreq->query);
+	if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
+		xreq->queryitf->unref(xreq);
 	}
 }
 
@@ -170,7 +147,7 @@ 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);
+		return xreq->queryitf->subscribe(xreq, event);
 	ERROR("no event listener, subscription impossible");
 	errno = EINVAL;
 	return -1;
@@ -187,7 +164,7 @@ 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);
+		return xreq->queryitf->unsubscribe(xreq, event);
 	ERROR("no event listener, unsubscription impossible");
 	errno = EINVAL;
 	return -1;
@@ -197,13 +174,8 @@ static void xreq_subcall_cb(void *closure, const char *api, const char *verb, st
 {
 	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);
+		xreq->queryitf->subcall(xreq, api, verb, args, callback, cb_closure);
 	else
 		afb_subcall(xreq, api, verb, args, callback, cb_closure);
 }
@@ -277,12 +249,17 @@ static void xreq_hooked_addref_cb(void *closure)
 	afb_hook_xreq_addref(xreq);
 	xreq_addref_cb(closure);
 }
-/*
+
 static void xreq_hooked_unref_cb(void *closure)
 {
-	TODO
+	struct afb_xreq *xreq = closure;
+	afb_hook_xreq_unref(xreq);
+	if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
+		afb_hook_xreq_end(xreq);
+		xreq->queryitf->unref(xreq);
+	}
 }
-*/
+
 static void xreq_hooked_session_close_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
@@ -311,20 +288,47 @@ static int xreq_hooked_unsubscribe_cb(void *closure, struct afb_event event)
 	return afb_hook_xreq_unsubscribe(xreq, event, r);
 }
 
-/*
+struct reply
+{
+	struct afb_xreq *xreq;
+	void (*callback)(void*, int, struct json_object*);
+	void *closure;
+};
+
+static void xreq_hooked_subcall_reply_cb(void *closure, int iserror, struct json_object *result)
+{
+	struct reply *reply = closure;
+	
+	afb_hook_xreq_subcall_result(reply->xreq, iserror, result);
+	reply->callback(reply->closure, iserror, result);
+	free(reply);
+}
+
 static void xreq_hooked_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 reply *reply = malloc(sizeof *reply);
 	struct afb_xreq *xreq = closure;
-
-	afb_xreq_subcall(xreq, api, verb, args, callback, cb_closure);
+	afb_hook_xreq_subcall(xreq, api, verb, args);
+	if (reply) {
+		reply->xreq = xreq;
+		reply->callback = callback;
+		reply->closure = cb_closure;
+		xreq_subcall_cb(closure, api, verb, args, xreq_hooked_subcall_reply_cb, reply);
+	} else {
+		ERROR("out of memory");
+		xreq_subcall_cb(closure, api, verb, args, callback, cb_closure);
+	}
 }
 
 static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
+	int r;
 	struct afb_xreq *xreq = closure;
-	return afb_subcall_sync(xreq, api, verb, args, result);
+	afb_hook_xreq_subcallsync(xreq, api, verb, args);
+	r = xreq_subcallsync_cb(closure, api, verb, args, result);
+	return afb_hook_xreq_subcallsync_result(xreq, r, *result);
 }
-*/
+
 const struct afb_req_itf xreq_itf = {
 	.json = xreq_json_cb,
 	.get = xreq_get_cb,
@@ -354,13 +358,13 @@ const struct afb_req_itf xreq_hooked_itf = {
 	.context_get = xreq_hooked_context_get_cb,
 	.context_set = xreq_hooked_context_set_cb,
 	.addref = xreq_hooked_addref_cb,
-.unref = xreq_unref_cb,
+	.unref = xreq_hooked_unref_cb,
 	.session_close = xreq_hooked_session_close_cb,
 	.session_set_LOA = xreq_hooked_session_set_LOA_cb,
 	.subscribe = xreq_hooked_subscribe_cb,
 	.unsubscribe = xreq_hooked_unsubscribe_cb,
-.subcall = xreq_subcall_cb,
-.subcallsync = xreq_subcallsync_cb
+	.subcall = xreq_hooked_subcall_cb,
+	.subcallsync = xreq_hooked_subcallsync_cb
 };
 
 static inline struct afb_req to_req(struct afb_xreq *xreq)
@@ -368,6 +372,11 @@ static inline struct afb_req to_req(struct afb_xreq *xreq)
 	return (struct afb_req){ .itf = xreq->hookflags ? &xreq_hooked_itf : &xreq_itf, .closure = xreq };
 }
 
+void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
+{
+	afb_req_success(to_req(xreq), obj, info);
+}
+
 void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
 {
 	char *message;
@@ -380,6 +389,11 @@ void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const ch
 	free(message);
 }
 
+void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
+{
+	afb_req_fail(to_req(xreq), status, info);
+}
+
 void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...)
 {
 	char *message;
@@ -392,6 +406,31 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info
 	free(message);
 }
 
+const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
+{
+	return afb_req_raw(to_req(xreq), size);
+}
+
+void afb_xreq_addref(struct afb_xreq *xreq)
+{
+	afb_req_addref(to_req(xreq));
+}
+
+void afb_xreq_unref(struct afb_xreq *xreq)
+{
+	afb_req_unref(to_req(xreq));
+}
+
+void afb_xreq_unhooked_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)
+{
+	xreq_subcall_cb(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)
+{
+	afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
+}
+
 static int xcheck(struct afb_xreq *xreq, int sessionflags)
 {
 	if ((sessionflags & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
@@ -450,4 +489,9 @@ void afb_xreq_begin(struct afb_xreq *xreq)
 		afb_hook_xreq_begin(xreq);
 }
 
+void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
+{
+	xreq->refcount = 1;
+	xreq->queryitf = queryitf;
+}