diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-04-12 17:00:33 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-04-12 17:00:33 +0200 |
| commit | 03f863dd080d32f71c4a0755c02e23c72e4cb342 (patch) | |
| tree | 27dd6f931b42311964d9179b10a2781a6a7edcce /src/afb-ws-json1.c | |
| parent | a05138e6bf1257b0e7b1ad90c974fb9e12f1d040 (diff) | |
Optimisation of xreq
Reduce the count of memory read
Change-Id: Ie4dfa4bd30d6485be91961196294c43ffbd3b2a9
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-ws-json1.c')
| -rw-r--r-- | src/afb-ws-json1.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index fec41173..60a0a801 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -50,9 +50,8 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid, struct json_object *object); /* predeclaration of wsreq callbacks */ -static void wsreq_destroy(struct afb_wsreq *wsreq); -static struct json_object *wsreq_json(struct afb_wsreq *wsreq); -static void wsreq_reply(struct afb_wsreq *wsreq, int iserror, json_object *obj); +static void wsreq_destroy(struct afb_xreq *xreq); +static void wsreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj); /* declaration of websocket structure */ struct afb_ws_json1 @@ -84,9 +83,8 @@ static struct afb_wsj1_itf wsj1_itf = { /* interface for xreq */ const struct afb_xreq_query_itf afb_ws_json1_xreq_itf = { - .json = (void*)wsreq_json, - .reply = (void*)wsreq_reply, - .unref = (void*)wsreq_destroy + .reply = wsreq_reply, + .unref = wsreq_destroy }; /* the interface for events */ @@ -182,6 +180,7 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve } /* init the context */ + afb_xreq_init(&wsreq->xreq, &afb_ws_json1_xreq_itf); afb_context_init(&wsreq->xreq.context, ws->session, afb_wsj1_msg_token(msg)); if (!wsreq->xreq.context.invalidated) wsreq->xreq.context.validated = 1; @@ -193,11 +192,9 @@ 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.refcount = 1; - wsreq->xreq.query = wsreq; - wsreq->xreq.queryitf = &afb_ws_json1_xreq_itf; wsreq->xreq.api = api; wsreq->xreq.verb = verb; + wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1); wsreq->aws = aws_addref(ws); wsreq->xreq.listener = wsreq->aws->listener; @@ -219,21 +216,19 @@ static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventi **************************************************************** ***************************************************************/ -static void wsreq_destroy(struct afb_wsreq *wsreq) +static void wsreq_destroy(struct afb_xreq *xreq) { + struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq); + afb_context_disconnect(&wsreq->xreq.context); afb_wsj1_msg_unref(wsreq->msgj1); aws_unref(wsreq->aws); free(wsreq); } -static struct json_object *wsreq_json(struct afb_wsreq *wsreq) -{ - return afb_wsj1_msg_object_j(wsreq->msgj1); -} - -static void wsreq_reply(struct afb_wsreq *wsreq, int iserror, json_object *obj) +static void wsreq_reply(struct afb_xreq *xreq, int iserror, 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)( |