Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
hooking: Add hook at global scope
[src/app-framework-binder.git]
/
src
/
afb-ws-json1.c
diff --git
a/src/afb-ws-json1.c
b/src/afb-ws-json1.c
index
4b6c04e
..
7c05cf7
100644
(file)
--- a/
src/afb-ws-json1.c
+++ b/
src/afb-ws-json1.c
@@
-25,7
+25,7
@@
#include <json-c/json.h>
#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"
#include "afb-wsj1.h"
#include "afb-ws-json1.h"
@@
-50,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);
/* 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
/* declaration of websocket structure */
struct afb_ws_json1
@@
-143,15
+143,15
@@
error:
return NULL;
}
return NULL;
}
-st
atic struct afb_ws_json1 *aws
_addref(struct afb_ws_json1 *ws)
+st
ruct afb_ws_json1 *afb_ws_json1
_addref(struct afb_ws_json1 *ws)
{
{
-
ws->refcount++
;
+
__atomic_add_fetch(&ws->refcount, 1, __ATOMIC_RELAXED)
;
return ws;
}
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)
afb_evt_listener_unref(ws->listener);
afb_wsj1_unref(ws->wsj1);
if (ws->cleanup != NULL)
@@
-165,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)
{
static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1)
{
- a
ws
_unref(ws);
+ a
fb_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)
}
static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg)
@@
-198,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->xreq.api = api;
wsreq->xreq.verb = verb;
wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
- wsreq->aws = a
ws
_addref(ws);
+ wsreq->aws = a
fb_ws_json1
_addref(ws);
wsreq->xreq.listener = wsreq->aws->listener;
/* emits the call */
wsreq->xreq.listener = wsreq->aws->listener;
/* emits the call */
@@
-225,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);
afb_context_disconnect(&wsreq->xreq.context);
afb_wsj1_msg_unref(wsreq->msgj1);
afb_cred_unref(wsreq->xreq.cred);
- a
ws
_unref(wsreq->aws);
+ a
fb_ws_json1
_unref(wsreq->aws);
free(wsreq);
}
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;
{
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");
wsreq->msgj1, obj, afb_context_sent_token(&wsreq->xreq.context));
if (rc)
ERROR("Can't send reply: %m");