event.h: split non-public API into spdk_internal

Change-Id: Ie783df6cf387286ab882107fb9d4ce12358602e2
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>

include/spdk/event.h

@@ -244,52 +244,4 @@ void spdk_poller_register(struct spdk_poller **ppoller,
 void spdk_poller_unregister(struct spdk_poller **ppoller,
 			    struct spdk_event *complete);
 
-struct spdk_subsystem {
-	const char *name;
-	int (*init)(void);
-	int (*fini)(void);
-	void (*config)(FILE *fp);
-	TAILQ_ENTRY(spdk_subsystem) tailq;
-};
-
-struct spdk_subsystem_depend {
-	const char *name;
-	const char *depends_on;
-	struct spdk_subsystem *depends_on_subsystem;
-	TAILQ_ENTRY(spdk_subsystem_depend) tailq;
-};
-
-void spdk_add_subsystem(struct spdk_subsystem *subsystem);
-void spdk_add_subsystem_depend(struct spdk_subsystem_depend *depend);
-
-/**
- * \brief Register a new subsystem
- */
-#define SPDK_SUBSYSTEM_REGISTER(_name, _init, _fini, _config)			\
-	struct spdk_subsystem __spdk_subsystem_ ## _name = {			\
-	.name = #_name,								\
-	.init = _init,								\
-	.fini = _fini,								\
-	.config = _config,							\
-	};									\
-	__attribute__((constructor)) static void _name ## _register(void)	\
-	{									\
-		spdk_add_subsystem(&__spdk_subsystem_ ## _name);		\
-	}
-
-/**
- * \brief Declare that a subsystem depends on another subsystem.
- */
-#define SPDK_SUBSYSTEM_DEPEND(_name, _depends_on)						\
-	extern struct spdk_subsystem __spdk_subsystem_ ## _depends_on;				\
-	static struct spdk_subsystem_depend __subsystem_ ## _name ## _depend_on ## _depends_on = { \
-	.name = #_name,										\
-	.depends_on = #_depends_on,								\
-	.depends_on_subsystem = &__spdk_subsystem_ ## _depends_on,				\
-	};											\
-	__attribute__((constructor)) static void _name ## _depend_on ## _depends_on(void)	\
-	{											\
-		spdk_add_subsystem_depend(&__subsystem_ ## _name ## _depend_on ## _depends_on); \
-	}
-
 #endif

include/spdk_internal/event.h

@@ -31,8 +31,12 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SPDK_REACTOR_H_
-#define SPDK_REACTOR_H_
+#ifndef SPDK_INTERNAL_EVENT_H
+#define SPDK_INTERNAL_EVENT_H
+
+#include <stdio.h>
+
+#include "spdk/event.h"
 
 int spdk_reactors_init(const char *mask, unsigned int max_delay_us);
 int spdk_reactors_fini(void);
@@ -40,4 +44,56 @@ int spdk_reactors_fini(void);
 void spdk_reactors_start(void);
 void spdk_reactors_stop(void);
 
-#endif
+struct spdk_subsystem {
+	const char *name;
+	int (*init)(void);
+	int (*fini)(void);
+	void (*config)(FILE *fp);
+	TAILQ_ENTRY(spdk_subsystem) tailq;
+};
+
+struct spdk_subsystem_depend {
+	const char *name;
+	const char *depends_on;
+	struct spdk_subsystem *depends_on_subsystem;
+	TAILQ_ENTRY(spdk_subsystem_depend) tailq;
+};
+
+void spdk_add_subsystem(struct spdk_subsystem *subsystem);
+void spdk_add_subsystem_depend(struct spdk_subsystem_depend *depend);
+
+int spdk_subsystem_init(void);
+int spdk_subsystem_fini(void);
+void spdk_subsystem_config(FILE *fp);
+
+/**
+ * \brief Register a new subsystem
+ */
+#define SPDK_SUBSYSTEM_REGISTER(_name, _init, _fini, _config)			\
+	struct spdk_subsystem __spdk_subsystem_ ## _name = {			\
+	.name = #_name,								\
+	.init = _init,								\
+	.fini = _fini,								\
+	.config = _config,							\
+	};									\
+	__attribute__((constructor)) static void _name ## _register(void)	\
+	{									\
+		spdk_add_subsystem(&__spdk_subsystem_ ## _name);		\
+	}
+
+/**
+ * \brief Declare that a subsystem depends on another subsystem.
+ */
+#define SPDK_SUBSYSTEM_DEPEND(_name, _depends_on)						\
+	extern struct spdk_subsystem __spdk_subsystem_ ## _depends_on;				\
+	static struct spdk_subsystem_depend __subsystem_ ## _name ## _depend_on ## _depends_on = { \
+	.name = #_name,										\
+	.depends_on = #_depends_on,								\
+	.depends_on_subsystem = &__spdk_subsystem_ ## _depends_on,				\
+	};											\
+	__attribute__((constructor)) static void _name ## _depend_on ## _depends_on(void)	\
+	{											\
+		spdk_add_subsystem_depend(&__subsystem_ ## _name ## _depend_on ## _depends_on); \
+	}
+
+#endif /* SPDK_INTERNAL_EVENT_H */

lib/bdev/bdev.c

@@ -43,10 +43,10 @@
 #include <rte_mempool.h>
 #include <rte_version.h>
 
-#include "spdk/event.h"
 #include "spdk/queue.h"
 
 #include "spdk_internal/bdev.h"
+#include "spdk_internal/event.h"
 #include "spdk_internal/log.h"
 
 #define SPDK_BDEV_IO_POOL_SIZE	(64 * 1024)

lib/copy/copy_engine.c

@@ -41,9 +41,10 @@
 #include <rte_memcpy.h>
 
 #include "spdk/log.h"
-#include "spdk/event.h"
 #include "spdk/io_channel.h"
 
+#include "spdk_internal/event.h"
+
 static size_t g_max_copy_module_size = 0;
 
 static struct spdk_copy_engine *hw_copy_engine = NULL;

lib/event/app.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/event.h"
+#include "spdk_internal/event.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -53,9 +53,6 @@
 #include "spdk/conf.h"
 #include "spdk/trace.h"
 
-#include "reactor.h"
-#include "subsystem.h"
-
 /* Add enough here to append ".pid" plus 2 digit instance ID */
 #define SPDK_APP_PIDFILE_MAX_LENGTH	40
 #define SPDK_APP_PIDFILE_PREFIX		"/var/run"

lib/event/reactor.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/event.h"
+#include "spdk_internal/event.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -50,8 +50,6 @@
 #include <rte_config.h>
 #include <rte_ring.h>
 
-#include "reactor.h"
-
 #include "spdk/log.h"
 #include "spdk/io_channel.h"
 #include "spdk/env.h"

lib/event/subsystem.c

@@ -31,14 +31,12 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/event.h"
+#include "spdk_internal/event.h"
 
 #include <stddef.h>
 #include <stdbool.h>
 #include <string.h>
 
-#include "subsystem.h"
-
 static TAILQ_HEAD(spdk_subsystem_list, spdk_subsystem) g_subsystems =
 	TAILQ_HEAD_INITIALIZER(g_subsystems);
 static TAILQ_HEAD(subsystem_depend, spdk_subsystem_depend) g_depends =

lib/event/subsystem.h

@@ -1,43 +0,0 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright (c) Intel Corporation.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SPDK_SUBSYSTEM_H_
-#define SPDK_SUBSYSTEM_H_
-
-#include <stdio.h>
-
-int spdk_subsystem_init(void);
-int spdk_subsystem_fini(void);
-void spdk_subsystem_config(FILE *fp);
-
-#endif

lib/iscsi/iscsi_subsystem.c

@@ -47,9 +47,9 @@
 #include "iscsi/conn.h"
 #include "iscsi/task.h"
 
-#include "spdk/event.h"
 #include "spdk/env.h"
 
+#include "spdk_internal/event.h"
 #include "spdk_internal/log.h"
 
 #define ISCSI_CONFIG_TMPL \

lib/net/interface.c

@@ -34,9 +34,10 @@
 #include <stdlib.h>
 
 #include "spdk/log.h"
-#include "spdk/event.h"
 #include "spdk/net.h"
 
+#include "spdk_internal/event.h"
+
 #ifdef __linux__ /* Interface management is Linux-specific */
 
 #include <stdio.h>

lib/net/net_framework_default.c

@@ -31,9 +31,10 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/event.h"
 #include "spdk/net.h"
 
+#include "spdk_internal/event.h"
+
 __attribute__((weak))
 const char *spdk_net_framework_get_name(void)
 {

lib/rpc/rpc.c

@@ -49,10 +49,11 @@
 #include "spdk/queue.h"
 #include "spdk/rpc.h"
 #include "spdk/env.h"
-#include "spdk/event.h"
 #include "spdk/conf.h"
 #include "spdk/log.h"
 
+#include "spdk_internal/event.h"
+
 #define RPC_SELECT_INTERVAL	4000 /* 4ms */
 #define RPC_DEFAULT_LISTEN_ADDR	"127.0.0.1"
 

lib/scsi/scsi.c

@@ -34,9 +34,10 @@
 
 #include "scsi_internal.h"
 
-#include "spdk/event.h"
 #include "spdk/conf.h"
 
+#include "spdk_internal/event.h"
+
 #define DEFAULT_MAX_UNMAP_LBA_COUNT			4194304
 #define DEFAULT_MAX_UNMAP_BLOCK_DESCRIPTOR_COUNT	1
 #define DEFAULT_OPTIMAL_UNMAP_GRANULARITY		0