Commit ea1c1579 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

log: rename SPDK_TRACE_* to SPDK_LOG_* 



Disambiguate the log components from the trace functionality
(include/spdk/trace.h).

The internal spdk_trace_flag structure and related functions will be
renamed in a later commit - this is just a find and replace on
SPDK_TRACE_* and SPDK_LOG_REGISTER_TRACE_FLAG().

Change-Id: I617bd5a9fbe35ffb44ae6020b292658c094a0ad6
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/376421


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent e6fea425

include/spdk_internal/log.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void spdk_log_register_trace_flag(const char *name, struct spdk_trace_flag *flag 
struct spdk_trace_flag *spdk_log_get_first_trace_flag(void);

struct spdk_trace_flag *spdk_log_get_next_trace_flag(struct spdk_trace_flag *flag);



#define SPDK_LOG_REGISTER_TRACE_FLAG(str, flag) \

#define SPDK_LOG_REGISTER_COMPONENT(str, flag) \

struct spdk_trace_flag flag = { \

	.enabled = false, \

	.name = str, \

lib/bdev/aio/bdev_aio.c

+3 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ bdev_aio_readv(struct file_disk *fdisk, struct spdk_io_channel *ch, 
	iocb->data = aio_task;

	aio_task->len = nbytes;



	SPDK_DEBUGLOG(SPDK_TRACE_AIO, "read %d iovs size %lu to off: %#lx\n",

	SPDK_DEBUGLOG(SPDK_LOG_AIO, "read %d iovs size %lu to off: %#lx\n",

		      iovcnt, nbytes, offset);



	rc = io_submit(aio_ch->io_ctx, 1, &iocb);
@@ -145,7 +145,7 @@ bdev_aio_writev(struct file_disk *fdisk, struct spdk_io_channel *ch, 
	iocb->data = aio_task;

	aio_task->len = len;



	SPDK_DEBUGLOG(SPDK_TRACE_AIO, "write %d iovs size %lu from off: %#lx\n",

	SPDK_DEBUGLOG(SPDK_LOG_AIO, "write %d iovs size %lu from off: %#lx\n",

		      iovcnt, len, offset);



	rc = io_submit(aio_ch->io_ctx, 1, &iocb);
@@ -547,4 +547,4 @@ bdev_aio_get_spdk_running_config(FILE *fp) 
	fprintf(fp, "\n");

}



SPDK_LOG_REGISTER_TRACE_FLAG("aio", SPDK_TRACE_AIO)
 
SPDK_LOG_REGISTER_COMPONENT("aio", SPDK_LOG_AIO)

lib/bdev/bdev.c

+8 −8
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ spdk_bdev_first(void) 


	bdev = TAILQ_FIRST(&g_bdev_mgr.bdevs);

	if (bdev) {

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Starting bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Starting bdev iteration at %s\n", bdev->name);

	}



	return bdev;
@@ -175,7 +175,7 @@ spdk_bdev_next(struct spdk_bdev *prev) 


	bdev = TAILQ_NEXT(prev, link);

	if (bdev) {

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Continuing bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Continuing bdev iteration at %s\n", bdev->name);

	}



	return bdev;
@@ -203,7 +203,7 @@ spdk_bdev_first_leaf(void) 
	bdev = _bdev_next_leaf(TAILQ_FIRST(&g_bdev_mgr.bdevs));



	if (bdev) {

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Starting bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Starting bdev iteration at %s\n", bdev->name);

	}



	return bdev;
@@ -217,7 +217,7 @@ spdk_bdev_next_leaf(struct spdk_bdev *prev) 
	bdev = _bdev_next_leaf(TAILQ_NEXT(prev, link));



	if (bdev) {

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Continuing bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Continuing bdev iteration at %s\n", bdev->name);

	}



	return bdev;
@@ -1803,7 +1803,7 @@ _spdk_bdev_register(struct spdk_bdev *bdev) 
				sizeof(struct spdk_bdev_channel));



	pthread_mutex_init(&bdev->mutex, NULL);

	SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Inserting bdev %s into list\n", bdev->name);

	SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Inserting bdev %s into list\n", bdev->name);

	TAILQ_INSERT_TAIL(&g_bdev_mgr.bdevs, bdev, link);



	TAILQ_FOREACH(module, &g_bdev_mgr.bdev_modules, tailq) {
@@ -1856,7 +1856,7 @@ spdk_bdev_unregister(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void 
	int			rc;

	bool			do_destruct = true;



	SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Removing bdev %s from list\n", bdev->name);

	SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Removing bdev %s from list\n", bdev->name);



	pthread_mutex_lock(&bdev->mutex);
@@ -1921,7 +1921,7 @@ spdk_bdev_open(struct spdk_bdev *bdev, bool write, spdk_bdev_remove_cb_t remove_ 
	pthread_mutex_lock(&bdev->mutex);



	if (write && bdev->claim_module) {

		SPDK_INFOLOG(SPDK_TRACE_BDEV, "Could not open %s - already claimed\n", bdev->name);

		SPDK_INFOLOG(SPDK_LOG_BDEV, "Could not open %s - already claimed\n", bdev->name);

		free(desc);

		pthread_mutex_unlock(&bdev->mutex);

		return -EPERM;
@@ -2309,4 +2309,4 @@ spdk_bdev_part_construct(struct spdk_bdev_part *part, struct spdk_bdev_part_base 
	return 0;

}



SPDK_LOG_REGISTER_TRACE_FLAG("bdev", SPDK_TRACE_BDEV)
 
SPDK_LOG_REGISTER_COMPONENT("bdev", SPDK_LOG_BDEV)

lib/bdev/gpt/gpt.c

+5 −5
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ spdk_gpt_check_mbr(struct spdk_gpt *gpt) 


	mbr = (struct spdk_mbr *)gpt->buf;

	if (from_le16(&mbr->mbr_signature) != SPDK_MBR_SIGNATURE) {

		SPDK_DEBUGLOG(SPDK_TRACE_GPT_PARSE, "Signature mismatch, provided=%x,"

		SPDK_DEBUGLOG(SPDK_LOG_GPT_PARSE, "Signature mismatch, provided=%x,"

			      "expected=%x\n", from_le16(&mbr->disk_signature),

			      SPDK_MBR_SIGNATURE);

		return -1;
@@ -184,7 +184,7 @@ spdk_gpt_check_mbr(struct spdk_gpt *gpt) 
	if (ret == GPT_PROTECTIVE_MBR) {

		expected_start_lba = GPT_PRIMARY_PARTITION_TABLE_LBA;

		if (from_le32(&mbr->partitions[primary_partition].start_lba) != expected_start_lba) {

			SPDK_DEBUGLOG(SPDK_TRACE_GPT_PARSE, "start lba mismatch, provided=%u, expected=%u\n",

			SPDK_DEBUGLOG(SPDK_LOG_GPT_PARSE, "start lba mismatch, provided=%u, expected=%u\n",

				      from_le32(&mbr->partitions[primary_partition].start_lba),

				      expected_start_lba);

			return -1;
@@ -198,7 +198,7 @@ spdk_gpt_check_mbr(struct spdk_gpt *gpt) 
			return -1;

		}

	} else {

		SPDK_DEBUGLOG(SPDK_TRACE_GPT_PARSE, "Currently only support GPT Protective MBR format\n");

		SPDK_DEBUGLOG(SPDK_LOG_GPT_PARSE, "Currently only support GPT Protective MBR format\n");

		return -1;

	}
@@ -217,7 +217,7 @@ spdk_gpt_parse(struct spdk_gpt *gpt) 


	rc = spdk_gpt_check_mbr(gpt);

	if (rc) {

		SPDK_DEBUGLOG(SPDK_TRACE_GPT_PARSE, "Failed to detect gpt in MBR\n");

		SPDK_DEBUGLOG(SPDK_LOG_GPT_PARSE, "Failed to detect gpt in MBR\n");

		return rc;

	}
@@ -236,4 +236,4 @@ spdk_gpt_parse(struct spdk_gpt *gpt) 
	return 0;

}



SPDK_LOG_REGISTER_TRACE_FLAG("gpt_parse", SPDK_TRACE_GPT_PARSE)
 
SPDK_LOG_REGISTER_COMPONENT("gpt_parse", SPDK_LOG_GPT_PARSE)

lib/bdev/gpt/vbdev_gpt.c

+3 −3
Original line number Diff line number Diff line
@@ -291,13 +291,13 @@ spdk_gpt_bdev_complete(struct spdk_bdev_io *bdev_io, bool status, void *arg) 


	rc = spdk_gpt_parse(&gpt_base->gpt);

	if (rc) {

		SPDK_DEBUGLOG(SPDK_TRACE_VBDEV_GPT, "Failed to parse gpt\n");

		SPDK_DEBUGLOG(SPDK_LOG_VBDEV_GPT, "Failed to parse gpt\n");

		goto end;

	}



	rc = vbdev_gpt_create_bdevs(gpt_base);

	if (rc < 0) {

		SPDK_DEBUGLOG(SPDK_TRACE_VBDEV_GPT, "Failed to split dev=%s by gpt table\n",

		SPDK_DEBUGLOG(SPDK_LOG_VBDEV_GPT, "Failed to split dev=%s by gpt table\n",

			      spdk_bdev_get_name(bdev));

	}
@@ -383,4 +383,4 @@ vbdev_gpt_examine(struct spdk_bdev *bdev) 


SPDK_BDEV_MODULE_REGISTER(gpt, vbdev_gpt_init, vbdev_gpt_fini, NULL,

			  NULL, vbdev_gpt_examine)

SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_gpt", SPDK_TRACE_VBDEV_GPT)
 
SPDK_LOG_REGISTER_COMPONENT("vbdev_gpt", SPDK_LOG_VBDEV_GPT)