move shared data structure setup/teardown to corresponding file

src/core/core.c

@@ -7,16 +7,8 @@
 #include <channel/cc_pipe.h>
 
 #include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
 #include <pthread.h>
-#include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sysexits.h>
-#include <unistd.h>
 
 struct buf_sock;
 bool core_init = false;
@@ -31,35 +23,13 @@ core_setup(admin_options_st *opt_admin,
         server_options_st *opt_server, worker_options_st *opt_worker,
         server_metrics_st *smetrics, worker_metrics_st *wmetrics)
 {
-    pipe_c = pipe_conn_create();
-    if (pipe_c == NULL) {
-        log_error("Could not create connection for pipe, abort");
-        goto error;
-    }
-
-    if (!pipe_open(NULL, pipe_c)) {
-        log_error("Could not open pipe connection: %s", strerror(pipe_c->err));
-        goto error;
-    }
-
-    pipe_set_nonblocking(pipe_c);
-
-    conn_arr = ring_array_create(sizeof(struct buf_sock *), RING_ARRAY_DEFAULT_CAP);
-    if (conn_arr == NULL) {
-        log_error("core setup failed: could not allocate conn array");
-        goto error;
-    }
+    core_shared_setup();
 
     core_server_setup(opt_server, smetrics);
     core_worker_setup(opt_worker, wmetrics);
     core_admin_setup(opt_admin);
 
     core_init = true;
-
-    return;
-
-error:
-    exit(EX_CONFIG);
 }
 
 void
@@ -69,8 +39,7 @@ core_teardown(void)
     core_worker_teardown();
     core_server_teardown();
 
-    ring_array_destroy(conn_arr);
-    pipe_conn_destroy(&pipe_c);
+    core_shared_teardown();
 
     core_init = false;
 }

src/core/data/shared.c

@@ -1,8 +1,49 @@
 #include "shared.h"
 
-#include <stdlib.h>             /* for NULL */
+#include <cc_ring_array.h>
+#include <channel/cc_pipe.h>
+
+#include <errno.h>
+#include <string.h>
+#include <sysexits.h>
+
 
 /* needs to be initialized to avoid linker issues due to being optimized out */
 struct pipe_conn *pipe_c = NULL;
 
 struct ring_array *conn_arr = NULL;
+
+void
+core_shared_setup(void)
+{
+    pipe_c = pipe_conn_create();
+    if (pipe_c == NULL) {
+        log_error("Could not create connection for pipe, abort");
+        goto error;
+    }
+
+    if (!pipe_open(NULL, pipe_c)) {
+        log_error("Could not open pipe connection: %s", strerror(pipe_c->err));
+        goto error;
+    }
+
+    pipe_set_nonblocking(pipe_c);
+
+    conn_arr = ring_array_create(sizeof(struct buf_sock *), RING_ARRAY_DEFAULT_CAP);
+    if (conn_arr == NULL) {
+        log_error("core setup failed: could not allocate conn array");
+        goto error;
+    }
+
+error:
+    exit(EX_CONFIG);
+}
+
+
+void
+core_shared_teardown(void)
+{
+    ring_array_destroy(conn_arr);
+    pipe_conn_destroy(&pipe_c);
+}
+

src/core/data/shared.h

@@ -8,3 +8,6 @@ extern struct pipe_conn *pipe_c;
 
 /* array holding accepted connections */
 extern struct ring_array *conn_arr;
+
+void core_shared_setup(void);
+void core_shared_teardown(void);