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

log: remove uses of SPDK_TRACE_DEBUG 



Replace SPDK_TRACE_DEBUG with component-specific flags.

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


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 e3971c41

lib/bdev/bdev.c

+8 −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_DEBUGLOG(SPDK_TRACE_DEBUG, "Starting bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "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_DEBUGLOG(SPDK_TRACE_DEBUG, "Continuing bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "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_DEBUGLOG(SPDK_TRACE_DEBUG, "Starting bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "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_DEBUGLOG(SPDK_TRACE_DEBUG, "Continuing bdev iteration at %s\n", bdev->name);

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "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_DEBUGLOG(SPDK_TRACE_DEBUG, "Inserting bdev %s into list\n", bdev->name);

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

	bool			do_destruct = true;



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

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



	pthread_mutex_lock(&bdev->mutex);
@@ -1680,3 +1680,5 @@ spdk_bdev_module_list_add(struct spdk_bdev_module_if *bdev_module) 
		TAILQ_INSERT_TAIL(&g_bdev_mgr.bdev_modules, bdev_module, tailq);

	}

}



SPDK_LOG_REGISTER_TRACE_FLAG("bdev", SPDK_TRACE_BDEV)

lib/bdev/malloc/bdev_malloc.c

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ bdev_malloc_readv(struct malloc_disk *mdisk, struct spdk_io_channel *ch, 
		return;

	}



	SPDK_DEBUGLOG(SPDK_TRACE_MALLOC, "read %lu bytes from offset %#lx\n",

	SPDK_DEBUGLOG(SPDK_TRACE_BDEV_MALLOC, "read %lu bytes from offset %#lx\n",

		      len, offset);



	task->status = SPDK_BDEV_IO_STATUS_SUCCESS;
@@ -209,7 +209,7 @@ bdev_malloc_writev(struct malloc_disk *mdisk, struct spdk_io_channel *ch, 
		return;

	}



	SPDK_DEBUGLOG(SPDK_TRACE_MALLOC, "wrote %lu bytes to offset %#lx\n",

	SPDK_DEBUGLOG(SPDK_TRACE_BDEV_MALLOC, "wrote %lu bytes to offset %#lx\n",

		      len, offset);



	task->status = SPDK_BDEV_IO_STATUS_SUCCESS;
@@ -517,4 +517,4 @@ bdev_malloc_get_spdk_running_config(FILE *fp) 
	}

}



SPDK_LOG_REGISTER_TRACE_FLAG("malloc", SPDK_TRACE_MALLOC)
 
SPDK_LOG_REGISTER_TRACE_FLAG("bdev_malloc", SPDK_TRACE_BDEV_MALLOC)

lib/bdev/malloc/bdev_malloc_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ spdk_rpc_construct_malloc_bdev(struct spdk_jsonrpc_request *request, 
	if (spdk_json_decode_object(params, rpc_construct_malloc_decoders,

				    SPDK_COUNTOF(rpc_construct_malloc_decoders),

				    &req)) {

		SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV_MALLOC, "spdk_json_decode_object failed\n");

		goto invalid;

	}

lib/bdev/null/bdev_null_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ spdk_rpc_construct_null_bdev(struct spdk_jsonrpc_request *request, 
	if (spdk_json_decode_object(params, rpc_construct_null_decoders,

				    SPDK_COUNTOF(rpc_construct_null_decoders),

				    &req)) {

		SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");

		SPDK_DEBUGLOG(SPDK_TRACE_BDEV_NULL, "spdk_json_decode_object failed\n");

		goto invalid;

	}

lib/bdev/rbd/bdev_rbd.c

+3 −1
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ 


#include "spdk/conf.h"

#include "spdk/env.h"

#include "spdk/log.h"

#include "spdk/bdev.h"

#include "spdk/io_channel.h"

#include "spdk/json.h"

#include "spdk/string.h"



#include "spdk_internal/bdev.h"

#include "spdk_internal/log.h"



#define SPDK_RBD_QUEUE_DEPTH 128
@@ -617,3 +617,5 @@ bdev_rbd_library_init(void) 
end:

	return rc;

}



SPDK_LOG_REGISTER_TRACE_FLAG("bdev_rbd", SPDK_TRACE_BDEV_RBD)