Commit d92f0f75 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

log: rename SPDK_TRACELOG to SPDK_DEBUGLOG 



This matches the name to the behavior and prepares for addition of a new
log macro for "info" log level.

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


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

include/spdk_internal/log.h

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ 
	spdk_log_register_trace_flag(str, &flag); \

}



#define SPDK_TRACELOG(FLAG, ...)								\

#define SPDK_DEBUGLOG(FLAG, ...)								\

	do {											\

		extern struct spdk_trace_flag FLAG;						\

		if (FLAG.enabled) {								\
@@ -82,7 +82,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ 


#else

#define SPDK_LOG_REGISTER_TRACE_FLAG(str, flag)

#define SPDK_TRACELOG(...) do { } while (0)

#define SPDK_DEBUGLOG(...) do { } while (0)

#define SPDK_TRACEDUMP(...) do { } while (0)

#endif

lib/bdev/aio/bdev_aio.c

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

	aio_task->len = nbytes;



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

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

		      iovcnt, nbytes, offset);



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

	aio_task->len = len;



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

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

		      iovcnt, len, offset);



	rc = io_submit(aio_ch->io_ctx, 1, &iocb);

lib/bdev/bdev.c

+6 −6
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ spdk_bdev_first(void) 


	bdev = TAILQ_FIRST(&g_bdev_mgr.bdevs);

	if (bdev) {

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

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

	}



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


	bdev = TAILQ_NEXT(prev, link);

	if (bdev) {

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

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

	}



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



	if (bdev) {

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

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

	}



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



	if (bdev) {

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

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

	}



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



	pthread_mutex_init(&bdev->mutex, NULL);

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

	SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "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) {
@@ -1459,7 +1459,7 @@ spdk_bdev_unregister(struct spdk_bdev *bdev) 
	int			rc;

	bool			do_destruct = true;



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

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



	pthread_mutex_lock(&bdev->mutex);

lib/bdev/gpt/gpt.c

+3 −3
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_TRACELOG(SPDK_TRACE_GPT_PARSE, "Signature mismatch, provided=%x,"

		SPDK_DEBUGLOG(SPDK_TRACE_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_TRACELOG(SPDK_TRACE_GPT_PARSE, "start lba mismatch, provided=%u, expected=%u\n",

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

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

				      expected_start_lba);

			return -1;
@@ -217,7 +217,7 @@ spdk_gpt_parse(struct spdk_gpt *gpt) 


	rc = spdk_gpt_check_mbr(gpt);

	if (rc) {

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

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

		return rc;

	}

lib/bdev/gpt/vbdev_gpt.c

+3 −3
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ vbdev_gpt_create_bdevs(struct spdk_gpt_bdev *gpt_bdev) 
		d->disk.fn_table = &vbdev_gpt_fn_table;

		d->disk.module = SPDK_GET_BDEV_MODULE(gpt);



		SPDK_TRACELOG(SPDK_TRACE_VBDEV_GPT, "gpt vbdev %s: base bdev: %s offset_bytes: "

		SPDK_DEBUGLOG(SPDK_TRACE_VBDEV_GPT, "gpt vbdev %s: base bdev: %s offset_bytes: "

			      "%" PRIu64 " offset_blocks: %" PRIu64 "\n",

			      d->disk.name, spdk_bdev_get_name(base_bdev), d->offset_bytes, d->offset_blocks);
@@ -444,7 +444,7 @@ spdk_gpt_bdev_complete(struct spdk_bdev_io *bdev_io, bool status, void *arg) 


	rc = spdk_gpt_parse(&gpt_bdev->gpt);

	if (rc) {

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

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

		goto end;

	}
@@ -456,7 +456,7 @@ spdk_gpt_bdev_complete(struct spdk_bdev_io *bdev_io, bool status, void *arg) 


	rc = vbdev_gpt_create_bdevs(gpt_bdev);

	if (rc < 0) {

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

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

			      spdk_bdev_get_name(bdev));

	}