X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=7c05cf706605430c7d926c9603170e57a7e6cf1c;hb=170aef20bc3a59d5139c2eff8794d9ba4c83a2e5;hp=bdd1286cfdd59384454c933215cb51955c2caf12;hpb=157c652b4bb8eba5692bed2a4bc75650f7ae7622;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index bdd1286c..7c05cf70 100644
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -25,7 +25,7 @@
 
 #include <json-c/json.h>
 
-#include <afb/afb-req-itf.h>
+#include <afb/afb-event-itf.h>
 
 #include "afb-wsj1.h"
 #include "afb-ws-json1.h"
@@ -37,7 +37,6 @@
 #include "afb-xreq.h"
 #include "afb-context.h"
 #include "afb-evt.h"
-#include "afb-subcall.h"
 #include "verbose.h"
 
 /* predeclaration of structures */
@@ -51,7 +50,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
@@ -130,8 +129,6 @@ struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_apiset *apiset, stru
 		goto error4;
 
 	result->cred = afb_cred_create_for_socket(fd);
-	if (!result->cred)
-		result->cred = afb_cred_current();
 	result->apiset = afb_apiset_addref(apiset);
 	return result;
 
@@ -146,15 +143,15 @@ 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)
@@ -168,7 +165,7 @@ static void aws_unref(struct afb_ws_json1 *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)
@@ -201,7 +198,7 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
 	wsreq->xreq.api = api;
 	wsreq->xreq.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 */
@@ -228,16 +225,16 @@ static void wsreq_destroy(struct afb_xreq *xreq)
 	afb_context_disconnect(&wsreq->xreq.context);
 	afb_wsj1_msg_unref(wsreq->msgj1);
 	afb_cred_unref(wsreq->xreq.cred);
-	aws_unref(wsreq->aws);
+	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");