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, 6 insertions, 14 deletions

diff --git a/src/protocol/pair/pair_v0.c b/src/protocol/pair/pair_v0.c
index cca03cc8..29f3b59c 100644
--- a/src/protocol/pair/pair_v0.c
+++ b/src/protocol/pair/pair_v0.c
@@ -28,7 +28,6 @@ static void pair0_pipe_fini(void *);
 
 // pair0_sock is our per-socket protocol private structure.
 struct pair0_sock {
-	nni_sock *  nsock;
 	pair0_pipe *ppipe;
 	nni_msgq *  uwq;
 	nni_msgq *  urq;
@@ -58,7 +57,6 @@ pair0_sock_init(void **sp, nni_sock *nsock)
 		return (NNG_ENOMEM);
 	}
 	nni_mtx_init(&s->mtx);
-	s->nsock = nsock;
 	s->ppipe = NULL;
 	s->raw   = 0;
 	s->uwq   = nni_sock_sendq(nsock);
@@ -248,7 +246,6 @@ pair0_sock_send(void *arg, nni_aio *aio)
 {
 	pair0_sock *s = arg;
 
-	nni_sock_send_pending(s->nsock);
 	nni_msgq_aio_put(s->uwq, aio);
 }
 
@@ -257,7 +254,6 @@ pair0_sock_recv(void *arg, nni_aio *aio)
 {
 	pair0_sock *s = arg;
 
-	nni_sock_recv_pending(s->nsock);
 	nni_msgq_aio_get(s->urq, aio);
 }
 
diff --git a/src/protocol/pair/pair_v1.c b/src/protocol/pair/pair_v1.c
index f43a4785..86ee97eb 100644
--- a/src/protocol/pair/pair_v1.c
+++ b/src/protocol/pair/pair_v1.c
@@ -29,7 +29,6 @@ static void pair1_pipe_fini(void *);
 
 // pair1_sock is our per-socket protocol private structure.
 struct pair1_sock {
-	nni_sock *  nsock;
 	nni_msgq *  uwq;
 	nni_msgq *  urq;
 	int         raw;
@@ -89,13 +88,12 @@ pair1_sock_init(void **sp, nni_sock *nsock)
 		return (rv);
 	}
 
-	s->nsock = nsock;
-	s->raw   = 0;
-	s->poly  = 0;
-	s->uwq   = nni_sock_sendq(nsock);
-	s->urq   = nni_sock_recvq(nsock);
-	s->ttl   = 8;
-	*sp      = s;
+	s->raw  = 0;
+	s->poly = 0;
+	s->uwq  = nni_sock_sendq(nsock);
+	s->urq  = nni_sock_recvq(nsock);
+	s->ttl  = 8;
+	*sp     = s;
 
 	return (0);
 }
@@ -451,7 +449,6 @@ pair1_sock_send(void *arg, nni_aio *aio)
 {
 	pair1_sock *s = arg;
 
-	nni_sock_send_pending(s->nsock);
 	nni_msgq_aio_put(s->uwq, aio);
 }
 
@@ -460,7 +457,6 @@ pair1_sock_recv(void *arg, nni_aio *aio)
 {
 	pair1_sock *s = arg;
 
-	nni_sock_recv_pending(s->nsock);
 	nni_msgq_aio_get(s->urq, aio);
 }