Commit 3dc8dfb4 authored by Jim Harris's avatar Jim Harris
Browse files

log: rename spdk_trace_flag to spdk_log_flag 



"trace" is for event tracing.  SPDK used to use this
term for logging - we've moved some APIs to use "log"
but more needs to be changed.  So start that now.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ib732c57d01602e56f37e9deed7135840a7c005be

Reviewed-on: https://review.gerrithub.io/435342


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarXiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 0891f506

include/spdk_internal/log.h

+9 −9
Original line number Diff line number Diff line
@@ -46,19 +46,19 @@ extern enum spdk_log_level g_spdk_log_level; 
extern enum spdk_log_level g_spdk_log_print_level;

extern enum spdk_log_level g_spdk_log_backtrace_level;



struct spdk_trace_flag {

	TAILQ_ENTRY(spdk_trace_flag) tailq;

struct spdk_log_flag {

	TAILQ_ENTRY(spdk_log_flag) tailq;

	const char *name;

	bool enabled;

};



void spdk_log_register_trace_flag(const char *name, struct spdk_trace_flag *flag);

void spdk_log_register_trace_flag(const char *name, struct spdk_log_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);

struct spdk_log_flag *spdk_log_get_first_trace_flag(void);

struct spdk_log_flag *spdk_log_get_next_trace_flag(struct spdk_log_flag *flag);



#define SPDK_LOG_REGISTER_COMPONENT(str, flag) \

struct spdk_trace_flag flag = { \

struct spdk_log_flag flag = { \

	.enabled = false, \

	.name = str, \

}; \
@@ -69,7 +69,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ 


#define SPDK_INFOLOG(FLAG, ...)									\

	do {											\

		extern struct spdk_trace_flag FLAG;						\

		extern struct spdk_log_flag FLAG;						\

		if (FLAG.enabled) {								\

			spdk_log(SPDK_LOG_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__);	\

		}										\
@@ -79,7 +79,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ 


#define SPDK_DEBUGLOG(FLAG, ...)								\

	do {											\

		extern struct spdk_trace_flag FLAG;						\

		extern struct spdk_log_flag FLAG;						\

		if (FLAG.enabled) {								\

			spdk_log(SPDK_LOG_DEBUG, __FILE__, __LINE__, __func__, __VA_ARGS__);	\

		}										\
@@ -87,7 +87,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ 


#define SPDK_TRACEDUMP(FLAG, LABEL, BUF, LEN)						\

	do {										\

		extern struct spdk_trace_flag FLAG;					\

		extern struct spdk_log_flag FLAG;					\

		if ((FLAG.enabled) && (LEN)) {						\

			spdk_trace_dump(stderr, (LABEL), (BUF), (LEN));			\

		}									\

lib/log/log_flags.c

+13 −13
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include "spdk_internal/log.h"



static TAILQ_HEAD(, spdk_trace_flag) g_trace_flags = TAILQ_HEAD_INITIALIZER(g_trace_flags);

static TAILQ_HEAD(, spdk_log_flag) g_trace_flags = TAILQ_HEAD_INITIALIZER(g_trace_flags);



enum spdk_log_level g_spdk_log_level = SPDK_LOG_NOTICE;

enum spdk_log_level g_spdk_log_print_level = SPDK_LOG_NOTICE;
@@ -84,10 +84,10 @@ spdk_log_get_backtrace_level(void) { 
	return g_spdk_log_backtrace_level;

}



static struct spdk_trace_flag *

static struct spdk_log_flag *

get_trace_flag(const char *name)

{

	struct spdk_trace_flag *flag;

	struct spdk_log_flag *flag;



	TAILQ_FOREACH(flag, &g_trace_flags, tailq) {

		if (strcasecmp(name, flag->name) == 0) {
@@ -99,18 +99,18 @@ get_trace_flag(const char *name) 
}



void

spdk_log_register_trace_flag(const char *name, struct spdk_trace_flag *flag)

spdk_log_register_trace_flag(const char *name, struct spdk_log_flag *flag)

{

	struct spdk_trace_flag *iter;

	struct spdk_log_flag *iter;



	if (name == NULL || flag == NULL) {

		SPDK_ERRLOG("missing spdk_trace_flag parameters\n");

		SPDK_ERRLOG("missing spdk_log_flag parameters\n");

		assert(false);

		return;

	}



	if (get_trace_flag(name)) {

		SPDK_ERRLOG("duplicate spdk_trace_flag '%s'\n", name);

		SPDK_ERRLOG("duplicate spdk_log_flag '%s'\n", name);

		assert(false);

		return;

	}
@@ -128,7 +128,7 @@ spdk_log_register_trace_flag(const char *name, struct spdk_trace_flag *flag) 
bool

spdk_log_get_trace_flag(const char *name)

{

	struct spdk_trace_flag *flag = get_trace_flag(name);

	struct spdk_log_flag *flag = get_trace_flag(name);



	if (flag && flag->enabled) {

		return true;
@@ -140,7 +140,7 @@ spdk_log_get_trace_flag(const char *name) 
static int

set_trace_flag(const char *name, bool value)

{

	struct spdk_trace_flag *flag;

	struct spdk_log_flag *flag;



	if (strcasecmp(name, "all") == 0) {

		TAILQ_FOREACH(flag, &g_trace_flags, tailq) {
@@ -171,14 +171,14 @@ spdk_log_clear_trace_flag(const char *name) 
	return set_trace_flag(name, false);

}



struct spdk_trace_flag *

struct spdk_log_flag *

spdk_log_get_first_trace_flag(void)

{

	return TAILQ_FIRST(&g_trace_flags);

}



struct spdk_trace_flag *

spdk_log_get_next_trace_flag(struct spdk_trace_flag *flag)

struct spdk_log_flag *

spdk_log_get_next_trace_flag(struct spdk_log_flag *flag)

{

	return TAILQ_NEXT(flag, tailq);

}
@@ -187,7 +187,7 @@ void 
spdk_tracelog_usage(FILE *f, const char *trace_arg)

{

#ifdef DEBUG

	struct spdk_trace_flag *flag;

	struct spdk_log_flag *flag;

	fprintf(f, " %s, --traceflag <flag>    enable debug log flag (all", trace_arg);



	TAILQ_FOREACH(flag, &g_trace_flags, tailq) {

lib/log/rpc/log_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ spdk_rpc_get_trace_flags(struct spdk_jsonrpc_request *request, 
			 const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;

	struct spdk_trace_flag *flag;

	struct spdk_log_flag *flag;



	if (params != NULL) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#include "common/lib/test_env.c"



struct spdk_trace_flag SPDK_LOG_NVME = {

struct spdk_log_flag SPDK_LOG_NVME = {

	.name = "nvme",

	.enabled = false,

};

test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ DEFINE_STUB(spdk_nvme_wait_for_completion, int, 
	    (struct spdk_nvme_qpair *qpair,

	     struct nvme_completion_poll_status *status), 0);



struct spdk_trace_flag SPDK_LOG_NVME = {

struct spdk_log_flag SPDK_LOG_NVME = {

	.name = "nvme",

	.enabled = false,

};