X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=0fa13dfdc1c3f9f62b60d1b7a5e98d9892841d07;hb=b182590a555afe093d2d6e5cdf3e1e2410d1a0f5;hp=60a0a8016d15aeabd0cc1475df12759aa750ec6b;hpb=03f863dd080d32f71c4a0755c02e23c72e4cb342;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index 60a0a801..0fa13dfd 100644
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -25,19 +25,16 @@
 
 #include <json-c/json.h>
 
-#include <afb/afb-req-itf.h>
-
 #include "afb-wsj1.h"
 #include "afb-ws-json1.h"
-#include "afb-common.h"
+#include "afb-systemd.h"
 #include "afb-msg-json.h"
 #include "afb-session.h"
 #include "afb-cred.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
 #include "afb-xreq.h"
 #include "afb-context.h"
 #include "afb-evt.h"
-#include "afb-subcall.h"
 #include "verbose.h"
 
 /* predeclaration of structures */
@@ -51,7 +48,7 @@ static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid
 
 /* predeclaration of wsreq callbacks */
 static void wsreq_destroy(struct afb_xreq *xreq);
-static void wsreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj);
+static void wsreq_reply(struct afb_xreq *xreq, int status, json_object *obj);
 
 /* declaration of websocket structure */
 struct afb_ws_json1
@@ -63,6 +60,7 @@ struct afb_ws_json1
 	struct afb_evt_listener *listener;
 	struct afb_wsj1 *wsj1;
 	struct afb_cred *cred;
+	struct afb_apiset *apiset;
 	int new_session;
 };
 
@@ -101,7 +99,7 @@ static const struct afb_evt_itf evt_itf = {
 ****************************************************************
 ***************************************************************/
 
-struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure)
+struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure)
 {
 	struct afb_ws_json1 *result;
 
@@ -120,7 +118,7 @@ struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, vo
 	if (result->session == NULL)
 		goto error2;
 
-	result->wsj1 = afb_wsj1_create(afb_common_get_event_loop(), fd, &wsj1_itf, result);
+	result->wsj1 = afb_wsj1_create(afb_systemd_get_event_loop(), fd, &wsj1_itf, result);
 	if (result->wsj1 == NULL)
 		goto error3;
 
@@ -129,6 +127,7 @@ struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, vo
 		goto error4;
 
 	result->cred = afb_cred_create_for_socket(fd);
+	result->apiset = afb_apiset_addref(apiset);
 	return result;
 
 error4:
@@ -142,28 +141,29 @@ error:
 	return NULL;
 }
 
-static struct afb_ws_json1 *aws_addref(struct afb_ws_json1 *ws)
+struct afb_ws_json1 *afb_ws_json1_addref(struct afb_ws_json1 *ws)
 {
-	ws->refcount++;
+	__atomic_add_fetch(&ws->refcount, 1, __ATOMIC_RELAXED);
 	return ws;
 }
 
-static void aws_unref(struct afb_ws_json1 *ws)
+void afb_ws_json1_unref(struct afb_ws_json1 *ws)
 {
-	if (--ws->refcount == 0) {
+	if (!__atomic_sub_fetch(&ws->refcount, 1, __ATOMIC_RELAXED)) {
 		afb_evt_listener_unref(ws->listener);
 		afb_wsj1_unref(ws->wsj1);
 		if (ws->cleanup != NULL)
 			ws->cleanup(ws->cleanup_closure);
 		afb_session_unref(ws->session);
 		afb_cred_unref(ws->cred);
+		afb_apiset_unref(ws->apiset);
 		free(ws);
 	}
 }
 
 static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1)
 {
-	aws_unref(ws);
+	afb_ws_json1_unref(ws);
 }
 
 static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg)
@@ -192,15 +192,15 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
 	/* fill and record the request */
 	afb_wsj1_msg_addref(msg);
 	wsreq->msgj1 = msg;
-	wsreq->xreq.api = api;
-	wsreq->xreq.verb = verb;
+	wsreq->xreq.cred = afb_cred_addref(ws->cred);
+	wsreq->xreq.request.api = api;
+	wsreq->xreq.request.verb = verb;
 	wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
-	wsreq->aws = aws_addref(ws);
+	wsreq->aws = afb_ws_json1_addref(ws);
 	wsreq->xreq.listener = wsreq->aws->listener;
 
 	/* emits the call */
-	afb_apis_call(&wsreq->xreq);
-	afb_xreq_unref(&wsreq->xreq);
+	afb_xreq_process(&wsreq->xreq, ws->apiset);
 }
 
 static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventid, struct json_object *object)
@@ -222,16 +222,17 @@ static void wsreq_destroy(struct afb_xreq *xreq)
 
 	afb_context_disconnect(&wsreq->xreq.context);
 	afb_wsj1_msg_unref(wsreq->msgj1);
-	aws_unref(wsreq->aws);
+	afb_cred_unref(wsreq->xreq.cred);
+	afb_ws_json1_unref(wsreq->aws);
 	free(wsreq);
 }
 
-static void wsreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj)
+static void wsreq_reply(struct afb_xreq *xreq, int status, json_object *obj)
 {
 	struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
 	int rc;
 
-	rc = (iserror ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
+	rc = (status < 0 ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
 			wsreq->msgj1, obj, afb_context_sent_token(&wsreq->xreq.context));
 	if (rc)
 		ERROR("Can't send reply: %m");