From b21d7805523a407a14567017edbdef57ca81781f Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 8 Jan 2020 20:34:26 -0800 Subject: fixes #1094 Consider in-lining task and aio This only does it for rep, but it also has changes that should increase the overall test coverage for the REP protocol --- src/protocol/pubsub0/pub.c | 8 ++++---- src/protocol/pubsub0/sub.c | 4 ++-- src/protocol/pubsub0/xsub.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/protocol/pubsub0') diff --git a/src/protocol/pubsub0/pub.c b/src/protocol/pubsub0/pub.c index a42e95ff..9b995c33 100644 --- a/src/protocol/pubsub0/pub.c +++ b/src/protocol/pubsub0/pub.c @@ -111,8 +111,8 @@ pub0_pipe_fini(void *arg) { pub0_pipe *p = arg; - nni_aio_fini(p->aio_send); - nni_aio_fini(p->aio_recv); + nni_aio_free(p->aio_send); + nni_aio_free(p->aio_recv); nni_lmq_fini(&p->sendq); } @@ -130,8 +130,8 @@ pub0_pipe_init(void *arg, nni_pipe *pipe, void *s) // XXX: consider making this depth tunable if (((rv = nni_lmq_init(&p->sendq, len)) != 0) || - ((rv = nni_aio_init(&p->aio_send, pub0_pipe_send_cb, p)) != 0) || - ((rv = nni_aio_init(&p->aio_recv, pub0_pipe_recv_cb, p)) != 0)) { + ((rv = nni_aio_alloc(&p->aio_send, pub0_pipe_send_cb, p)) != 0) || + ((rv = nni_aio_alloc(&p->aio_recv, pub0_pipe_recv_cb, p)) != 0)) { pub0_pipe_fini(p); return (rv); diff --git a/src/protocol/pubsub0/sub.c b/src/protocol/pubsub0/sub.c index 56da98f8..c5b84313 100644 --- a/src/protocol/pubsub0/sub.c +++ b/src/protocol/pubsub0/sub.c @@ -265,7 +265,7 @@ sub0_pipe_fini(void *arg) { sub0_pipe *p = arg; - nni_aio_fini(p->aio_recv); + nni_aio_free(p->aio_recv); } static int @@ -274,7 +274,7 @@ sub0_pipe_init(void *arg, nni_pipe *pipe, void *s) sub0_pipe *p = arg; int rv; - if ((rv = nni_aio_init(&p->aio_recv, sub0_recv_cb, p)) != 0) { + if ((rv = nni_aio_alloc(&p->aio_recv, sub0_recv_cb, p)) != 0) { sub0_pipe_fini(p); return (rv); } diff --git a/src/protocol/pubsub0/xsub.c b/src/protocol/pubsub0/xsub.c index be300df4..baa4f8eb 100644 --- a/src/protocol/pubsub0/xsub.c +++ b/src/protocol/pubsub0/xsub.c @@ -85,7 +85,7 @@ xsub0_pipe_fini(void *arg) { xsub0_pipe *p = arg; - nni_aio_fini(p->aio_recv); + nni_aio_free(p->aio_recv); } static int @@ -94,7 +94,7 @@ xsub0_pipe_init(void *arg, nni_pipe *pipe, void *s) xsub0_pipe *p = arg; int rv; - if ((rv = nni_aio_init(&p->aio_recv, xsub0_recv_cb, p)) != 0) { + if ((rv = nni_aio_alloc(&p->aio_recv, xsub0_recv_cb, p)) != 0) { xsub0_pipe_fini(p); return (rv); } -- cgit v1.2.3-70-g09d2