diff options
Diffstat (limited to 'src/protocol/survey0/xrespond.c')
| -rw-r--r-- | src/protocol/survey0/xrespond.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/protocol/survey0/xrespond.c b/src/protocol/survey0/xrespond.c index 7aaed6da..bcbbcbc7 100644 --- a/src/protocol/survey0/xrespond.c +++ b/src/protocol/survey0/xrespond.c @@ -63,7 +63,6 @@ xresp0_sock_fini(void *arg) { xresp0_sock *s = arg; - nni_aio_stop(s->aio_getq); nni_aio_fini(s->aio_getq); nni_idhash_fini(s->pipes); nni_mtx_fini(&s->mtx); @@ -107,7 +106,18 @@ xresp0_sock_close(void *arg) { xresp0_sock *s = arg; - nni_aio_abort(s->aio_getq, NNG_ECLOSED); + nni_aio_close(s->aio_getq); +} + +static void +xresp0_pipe_stop(void *arg) +{ + xresp0_pipe *p = arg; + + nni_aio_stop(p->aio_putq); + nni_aio_stop(p->aio_getq); + nni_aio_stop(p->aio_send); + nni_aio_stop(p->aio_recv); } static void @@ -170,16 +180,17 @@ xresp0_pipe_start(void *arg) } static void -xresp0_pipe_stop(void *arg) +xresp0_pipe_close(void *arg) { xresp0_pipe *p = arg; xresp0_sock *s = p->psock; + nni_aio_close(p->aio_putq); + nni_aio_close(p->aio_getq); + nni_aio_close(p->aio_send); + nni_aio_close(p->aio_recv); + nni_msgq_close(p->sendq); - nni_aio_stop(p->aio_putq); - nni_aio_stop(p->aio_getq); - nni_aio_stop(p->aio_send); - nni_aio_stop(p->aio_recv); nni_mtx_lock(&s->mtx); nni_idhash_remove(s->pipes, p->id); @@ -366,6 +377,7 @@ static nni_proto_pipe_ops xresp0_pipe_ops = { .pipe_init = xresp0_pipe_init, .pipe_fini = xresp0_pipe_fini, .pipe_start = xresp0_pipe_start, + .pipe_close = xresp0_pipe_close, .pipe_stop = xresp0_pipe_stop, }; |