Commit b71bebe8 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

blobfs: spdk_fs_thread_ctx is no longer a channel 



This also means that the RocksDB threads don't need
to be SPDK threads any more.

Change-Id: Icadd6dd446958ebf470ad8ab8239f5390942eb87
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449465


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent e9d400d5

lib/blobfs/blobfs.c

+14 −10
Original line number Diff line number Diff line
@@ -1738,24 +1738,28 @@ spdk_fs_free_io_channel(struct spdk_io_channel *channel) 
struct spdk_fs_thread_ctx *

spdk_fs_alloc_thread_ctx(struct spdk_filesystem *fs)

{

	struct spdk_io_channel *io_channel;

	struct spdk_fs_channel *fs_channel;

	struct spdk_fs_thread_ctx *ctx;



	io_channel = spdk_get_io_channel(&fs->io_target);

	fs_channel = spdk_io_channel_get_ctx(io_channel);

	fs_channel->send_request = fs->send_request;

	fs_channel->sync = 1;

	pthread_spin_init(&fs_channel->lock, 0);

	ctx = calloc(1, sizeof(*ctx));

	if (!ctx) {

		return NULL;

	}



	_spdk_fs_channel_create(fs, &ctx->ch, 512);



	ctx->ch.send_request = fs->send_request;

	ctx->ch.sync = 1;

	pthread_spin_init(&ctx->ch.lock, 0);



	/* These two types are currently equivalent */

	return (struct spdk_fs_thread_ctx *)fs_channel;

	return ctx;

}





void

spdk_fs_free_thread_ctx(struct spdk_fs_thread_ctx *ctx)

{

	spdk_put_io_channel(spdk_io_channel_from_ctx(ctx));

	_spdk_fs_channel_destroy(NULL, &ctx->ch);

	free(ctx);

}



void

lib/rocksdb/env_spdk.cc

+3 −0
Original line number Diff line number Diff line
@@ -592,6 +592,9 @@ void SpdkInitializeThread(void) 


void SpdkFinalizeThread(void)

{

	if (g_sync_args.channel) {

		spdk_fs_free_thread_ctx(g_sync_args.channel);

	}

}



struct SpdkThreadState {