From a80654e3e0abb7ddbd81a6159dd89933bdec44e7 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 3 Jul 2017 20:40:55 -0700 Subject: IPC & TCP negotiation done using aio. Remove old sync send/recv. --- src/platform/posix/posix_ipc.c | 14 ------ src/platform/posix/posix_net.c | 14 ------ src/platform/posix/posix_socket.c | 98 --------------------------------------- 3 files changed, 126 deletions(-) (limited to 'src/platform/posix') diff --git a/src/platform/posix/posix_ipc.c b/src/platform/posix/posix_ipc.c index d211e82f..a3d95428 100644 --- a/src/platform/posix/posix_ipc.c +++ b/src/platform/posix/posix_ipc.c @@ -53,20 +53,6 @@ nni_plat_ipc_path_resolve(nni_sockaddr *addr, const char *path) } -int -nni_plat_ipc_send(nni_plat_ipcsock *s, nni_iov *iovs, int cnt) -{ - return (nni_posix_sock_send_sync((void *) s, iovs, cnt)); -} - - -int -nni_plat_ipc_recv(nni_plat_ipcsock *s, nni_iov *iovs, int cnt) -{ - return (nni_posix_sock_recv_sync((void *) s, iovs, cnt)); -} - - void nni_plat_ipc_aio_send(nni_plat_ipcsock *s, nni_aio *aio) { diff --git a/src/platform/posix/posix_net.c b/src/platform/posix/posix_net.c index 4ba67f9c..6d0d7c08 100644 --- a/src/platform/posix/posix_net.c +++ b/src/platform/posix/posix_net.c @@ -56,20 +56,6 @@ nni_plat_lookup_host(const char *host, nni_sockaddr *addr, int flags) } -int -nni_plat_tcp_send(nni_plat_tcpsock *s, nni_iov *iovs, int cnt) -{ - return (nni_posix_sock_send_sync((void *) s, iovs, cnt)); -} - - -int -nni_plat_tcp_recv(nni_plat_tcpsock *s, nni_iov *iovs, int cnt) -{ - return (nni_posix_sock_recv_sync((void *) s, iovs, cnt)); -} - - void nni_plat_tcp_aio_send(nni_plat_tcpsock *s, nni_aio *aio) { diff --git a/src/platform/posix/posix_socket.c b/src/platform/posix/posix_socket.c index 32530388..dabad3af 100644 --- a/src/platform/posix/posix_socket.c +++ b/src/platform/posix/posix_socket.c @@ -325,104 +325,6 @@ nni_posix_sock_listen(nni_posix_sock *s, const nni_sockaddr *saddr) // These functions will need to be removed in the future. They are // transition functions for now. -int -nni_posix_sock_send_sync(nni_posix_sock *s, nni_iov *iovs, int cnt) -{ - struct iovec iov[4]; // We never have more than 3 at present - int i; - int offset; - int resid = 0; - int rv; - - if (cnt > 4) { - return (NNG_EINVAL); - } - - for (i = 0; i < cnt; i++) { - iov[i].iov_base = iovs[i].iov_buf; - iov[i].iov_len = iovs[i].iov_len; - resid += iov[i].iov_len; - } - - i = 0; - while (resid) { - rv = writev(s->fd, &iov[i], cnt); - if (rv < 0) { - if (rv == EINTR) { - continue; - } - return (nni_plat_errno(errno)); - } - NNI_ASSERT(rv <= resid); - resid -= rv; - while (rv) { - if (iov[i].iov_len <= rv) { - rv -= iov[i].iov_len; - i++; - cnt--; - } else { - iov[i].iov_len -= rv; - iov[i].iov_base += rv; - rv = 0; - } - } - } - - return (0); -} - - -int -nni_posix_sock_recv_sync(nni_posix_sock *s, nni_iov *iovs, int cnt) -{ - struct iovec iov[4]; // We never have more than 3 at present - int i; - int offset; - int resid = 0; - int rv; - - if (cnt > 4) { - return (NNG_EINVAL); - } - - for (i = 0; i < cnt; i++) { - iov[i].iov_base = iovs[i].iov_buf; - iov[i].iov_len = iovs[i].iov_len; - resid += iov[i].iov_len; - } - - i = 0; - while (resid) { - rv = readv(s->fd, &iov[i], cnt); - if (rv < 0) { - if (errno == EINTR) { - continue; - } - return (nni_plat_errno(errno)); - } - if (rv == 0) { - return (NNG_ECLOSED); - } - NNI_ASSERT(rv <= resid); - - resid -= rv; - while (rv) { - if (iov[i].iov_len <= rv) { - rv -= iov[i].iov_len; - i++; - cnt--; - } else { - iov[i].iov_len -= rv; - iov[i].iov_base += rv; - rv = 0; - } - } - } - - return (0); -} - - int nni_posix_sock_accept_sync(nni_posix_sock *s, nni_posix_sock *server) { -- cgit v1.2.3-70-g09d2