Commit 43b518aa authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvme: improve logs by printing argument names 



It is done selectively, as it does not need to be applied to every
argument. It improves readability when multiple pointers and identifiers
appear in the same line.

Change-Id: Ic63bb21e42a6a92115594eea18459f5cf2f31202
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26725


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
parent d85e033a

lib/nvme/nvme_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ struct spdk_nvme_ns { 
	RB_ENTRY(spdk_nvme_ns)		node;

};



#define NVME_CTRLR_LOG_FMT "%s%s%s%s%s,%u"

#define NVME_CTRLR_LOG_FMT "%s%s%s%s%s,cntlid:%u"

#define NVME_CTRLR_LOG_ARGS(ctrlr) \

  spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? (ctrlr)->opts.hostnqn : "", \

  spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? "," : "", \
@@ -620,7 +620,7 @@ struct spdk_nvme_ns { 
  (ctrlr)->trid.traddr, \

  (ctrlr)->cntlid



#define NVME_QPAIR_LOG_FMT "%u,%p"

#define NVME_QPAIR_LOG_FMT "qid:%u,qpair:%p"

#define NVME_QPAIR_LOG_ARGS(qpair) \

  (qpair)->id, \

  (qpair)

module/bdev/nvme/bdev_nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "spdk_internal/usdt.h"

#include "spdk_internal/trace_defs.h"



#define NVME_CTRLR_LOG_FMT "%s%s%s:%s,%u"

#define NVME_CTRLR_LOG_FMT "%s%s%s:%s,cntlid:%u"

#define NVME_CTRLR_LOG_ARGS(nvme_ctrlr) \

  spdk_nvme_trtype_is_fabrics((nvme_ctrlr)->active_path_id->trid.trtype) ? (nvme_ctrlr)->active_path_id->trid.subnqn : "", \

  spdk_nvme_trtype_is_fabrics((nvme_ctrlr)->active_path_id->trid.trtype) ? "," : "", \