From 9cbdeda1d0a9074bd65da2aaf9c87b79545a1590 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 25 Oct 2017 15:00:52 -0700 Subject: fixes #45 expose aio to applications While here we added a test for the aio stuff, and cleaned up some dead code for the old fd notifications. There were a few improvements to shorten & clean code elsewhere, such as short-circuiting task wait when the task has no callback. The legacy sendmsg() and recvmsg() APIs are still in the socket core until we convert the device code to use the aios. --- src/protocol/pipeline/pull.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/protocol/pipeline/pull.c') diff --git a/src/protocol/pipeline/pull.c b/src/protocol/pipeline/pull.c index 7dd0c8ed..267352c5 100644 --- a/src/protocol/pipeline/pull.c +++ b/src/protocol/pipeline/pull.c @@ -26,7 +26,6 @@ static void pull_putq(pull_pipe *, nni_msg *); struct pull_sock { nni_msgq *urq; int raw; - nni_sock *sock; }; // A pull_pipe is our per-pipe protocol private structure. @@ -45,9 +44,8 @@ pull_sock_init(void **sp, nni_sock *sock) if ((s = NNI_ALLOC_STRUCT(s)) == NULL) { return (NNG_ENOMEM); } - s->raw = 0; - s->urq = nni_sock_recvq(sock); - s->sock = sock; + s->raw = 0; + s->urq = nni_sock_recvq(sock); *sp = s; return (0); @@ -198,7 +196,6 @@ pull_sock_recv(void *arg, nni_aio *aio) { pull_sock *s = arg; - nni_sock_recv_pending(s->sock); nni_msgq_aio_get(s->urq, aio); } -- cgit v1.2.3-70-g09d2