From 82e058a2abae40760f0f9956cdb9d21f8a512624 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Fri, 27 Jan 2017 01:15:46 -0800
Subject: Add device support & testing.  Bus semantic fix.

This adds nn_device and nng_device.  There were some internal changes
required to fix shutdown / close issues.  Note that we shut down the
sockets when exiting from device -- this is required to make both threads
see the failure and bail, since we are not using a single event loop.

I also noticed that the bus protocol had a bug where it would send
messages back to the originator.  This was specifically tested for in
the compat_device test, and we have fixed it.
---
 src/core/socket.c | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'src/core/socket.c')

diff --git a/src/core/socket.c b/src/core/socket.c
index 6ccf3025..52a4d6d9 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -64,7 +64,7 @@ nni_sock_rele(nni_sock *sock)
 {
 	nni_mtx_lock(nni_idlock);
 	sock->s_refcnt--;
-	if ((sock->s_closed) && (sock->s_refcnt == 1)) {
+	if ((sock->s_closed) && (sock->s_refcnt == 0)) {
 		nni_cv_wake(&sock->s_refcv);
 	}
 	nni_mtx_unlock(nni_idlock);
@@ -90,9 +90,13 @@ nni_sock_hold_close(nni_sock **sockp, uint32_t id)
 		nni_mtx_unlock(nni_idlock);
 		return (NNG_ECLOSED);
 	}
+	nni_idhash_remove(nni_sockets, id);
+	sock->s_id = 0;
 	sock->s_closed = 1;
-	sock->s_refcnt++;
-	while (sock->s_refcnt != 1) {
+	nni_mtx_unlock(nni_idlock);
+	nni_sock_shutdown(sock);
+	nni_mtx_lock(nni_idlock);
+	while (sock->s_refcnt != 0) {
 		nni_cv_wait(&sock->s_refcv);
 	}
 	nni_mtx_unlock(nni_idlock);
@@ -102,6 +106,28 @@ nni_sock_hold_close(nni_sock **sockp, uint32_t id)
 }
 
 
+// nni_sock_held_close uses an existing hold on the socket, but is
+// otherwise pretty much the same as nni_sock_hold_close.  When this
+// returns there will be no other user-land references to the socket.
+void
+nni_sock_held_close(nni_sock *sock)
+{
+	nni_mtx_lock(nni_idlock);
+	sock->s_closed = 1;
+	if (sock->s_id != 0) {
+		nni_idhash_remove(nni_sockets, sock->s_id);
+		sock->s_id = 0;
+	}
+	nni_mtx_unlock(nni_idlock);
+	nni_sock_shutdown(sock);
+	nni_mtx_lock(nni_idlock);
+	while (sock->s_refcnt != 0) {
+		nni_cv_wait(&sock->s_refcv);
+	}
+	nni_mtx_unlock(nni_idlock);
+}
+
+
 // Because we have to call back into the socket, and possibly also the proto,
 // and wait for threads to terminate, we do this in a special thread.  The
 // assumption is that closing is always a "fast" operation.
@@ -537,7 +563,9 @@ nni_sock_close(nni_sock *sock)
 	// the results may be tragic.
 
 	nni_mtx_lock(nni_idlock);
-	nni_idhash_remove(nni_sockets, sock->s_id);
+	if (sock->s_id != 0) {
+		nni_idhash_remove(nni_sockets, sock->s_id);
+	}
 	if (nni_idhash_count(nni_sockets) == 0) {
 		nni_idhash_reclaim(nni_pipes);
 		nni_idhash_reclaim(nni_endpoints);
-- 
cgit v1.2.3-70-g09d2