Commit db18916f authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

thread: move _free_thread() earlier in file 



Next patch will add a new caller to this function.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I54374c0af3a4a0fdcc5ac9ca25e2c7ef03e99829
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15576


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 13b7f1b2

lib/thread/thread.c

+59 −59
Original line number Diff line number Diff line
@@ -263,65 +263,6 @@ _thread_lib_init(size_t ctx_sz, size_t msg_mempool_sz) 
	return 0;

}



int

spdk_thread_lib_init(spdk_new_thread_fn new_thread_fn, size_t ctx_sz)

{

	assert(g_new_thread_fn == NULL);

	assert(g_thread_op_fn == NULL);



	if (new_thread_fn == NULL) {

		SPDK_INFOLOG(thread, "new_thread_fn was not specified at spdk_thread_lib_init\n");

	} else {

		g_new_thread_fn = new_thread_fn;

	}



	return _thread_lib_init(ctx_sz, SPDK_DEFAULT_MSG_MEMPOOL_SIZE);

}



int

spdk_thread_lib_init_ext(spdk_thread_op_fn thread_op_fn,

			 spdk_thread_op_supported_fn thread_op_supported_fn,

			 size_t ctx_sz, size_t msg_mempool_sz)

{

	assert(g_new_thread_fn == NULL);

	assert(g_thread_op_fn == NULL);

	assert(g_thread_op_supported_fn == NULL);



	if ((thread_op_fn != NULL) != (thread_op_supported_fn != NULL)) {

		SPDK_ERRLOG("Both must be defined or undefined together.\n");

		return -EINVAL;

	}



	if (thread_op_fn == NULL && thread_op_supported_fn == NULL) {

		SPDK_INFOLOG(thread, "thread_op_fn and thread_op_supported_fn were not specified\n");

	} else {

		g_thread_op_fn = thread_op_fn;

		g_thread_op_supported_fn = thread_op_supported_fn;

	}



	return _thread_lib_init(ctx_sz, msg_mempool_sz);

}



void

spdk_thread_lib_fini(void)

{

	struct io_device *dev;



	RB_FOREACH(dev, io_device_tree, &g_io_devices) {

		SPDK_ERRLOG("io_device %s not unregistered\n", dev->name);

	}



	if (g_spdk_msg_mempool) {

		spdk_mempool_free(g_spdk_msg_mempool);

		g_spdk_msg_mempool = NULL;

	}



	g_new_thread_fn = NULL;

	g_thread_op_fn = NULL;

	g_thread_op_supported_fn = NULL;

	g_ctx_sz = 0;

}



static void thread_interrupt_destroy(struct spdk_thread *thread);

static int thread_interrupt_create(struct spdk_thread *thread);
@@ -388,6 +329,65 @@ _free_thread(struct spdk_thread *thread) 
	free(thread);

}



int

spdk_thread_lib_init(spdk_new_thread_fn new_thread_fn, size_t ctx_sz)

{

	assert(g_new_thread_fn == NULL);

	assert(g_thread_op_fn == NULL);



	if (new_thread_fn == NULL) {

		SPDK_INFOLOG(thread, "new_thread_fn was not specified at spdk_thread_lib_init\n");

	} else {

		g_new_thread_fn = new_thread_fn;

	}



	return _thread_lib_init(ctx_sz, SPDK_DEFAULT_MSG_MEMPOOL_SIZE);

}



int

spdk_thread_lib_init_ext(spdk_thread_op_fn thread_op_fn,

			 spdk_thread_op_supported_fn thread_op_supported_fn,

			 size_t ctx_sz, size_t msg_mempool_sz)

{

	assert(g_new_thread_fn == NULL);

	assert(g_thread_op_fn == NULL);

	assert(g_thread_op_supported_fn == NULL);



	if ((thread_op_fn != NULL) != (thread_op_supported_fn != NULL)) {

		SPDK_ERRLOG("Both must be defined or undefined together.\n");

		return -EINVAL;

	}



	if (thread_op_fn == NULL && thread_op_supported_fn == NULL) {

		SPDK_INFOLOG(thread, "thread_op_fn and thread_op_supported_fn were not specified\n");

	} else {

		g_thread_op_fn = thread_op_fn;

		g_thread_op_supported_fn = thread_op_supported_fn;

	}



	return _thread_lib_init(ctx_sz, msg_mempool_sz);

}



void

spdk_thread_lib_fini(void)

{

	struct io_device *dev;



	RB_FOREACH(dev, io_device_tree, &g_io_devices) {

		SPDK_ERRLOG("io_device %s not unregistered\n", dev->name);

	}



	if (g_spdk_msg_mempool) {

		spdk_mempool_free(g_spdk_msg_mempool);

		g_spdk_msg_mempool = NULL;

	}



	g_new_thread_fn = NULL;

	g_thread_op_fn = NULL;

	g_thread_op_supported_fn = NULL;

	g_ctx_sz = 0;

}



struct spdk_thread *

spdk_thread_create(const char *name, const struct spdk_cpuset *cpumask)

{