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

nvme: add utils for nvme log macros 



This is to reduce code duplication and to keep consistent prefix easier.

Add parentheses around the macro argument to prevent issues when
the argument is an expression (e.g., &xyz->ctrlr).

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


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent 33af6579

lib/nvme/nvme_internal.h

+11 −13
Original line number Diff line number Diff line
@@ -604,24 +604,22 @@ struct spdk_nvme_ns { 
};



#define CTRLR_STRING(ctrlr) \

	(spdk_nvme_trtype_is_fabrics(ctrlr->trid.trtype) ? \

	ctrlr->trid.subnqn : ctrlr->trid.traddr)

	(spdk_nvme_trtype_is_fabrics((ctrlr)->trid.trtype) ? \

	(ctrlr)->trid.subnqn : (ctrlr)->trid.traddr)



#define NVME_CTRLR_ERRLOG(ctrlr, format, ...) \

	SPDK_ERRLOG("[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);

#define NVME_CTRLR_LOG(type, ctrlr, format, ...) \

	SPDK_##type##LOG("[%s, %u] " format, CTRLR_STRING(ctrlr), (ctrlr)->cntlid, ##__VA_ARGS__)



#define NVME_CTRLR_WARNLOG(ctrlr, format, ...) \

	SPDK_WARNLOG("[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);

#define NVME_CTRLR_LOG2(type, component, ctrlr, format, ...) \

	SPDK_##type##LOG(component, "[%s, %u] " format, CTRLR_STRING(ctrlr), (ctrlr)->cntlid, ##__VA_ARGS__)



#define NVME_CTRLR_NOTICELOG(ctrlr, format, ...) \

	SPDK_NOTICELOG("[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);



#define NVME_CTRLR_INFOLOG(ctrlr, format, ...) \

	SPDK_INFOLOG(nvme, "[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);

#define NVME_CTRLR_ERRLOG(ctrlr, format, ...) NVME_CTRLR_LOG(ERR, ctrlr, format, ##__VA_ARGS__)

#define NVME_CTRLR_WARNLOG(ctrlr, format, ...) NVME_CTRLR_LOG(WARN, ctrlr, format, ##__VA_ARGS__)

#define NVME_CTRLR_NOTICELOG(ctrlr, format, ...) NVME_CTRLR_LOG(NOTICE, ctrlr, format, ##__VA_ARGS__)

#define NVME_CTRLR_INFOLOG(ctrlr, format, ...) NVME_CTRLR_LOG2(INFO, nvme, ctrlr, format, ##__VA_ARGS__)



#ifdef DEBUG

#define NVME_CTRLR_DEBUGLOG(ctrlr, format, ...) \

	SPDK_DEBUGLOG(nvme, "[%s, %u] " format, CTRLR_STRING(ctrlr), ctrlr->cntlid, ##__VA_ARGS__);

#define NVME_CTRLR_DEBUGLOG(ctrlr, format, ...) NVME_CTRLR_LOG2(DEBUG, nvme, ctrlr, format, ##__VA_ARGS__)

#else

#define NVME_CTRLR_DEBUGLOG(ctrlr, ...) do { } while (0)

#endif