Commit 7b01af8f authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

event.h: split non-public API into spdk_internal 



Change-Id: Ie783df6cf387286ab882107fb9d4ce12358602e2
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent f99eb855

include/spdk/event.h

+0 −48
Original line number Diff line number Diff line
@@ -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

lib/event/reactor.h→include/spdk_internal/event.h

+59 −3
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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

+1 −4
Original line number Diff line number Diff line
@@ -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"