fixes #1372 nni_reap could be smaller

4 files changed, 14 insertions, 6 deletions

diff --git a/src/platform/posix/posix_ipc.h b/src/platform/posix/posix_ipc.h
index 2c2c9af7..4ef5fa80 100644
--- a/src/platform/posix/posix_ipc.h
+++ b/src/platform/posix/posix_ipc.h
@@ -30,7 +30,7 @@ struct nni_ipc_conn {
 	nni_aio *       dial_aio;
 	nni_ipc_dialer *dialer;
 	nng_sockaddr    sa;
-	nni_reap_item   reap;
+	nni_reap_node   reap;
 };
 
 struct nni_ipc_dialer {
diff --git a/src/platform/posix/posix_ipcconn.c b/src/platform/posix/posix_ipcconn.c
index 825ecd4b..04eddd5f 100644
--- a/src/platform/posix/posix_ipcconn.c
+++ b/src/platform/posix/posix_ipcconn.c
@@ -493,11 +493,15 @@ ipc_reap(void *arg)
 	NNI_FREE_STRUCT(c);
 }
 
+static nni_reap_list ipc_reap_list = {
+	.rl_offset = offsetof(ipc_conn, reap),
+	.rl_func   = ipc_reap,
+};
 static void
 ipc_free(void *arg)
 {
 	ipc_conn *c = arg;
-	nni_reap(&c->reap, ipc_reap, c);
+	nni_reap(&ipc_reap_list, c);
 }
 
 static const nni_option ipc_options[] = {
diff --git a/src/platform/posix/posix_tcp.h b/src/platform/posix/posix_tcp.h
index 87312dff..a8d1308e 100644
--- a/src/platform/posix/posix_tcp.h
+++ b/src/platform/posix/posix_tcp.h
@@ -25,7 +25,7 @@ struct nni_tcp_conn {
 	nni_mtx         mtx;
 	nni_aio *       dial_aio;
 	nni_tcp_dialer *dialer;
-	nni_reap_item   reap;
+	nni_reap_node   reap;
 };
 
 struct nni_tcp_dialer {
diff --git a/src/platform/posix/posix_tcpconn.c b/src/platform/posix/posix_tcpconn.c
index 9684fe27..2494b05e 100644
--- a/src/platform/posix/posix_tcpconn.c
+++ b/src/platform/posix/posix_tcpconn.c
@@ -217,11 +217,15 @@ tcp_fini(void *arg)
 	NNI_FREE_STRUCT(c);
 }
 
+static nni_reap_list tcp_reap_list = {
+	.rl_offset = offsetof(nni_tcp_conn, reap),
+	.rl_func   = tcp_fini,
+};
 static void
 tcp_free(void *arg)
 {
 	nni_tcp_conn *c = arg;
-	nni_reap(&c->reap, tcp_fini, arg);
+	nni_reap(&tcp_reap_list, c);
 }
 
 static void
@@ -336,7 +340,7 @@ tcp_get_peername(void *arg, void *buf, size_t *szp, nni_type t)
 	nni_tcp_conn *          c = arg;
 	struct sockaddr_storage ss;
 	socklen_t               len = sizeof(ss);
-	int                     fd    = nni_posix_pfd_fd(c->pfd);
+	int                     fd  = nni_posix_pfd_fd(c->pfd);
 	int                     rv;
 	nng_sockaddr            sa;
 
@@ -355,7 +359,7 @@ tcp_get_sockname(void *arg, void *buf, size_t *szp, nni_type t)
 	nni_tcp_conn *          c = arg;
 	struct sockaddr_storage ss;
 	socklen_t               len = sizeof(ss);
-	int                     fd    = nni_posix_pfd_fd(c->pfd);
+	int                     fd  = nni_posix_pfd_fd(c->pfd);
 	int                     rv;
 	nng_sockaddr            sa;