Refactor stop again, closing numerous races (thanks valgrind!)

1 files changed, 1 insertions, 10 deletions

diff --git a/src/core/socket.h b/src/core/socket.h
index 7d5e0f20..928264d9 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -88,16 +88,7 @@ extern void nni_sock_unnotify(nni_sock *, nni_notify *);
 extern int nni_sock_ep_add(nni_sock *, nni_ep *);
 extern void nni_sock_ep_remove(nni_sock *, nni_ep *);
 
-// nni_sock_pipe_add is called by the pipe to register the pipe with
-// with the socket.  The pipe is added to the idle list.  The protocol
-// private pipe data is initialized as well.
-extern int nni_sock_pipe_add(nni_sock *, nni_pipe *);
-
-// nni_sock_pipe_remove is called by the pipe when the protocol is
-// done with it.  This is the sockets indication that it should be
-// removed, and freed.  The protocol MUST guarantee that the pipe is
-// no longer in use when this function is called.
-extern void nni_sock_pipe_remove(nni_sock *, nni_pipe *);
+extern void nni_sock_pipe_stop(nni_sock *, nni_pipe *);
 
 // nni_sock_pipe_ready lets the socket know the pipe is ready for
 // business.  This also calls the socket/protocol specific add function,