From 0aa1de1316b46bb4af23fdf26759bca08008eaf5 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 4 Apr 2018 09:41:12 -0700 Subject: fixes #324 nni_aio_set_synch leads to race condition fixes #325 synchronous aio completion crash fixes #327 move nni_clock() operations to outside the nni_aio_lk. This work was done for the context tree, and is necessary to properly enable that branch. --- src/supplemental/websocket/websocket.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/supplemental/websocket') diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 6932ce70..7bd698bd 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -604,8 +604,7 @@ ws_write_cb(void *arg) if (aio != NULL) { nng_msg *msg = nni_aio_get_msg(aio); nni_aio_set_msg(aio, NULL); - nni_aio_set_synch(aio); - nni_aio_finish(aio, 0, nni_msg_len(msg)); + nni_aio_finish_synch(aio, 0, nni_msg_len(msg)); nni_msg_free(msg); } } @@ -1022,8 +1021,7 @@ ws_read_cb(void *arg) body += frame->len; } nni_aio_set_msg(wm->aio, msg); - nni_aio_set_synch(aio); - nni_aio_finish(wm->aio, 0, nni_msg_len(msg)); + nni_aio_finish_synch(wm->aio, 0, nni_msg_len(msg)); ws_msg_fini(wm); } } -- cgit v1.2.3-70-g09d2