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.

2 files changed, 3 insertions, 15 deletions

diff --git a/src/protocol/survey/respond.c b/src/protocol/survey/respond.c
index 4c3ea8e3..dbce0751 100644
--- a/src/protocol/survey/respond.c
+++ b/src/protocol/survey/respond.c
@@ -29,7 +29,6 @@ static void resp_pipe_fini(void *);
 
 // A resp_sock is our per-socket protocol private structure.
 struct resp_sock {
-	nni_sock *  nsock;
 	nni_msgq *  urq;
 	nni_msgq *  uwq;
 	int         raw;
@@ -85,7 +84,6 @@ resp_sock_init(void **sp, nni_sock *nsock)
 	}
 
 	s->ttl        = 8; // Per RFC
-	s->nsock      = nsock;
 	s->raw        = 0;
 	s->btrace     = NULL;
 	s->btrace_len = 0;
@@ -268,9 +266,9 @@ resp_send_cb(void *arg)
 static void
 resp_recv_cb(void *arg)
 {
-	resp_pipe *p = arg;
-	resp_sock *s = p->psock;
-	nni_msgq * urq;
+	resp_pipe *p   = arg;
+	resp_sock *s   = p->psock;
+	nni_msgq * urq = s->urq;
 	nni_msg *  msg;
 	int        hops;
 	int        rv;
@@ -279,8 +277,6 @@ resp_recv_cb(void *arg)
 		goto error;
 	}
 
-	urq = nni_sock_recvq(s->nsock);
-
 	msg = nni_aio_get_msg(p->aio_recv);
 	nni_aio_set_msg(p->aio_recv, NULL);
 	nni_msg_set_pipe(msg, p->id);
@@ -384,7 +380,6 @@ resp_sock_send(void *arg, nni_aio *aio)
 	nni_mtx_lock(&s->mtx);
 	if (s->raw) {
 		nni_mtx_unlock(&s->mtx);
-		nni_sock_send_pending(s->nsock);
 		nni_msgq_aio_put(s->uwq, aio);
 		return;
 	}
@@ -413,7 +408,6 @@ resp_sock_send(void *arg, nni_aio *aio)
 	s->btrace_len = 0;
 
 	nni_mtx_unlock(&s->mtx);
-	nni_sock_send_pending(s->nsock);
 	nni_msgq_aio_put(s->uwq, aio);
 }
 
@@ -454,7 +448,6 @@ resp_sock_recv(void *arg, nni_aio *aio)
 {
 	resp_sock *s = arg;
 
-	nni_sock_recv_pending(s->nsock);
 	nni_msgq_aio_get(s->urq, aio);
 }
 
diff --git a/src/protocol/survey/survey.c b/src/protocol/survey/survey.c
index 1c15054f..f44cd63a 100644
--- a/src/protocol/survey/survey.c
+++ b/src/protocol/survey/survey.c
@@ -28,7 +28,6 @@ static void surv_timeout(void *);
 
 // A surv_sock is our per-socket protocol private structure.
 struct surv_sock {
-	nni_sock *     nsock;
 	nni_duration   survtime;
 	nni_time       expire;
 	int            raw;
@@ -84,7 +83,6 @@ surv_sock_init(void **sp, nni_sock *nsock)
 	nni_timer_init(&s->timer, surv_timeout, s);
 
 	s->nextid   = nni_random();
-	s->nsock    = nsock;
 	s->raw      = 0;
 	s->survtime = NNI_SECOND * 60;
 	s->expire   = NNI_TIME_ZERO;
@@ -362,7 +360,6 @@ surv_sock_recv(void *arg, nni_aio *aio)
 		return;
 	}
 	nni_mtx_unlock(&s->mtx);
-	nni_sock_recv_pending(s->nsock);
 	nni_msgq_aio_get(s->urq, aio);
 }
 
@@ -378,7 +375,6 @@ surv_sock_send(void *arg, nni_aio *aio)
 		// No automatic retry, and the request ID must
 		// be in the header coming down.
 		nni_mtx_unlock(&s->mtx);
-		nni_sock_send_pending(s->nsock);
 		nni_msgq_aio_put(s->uwq, aio);
 		return;
 	}
@@ -404,7 +400,6 @@ surv_sock_send(void *arg, nni_aio *aio)
 
 	nni_mtx_unlock(&s->mtx);
 
-	nni_sock_send_pending(s->nsock);
 	nni_msgq_aio_put(s->uwq, aio);
 }