diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-06-30 15:54:29 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-06-30 15:54:29 -0700 |
| commit | c721616e2e79d5890d402a8e2fa3dcc6b48657da (patch) | |
| tree | 8297ae8c6550ae140ea37d930a26742bed6a85cb /src/platform | |
| parent | 1a2efa40eeeb140982e11932019dd165fe6fcdd5 (diff) | |
| download | nng-c721616e2e79d5890d402a8e2fa3dcc6b48657da.tar.gz nng-c721616e2e79d5890d402a8e2fa3dcc6b48657da.tar.bz2 nng-c721616e2e79d5890d402a8e2fa3dcc6b48657da.zip | |
pipedesc_read/write -> pipedesc_send/recv.
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/posix/posix_aio.h | 4 | ||||
| -rw-r--r-- | src/platform/posix/posix_ipc.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_poll.c | 4 | ||||
| -rw-r--r-- | src/platform/posix/posix_socket.c | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/platform/posix/posix_aio.h b/src/platform/posix/posix_aio.h index 3bb59b95..01d042f8 100644 --- a/src/platform/posix/posix_aio.h +++ b/src/platform/posix/posix_aio.h @@ -26,8 +26,8 @@ extern int nni_posix_pipedesc_sysinit(void); extern void nni_posix_pipedesc_sysfini(void); extern int nni_posix_pipedesc_init(nni_posix_pipedesc **, int); extern void nni_posix_pipedesc_fini(nni_posix_pipedesc *); -extern void nni_posix_pipedesc_read(nni_posix_pipedesc *, nni_aio *); -extern void nni_posix_pipedesc_write(nni_posix_pipedesc *, nni_aio *); +extern void nni_posix_pipedesc_recv(nni_posix_pipedesc *, nni_aio *); +extern void nni_posix_pipedesc_send(nni_posix_pipedesc *, nni_aio *); extern void nni_posix_pipedesc_close(nni_posix_pipedesc *); extern int nni_posix_epdesc_init(nni_posix_epdesc **, int); diff --git a/src/platform/posix/posix_ipc.c b/src/platform/posix/posix_ipc.c index 04d83556..d211e82f 100644 --- a/src/platform/posix/posix_ipc.c +++ b/src/platform/posix/posix_ipc.c @@ -31,7 +31,7 @@ #undef sun #endif -// We alias nni_posix_sock to nni_plat_ipcsock. +// We alias nni_posix_pipdedesc to nni_plat_ipcsock. static int nni_plat_ipc_path_resolve(nni_sockaddr *addr, const char *path) diff --git a/src/platform/posix/posix_poll.c b/src/platform/posix/posix_poll.c index 07ab1dc5..4d9a4d0b 100644 --- a/src/platform/posix/posix_poll.c +++ b/src/platform/posix/posix_poll.c @@ -927,14 +927,14 @@ nni_posix_pipedesc_sysfini(void) // extern void nni_posix_aio_ep_fini(nni_posix_aio_ep *); void -nni_posix_pipedesc_read(nni_posix_pipedesc *pd, nni_aio *aio) +nni_posix_pipedesc_recv(nni_posix_pipedesc *pd, nni_aio *aio) { nni_posix_pipedesc_submit(pd, &pd->readq, aio); } void -nni_posix_pipedesc_write(nni_posix_pipedesc *pd, nni_aio *aio) +nni_posix_pipedesc_send(nni_posix_pipedesc *pd, nni_aio *aio) { nni_posix_pipedesc_submit(pd, &pd->writeq, aio); } diff --git a/src/platform/posix/posix_socket.c b/src/platform/posix/posix_socket.c index 6d2b6c29..8eed097e 100644 --- a/src/platform/posix/posix_socket.c +++ b/src/platform/posix/posix_socket.c @@ -43,7 +43,6 @@ struct nni_posix_sock { int fd; - int devnull; // for shutting down accept() char * unlink; // path to unlink at unbind nni_posix_pipedesc * pd; nni_posix_epdesc * ed; @@ -149,14 +148,14 @@ nni_posix_from_sockaddr(nni_sockaddr *sa, const struct sockaddr *ss) void nni_posix_sock_aio_send(nni_posix_sock *s, nni_aio *aio) { - nni_posix_pipedesc_write(s->pd, aio); + nni_posix_pipedesc_send(s->pd, aio); } void nni_posix_sock_aio_recv(nni_posix_sock *s, nni_aio *aio) { - nni_posix_pipedesc_read(s->pd, aio); + nni_posix_pipedesc_recv(s->pd, aio); } |