From 22d991fda77578dd03c8d477f8427631e6383cee Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 7 Aug 2017 16:12:41 -0700 Subject: Subsystem initialize is idempotent; simplify cleanup. --- src/core/init.c | 48 ++++++++++-------------------------------------- 1 file changed, 10 insertions(+), 38 deletions(-) (limited to 'src/core/init.c') diff --git a/src/core/init.c b/src/core/init.c index 7de2a497..24a7b118 100644 --- a/src/core/init.c +++ b/src/core/init.c @@ -17,45 +17,17 @@ nni_init_helper(void) { int rv; - if ((rv = nni_taskq_sys_init()) != 0) { - return (rv); + if (((rv = nni_taskq_sys_init()) != 0) || + ((rv = nni_timer_sys_init()) != 0) || + ((rv = nni_aio_sys_init()) != 0) || + ((rv = nni_random_sys_init()) != 0) || + ((rv = nni_sock_sys_init()) != 0) || + ((rv = nni_ep_sys_init()) != 0) || + ((rv = nni_pipe_sys_init()) != 0) || + ((rv = nni_tran_sys_init()) != 0)) { + nni_fini(); } - if ((rv = nni_timer_sys_init()) != 0) { - nni_taskq_sys_fini(); - return (rv); - } - if ((rv = nni_aio_sys_init()) != 0) { - nni_taskq_sys_fini(); - return (rv); - } - if ((rv = nni_random_sys_init()) != 0) { - nni_aio_sys_fini(); - nni_taskq_sys_fini(); - return (rv); - } - if ((rv = nni_sock_sys_init()) != 0) { - nni_random_sys_fini(); - nni_aio_sys_fini(); - nni_taskq_sys_fini(); - return (rv); - } - if ((rv = nni_ep_sys_init()) != 0) { - nni_sock_sys_fini(); - nni_random_sys_fini(); - nni_aio_sys_fini(); - nni_taskq_sys_fini(); - return (rv); - } - if ((rv = nni_pipe_sys_init()) != 0) { - nni_ep_sys_fini(); - nni_sock_sys_fini(); - nni_random_sys_fini(); - nni_aio_sys_fini(); - nni_taskq_sys_fini(); - return (rv); - } - nni_tran_sys_init(); - return (0); + return (rv); } int -- cgit v1.2.3-70-g09d2