ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: rename spdk_trace_flag to spdk_log_flag

Browse Source 
"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: Jim Harris <james.r.harris@intel.com>
Change-Id: Ib732c57d01602e56f37e9deed7135840a7c005be

Reviewed-on: https://review.gerrithub.io/435342
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2018-11-17 06:31:45 -07:00
parent 0891f506fc
commit 3dc8dfb40d
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/spdk_internal/log.h
View File

@ -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_print_level;
extern enum spdk_log_level g_spdk_log_backtrace_level; extern enum spdk_log_level g_spdk_log_backtrace_level;
struct spdk_trace_flag { struct spdk_log_flag {
TAILQ_ENTRY(spdk_trace_flag) tailq; TAILQ_ENTRY(spdk_log_flag) tailq;
const char *name; const char *name;
bool enabled; 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_log_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_next_trace_flag(struct spdk_log_flag *flag);
#define SPDK_LOG_REGISTER_COMPONENT(str, flag) \ #define SPDK_LOG_REGISTER_COMPONENT(str, flag) \
struct spdk_trace_flag flag = { \ struct spdk_log_flag flag = { \
.enabled = false, \ .enabled = false, \
.name = str, \ .name = str, \
}; \ }; \
@ -69,7 +69,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \
#define SPDK_INFOLOG(FLAG, ...) \ #define SPDK_INFOLOG(FLAG, ...) \
do { \ do { \
extern struct spdk_trace_flag FLAG; \ extern struct spdk_log_flag FLAG; \
if (FLAG.enabled) { \ if (FLAG.enabled) { \
spdk_log(SPDK_LOG_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__); \ 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, ...) \ #define SPDK_DEBUGLOG(FLAG, ...) \
do { \ do { \
extern struct spdk_trace_flag FLAG; \ extern struct spdk_log_flag FLAG; \
if (FLAG.enabled) { \ if (FLAG.enabled) { \
spdk_log(SPDK_LOG_DEBUG, __FILE__, __LINE__, __func__, __VA_ARGS__); \ 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) \ #define SPDK_TRACEDUMP(FLAG, LABEL, BUF, LEN) \
do { \ do { \
extern struct spdk_trace_flag FLAG; \ extern struct spdk_log_flag FLAG; \
if ((FLAG.enabled) && (LEN)) { \ if ((FLAG.enabled) && (LEN)) { \
spdk_trace_dump(stderr, (LABEL), (BUF), (LEN)); \ spdk_trace_dump(stderr, (LABEL), (BUF), (LEN)); \
} \ } \

26
lib/log/log_flags.c
View File

@ -35,7 +35,7 @@
#include "spdk_internal/log.h" #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_level = SPDK_LOG_NOTICE;
enum spdk_log_level g_spdk_log_print_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; return g_spdk_log_backtrace_level;
} }
static struct spdk_trace_flag * static struct spdk_log_flag *
get_trace_flag(const char *name) get_trace_flag(const char *name)
{ {
struct spdk_trace_flag *flag; struct spdk_log_flag *flag;
TAILQ_FOREACH(flag, &g_trace_flags, tailq) { TAILQ_FOREACH(flag, &g_trace_flags, tailq) {
if (strcasecmp(name, flag->name) == 0) { if (strcasecmp(name, flag->name) == 0) {
@ -99,18 +99,18 @@ get_trace_flag(const char *name)
} }
void 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) { if (name == NULL || flag == NULL) {
SPDK_ERRLOG("missing spdk_trace_flag parameters\n"); SPDK_ERRLOG("missing spdk_log_flag parameters\n");
assert(false); assert(false);
return; return;
} }
if (get_trace_flag(name)) { 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); assert(false);
return; return;
} }
@ -128,7 +128,7 @@ spdk_log_register_trace_flag(const char *name, struct spdk_trace_flag *flag)
bool bool
spdk_log_get_trace_flag(const char *name) 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) { if (flag && flag->enabled) {
return true; return true;
@ -140,7 +140,7 @@ spdk_log_get_trace_flag(const char *name)
static int static int
set_trace_flag(const char *name, bool value) set_trace_flag(const char *name, bool value)
{ {
struct spdk_trace_flag *flag; struct spdk_log_flag *flag;
if (strcasecmp(name, "all") == 0) { if (strcasecmp(name, "all") == 0) {
TAILQ_FOREACH(flag, &g_trace_flags, tailq) { 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); return set_trace_flag(name, false);
} }
struct spdk_trace_flag * struct spdk_log_flag *
spdk_log_get_first_trace_flag(void) spdk_log_get_first_trace_flag(void)
{ {
return TAILQ_FIRST(&g_trace_flags); return TAILQ_FIRST(&g_trace_flags);
} }
struct spdk_trace_flag * struct spdk_log_flag *
spdk_log_get_next_trace_flag(struct spdk_trace_flag *flag) spdk_log_get_next_trace_flag(struct spdk_log_flag *flag)
{ {
return TAILQ_NEXT(flag, tailq); return TAILQ_NEXT(flag, tailq);
} }
@ -187,7 +187,7 @@ void
spdk_tracelog_usage(FILE *f, const char *trace_arg) spdk_tracelog_usage(FILE *f, const char *trace_arg)
{ {
#ifdef DEBUG #ifdef DEBUG
struct spdk_trace_flag *flag; struct spdk_log_flag *flag;
fprintf(f, " %s, --traceflag <flag> enable debug log flag (all", trace_arg); fprintf(f, " %s, --traceflag <flag> enable debug log flag (all", trace_arg);
TAILQ_FOREACH(flag, &g_trace_flags, tailq) { TAILQ_FOREACH(flag, &g_trace_flags, tailq) {

2
lib/log/rpc/log_rpc.c
View File

@ -321,7 +321,7 @@ spdk_rpc_get_trace_flags(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
struct spdk_trace_flag *flag; struct spdk_log_flag *flag;
if (params != NULL) { if (params != NULL) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

2
test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
View File

@ -39,7 +39,7 @@
#include "common/lib/test_env.c" #include "common/lib/test_env.c"
struct spdk_trace_flag SPDK_LOG_NVME = { struct spdk_log_flag SPDK_LOG_NVME = {
.name = "nvme", .name = "nvme",
.enabled = false, .enabled = false,
}; };

2
test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
View File

@ -58,7 +58,7 @@ DEFINE_STUB(spdk_nvme_wait_for_completion, int,
(struct spdk_nvme_qpair *qpair, (struct spdk_nvme_qpair *qpair,
struct nvme_completion_poll_status *status), 0); struct nvme_completion_poll_status *status), 0);
struct spdk_trace_flag SPDK_LOG_NVME = { struct spdk_log_flag SPDK_LOG_NVME = {
.name = "nvme", .name = "nvme",
.enabled = false, .enabled = false,
}; };