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

2 files changed, 10 insertions, 10 deletions

diff --git a/src/protocol/pipeline0/pull.c b/src/protocol/pipeline0/pull.c
index 64b47cef..8feb08b8 100644
--- a/src/protocol/pipeline0/pull.c
+++ b/src/protocol/pipeline0/pull.c
@@ -73,8 +73,8 @@ pull0_pipe_fini(void *arg)
 {
 	pull0_pipe *p = arg;
 
-	nni_aio_fini(p->putq_aio);
-	nni_aio_fini(p->recv_aio);
+	nni_aio_free(p->putq_aio);
+	nni_aio_free(p->recv_aio);
 }
 
 static int
@@ -83,8 +83,8 @@ pull0_pipe_init(void *arg, nni_pipe *pipe, void *s)
 	pull0_pipe *p = arg;
 	int         rv;
 
-	if (((rv = nni_aio_init(&p->putq_aio, pull0_putq_cb, p)) != 0) ||
-	    ((rv = nni_aio_init(&p->recv_aio, pull0_recv_cb, p)) != 0)) {
+	if (((rv = nni_aio_alloc(&p->putq_aio, pull0_putq_cb, p)) != 0) ||
+	    ((rv = nni_aio_alloc(&p->recv_aio, pull0_recv_cb, p)) != 0)) {
 		pull0_pipe_fini(p);
 		return (rv);
 	}
diff --git a/src/protocol/pipeline0/push.c b/src/protocol/pipeline0/push.c
index 5a932ece..90c94af9 100644
--- a/src/protocol/pipeline0/push.c
+++ b/src/protocol/pipeline0/push.c
@@ -89,9 +89,9 @@ push0_pipe_fini(void *arg)
 {
 	push0_pipe *p = arg;
 
-	nni_aio_fini(p->aio_recv);
-	nni_aio_fini(p->aio_send);
-	nni_aio_fini(p->aio_getq);
+	nni_aio_free(p->aio_recv);
+	nni_aio_free(p->aio_send);
+	nni_aio_free(p->aio_getq);
 }
 
 static int
@@ -100,9 +100,9 @@ push0_pipe_init(void *arg, nni_pipe *pipe, void *s)
 	push0_pipe *p = arg;
 	int         rv;
 
-	if (((rv = nni_aio_init(&p->aio_recv, push0_recv_cb, p)) != 0) ||
-	    ((rv = nni_aio_init(&p->aio_send, push0_send_cb, p)) != 0) ||
-	    ((rv = nni_aio_init(&p->aio_getq, push0_getq_cb, p)) != 0)) {
+	if (((rv = nni_aio_alloc(&p->aio_recv, push0_recv_cb, p)) != 0) ||
+	    ((rv = nni_aio_alloc(&p->aio_send, push0_send_cb, p)) != 0) ||
+	    ((rv = nni_aio_alloc(&p->aio_getq, push0_getq_cb, p)) != 0)) {
 		push0_pipe_fini(p);
 		return (rv);
 	}