d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/log: do not use spdk_log_get_flag() in macro for log flags

Browse Source 
Especially SPDK_INFOLOG() should not call spdk_log_get_flag() function,
instead rely on the log flag structure.

This caused performance degradation in places that used SPDK_INFOLOG
too extensively.

Due to nature of the macros, in the meantime new debug log in
iscsi was improperly named. This wasn't caught because of the
macros reliance on spdk_log_get_flag(), where if name wasn't
registered - no log was printed and no compilation occurred.
Going back to using the structures, gives immediate feedback
that there is no SPDK_LOG_ISCSI log flag.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I262eadb5aee29caa2a5cd719c82ca4963ea24576
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4712
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Tomasz Zawadzki 2020-10-15 09:59:04 -04:00
parent 186c834f04
commit 1a884e94e4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/spdk/log.h
View File

@ -134,7 +134,8 @@ enum spdk_log_level spdk_log_get_print_level(void);
spdk_log(SPDK_LOG_NOTICE, NULL, -1, NULL, __VA_ARGS__)
#define SPDK_INFOLOG(FLAG, ...) \
do { \
if (spdk_log_get_flag(#FLAG)) { \
extern struct spdk_log_flag SPDK_LOG_##FLAG; \
if (SPDK_LOG_##FLAG.enabled) { \
spdk_log(SPDK_LOG_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__); \
} \
} while (0)
@ -142,14 +143,16 @@ enum spdk_log_level spdk_log_get_print_level(void);
#ifdef DEBUG
#define SPDK_DEBUGLOG(FLAG, ...) \
do { \
if (SPDK_DEBUGLOG_FLAG_ENABLED(#FLAG)) { \
extern struct spdk_log_flag SPDK_LOG_##FLAG; \
if (SPDK_LOG_##FLAG.enabled) { \
spdk_log(SPDK_LOG_DEBUG, __FILE__, __LINE__, __func__, __VA_ARGS__); \
} \
} while (0)
#define SPDK_LOGDUMP(FLAG, LABEL, BUF, LEN) \
do { \
if (SPDK_DEBUGLOG_FLAG_ENABLED(#FLAG)) { \
extern struct spdk_log_flag SPDK_LOG_##FLAG; \
if (SPDK_LOG_##FLAG.enabled) { \
spdk_log_dump(stderr, (LABEL), (BUF), (LEN)); \
} \
} while (0)

2
lib/iscsi/iscsi.c
View File

@ -4598,7 +4598,7 @@ iscsi_read_pdu(struct spdk_iscsi_conn *conn)
/* AHS */
ahs_len = pdu->bhs.total_ahs_len * 4;
if (ahs_len > ISCSI_AHS_LEN) {
SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "pdu ahs length %d is invalid\n", ahs_len);
SPDK_DEBUGLOG(iscsi, "pdu ahs length %d is invalid\n", ahs_len);
conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR;
break;
}