From 34ee6ece5adf86a324c89ed4dc96e77ad0dac893 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 15 Jul 2017 17:13:36 -0700 Subject: Bus, Req/Rep, and Surv/Resp should use aio_cancel instead of aio_stop. --- src/protocol/survey/respond.c | 10 +++++----- src/protocol/survey/survey.c | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/protocol/survey') diff --git a/src/protocol/survey/respond.c b/src/protocol/survey/respond.c index c2b8cd18..685f39fd 100644 --- a/src/protocol/survey/respond.c +++ b/src/protocol/survey/respond.c @@ -113,7 +113,7 @@ nni_resp_sock_close(void *arg) { nni_resp_sock *psock = arg; - nni_aio_stop(&psock->aio_getq); + nni_aio_cancel(&psock->aio_getq, NNG_ECLOSED); } static int @@ -195,10 +195,10 @@ nni_resp_pipe_stop(void *arg) nni_resp_sock *psock = ppipe->psock; nni_msgq_close(ppipe->sendq); - nni_aio_stop(&ppipe->aio_putq); - nni_aio_stop(&ppipe->aio_getq); - nni_aio_stop(&ppipe->aio_send); - nni_aio_stop(&ppipe->aio_recv); + nni_aio_cancel(&ppipe->aio_putq, NNG_ECANCELED); + nni_aio_cancel(&ppipe->aio_getq, NNG_ECANCELED); + nni_aio_cancel(&ppipe->aio_send, NNG_ECANCELED); + nni_aio_cancel(&ppipe->aio_recv, NNG_ECANCELED); if (ppipe->id != 0) { nni_idhash_remove(psock->pipes, ppipe->id); diff --git a/src/protocol/survey/survey.c b/src/protocol/survey/survey.c index e7d0f3ce..85657f57 100644 --- a/src/protocol/survey/survey.c +++ b/src/protocol/survey/survey.c @@ -1,5 +1,6 @@ // // Copyright 2017 Garrett D'Amore +// Copyright 2017 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -114,7 +115,7 @@ nni_surv_sock_close(void *arg) nni_surv_sock *psock = arg; nni_timer_cancel(&psock->timer); - nni_aio_stop(&psock->aio_getq); + nni_aio_cancel(&psock->aio_getq, NNG_ECLOSED); } static void @@ -190,10 +191,10 @@ nni_surv_pipe_stop(void *arg) nni_surv_pipe *ppipe = arg; nni_surv_sock *psock = ppipe->psock; - nni_aio_stop(&ppipe->aio_getq); - nni_aio_stop(&ppipe->aio_send); - nni_aio_stop(&ppipe->aio_recv); - nni_aio_stop(&ppipe->aio_putq); + nni_aio_cancel(&ppipe->aio_getq, NNG_ECANCELED); + nni_aio_cancel(&ppipe->aio_send, NNG_ECANCELED); + nni_aio_cancel(&ppipe->aio_recv, NNG_ECANCELED); + nni_aio_cancel(&ppipe->aio_putq, NNG_ECANCELED); nni_msgq_close(ppipe->sendq); nni_mtx_lock(&psock->mtx); -- cgit v1.2.3-70-g09d2