From 55874cd92cbc0d8cb451eb31cbceda758f0013f3 Mon Sep 17 00:00:00 2001 From: Krzysztof Karas Date: Fri, 22 Oct 2021 04:59:06 +0000 Subject: [PATCH] trace: shorten tpoint names Some of our tpoints have a name exceeding 24 characters. Althought this is not problem for SPDK, it might cause confusion, because error messages are printed. Tpoints regstered inside fc.c had their _REQ_ part removed, since it was used in all of them. Fixes #2208 Change-Id: I598eb9c1d252d8ca6c83f82e564a6b53037936f4 Signed-off-by: Krzysztof Karas Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9963 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk --- include/spdk_internal/trace_defs.h | 2 +- lib/nvmf/fc.c | 32 +++++++++++++++--------------- lib/nvmf/tcp.c | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/spdk_internal/trace_defs.h b/include/spdk_internal/trace_defs.h index db73998d5..69cc3dcf5 100644 --- a/include/spdk_internal/trace_defs.h +++ b/include/spdk_internal/trace_defs.h @@ -87,7 +87,7 @@ #define TRACE_TCP_QP_DISCONNECT SPDK_TPOINT_ID(TRACE_GROUP_NVMF_TCP, 0x10) #define TRACE_TCP_QP_DESTROY SPDK_TPOINT_ID(TRACE_GROUP_NVMF_TCP, 0x11) #define TRACE_TCP_QP_ABORT_REQ SPDK_TPOINT_ID(TRACE_GROUP_NVMF_TCP, 0x12) -#define TRACE_TCP_QP_RECV_STATE_CHANGE SPDK_TPOINT_ID(TRACE_GROUP_NVMF_TCP, 0x13) +#define TRACE_TCP_QP_RCV_STATE_CHANGE SPDK_TPOINT_ID(TRACE_GROUP_NVMF_TCP, 0x13) /* NVMe-of RDMA tracepoint definitions */ #define TRACE_RDMA_REQUEST_STATE_NEW SPDK_TPOINT_ID(TRACE_GROUP_NVMF_RDMA, 0x0) diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c index c5b29bf6c..6a3e21ab0 100644 --- a/lib/nvmf/fc.c +++ b/lib/nvmf/fc.c @@ -96,67 +96,67 @@ static char *fc_req_state_strs[] = { SPDK_TRACE_REGISTER_FN(nvmf_fc_trace, "nvmf_fc", TRACE_GROUP_NVMF_FC) { spdk_trace_register_object(OBJECT_NVMF_FC_IO, 'r'); - spdk_trace_register_description("FC_REQ_NEW", + spdk_trace_register_description("FC_NEW", TRACE_FC_REQ_INIT, OWNER_NONE, OBJECT_NVMF_FC_IO, 1, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_READ_SUBMIT_TO_BDEV", + spdk_trace_register_description("FC_READ_SBMT_TO_BDEV", TRACE_FC_REQ_READ_BDEV, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_READ_XFER_DATA", + spdk_trace_register_description("FC_READ_XFER_DATA", TRACE_FC_REQ_READ_XFER, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_READ_RSP", + spdk_trace_register_description("FC_READ_RSP", TRACE_FC_REQ_READ_RSP, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_WRITE_NEED_BUFFER", + spdk_trace_register_description("FC_WRITE_NEED_BUFFER", TRACE_FC_REQ_WRITE_BUFFS, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_WRITE_XFER_DATA", + spdk_trace_register_description("FC_WRITE_XFER_DATA", TRACE_FC_REQ_WRITE_XFER, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_WRITE_SUBMIT_TO_BDEV", + spdk_trace_register_description("FC_WRITE_SBMT_TO_BDEV", TRACE_FC_REQ_WRITE_BDEV, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_WRITE_RSP", + spdk_trace_register_description("FC_WRITE_RSP", TRACE_FC_REQ_WRITE_RSP, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_NONE_SUBMIT_TO_BDEV", + spdk_trace_register_description("FC_NONE_SBMT_TO_BDEV", TRACE_FC_REQ_NONE_BDEV, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_NONE_RSP", + spdk_trace_register_description("FC_NONE_RSP", TRACE_FC_REQ_NONE_RSP, OWNER_NONE, OBJECT_NVMF_FC_IO, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_SUCCESS", + spdk_trace_register_description("FC_SUCCESS", TRACE_FC_REQ_SUCCESS, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_FAILED", + spdk_trace_register_description("FC_FAILED", TRACE_FC_REQ_FAILED, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_ABORTED", + spdk_trace_register_description("FC_ABRT", TRACE_FC_REQ_ABORTED, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_ABORTED_SUBMIT_TO_BDEV", + spdk_trace_register_description("FC_ABRT_SBMT_TO_BDEV", TRACE_FC_REQ_BDEV_ABORTED, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_PENDING", + spdk_trace_register_description("FC_PENDING", TRACE_FC_REQ_PENDING, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("FC_REQ_FUSED_WAITING", + spdk_trace_register_description("FC_FUSED_WAITING", TRACE_FC_REQ_FUSED_WAITING, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, ""); diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 5184aa38c..2580b4f16 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -182,7 +182,7 @@ SPDK_TRACE_REGISTER_FN(nvmf_tcp_trace, "nvmf_tcp", TRACE_GROUP_NVMF_TCP) spdk_trace_register_description("TCP_QP_ABORT_REQ", TRACE_TCP_QP_ABORT_REQ, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, ""); - spdk_trace_register_description("TCP_QP_RECV_STATE_CHANGE", TRACE_TCP_QP_RECV_STATE_CHANGE, + spdk_trace_register_description("TCP_QP_RCV_STATE_CHANGE", TRACE_TCP_QP_RCV_STATE_CHANGE, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_INT, "state"); @@ -1271,7 +1271,7 @@ nvmf_tcp_qpair_set_recv_state(struct spdk_nvmf_tcp_qpair *tqpair, SPDK_DEBUGLOG(nvmf_tcp, "tqpair(%p) recv state=%d\n", tqpair, state); tqpair->recv_state = state; - spdk_trace_record(TRACE_TCP_QP_RECV_STATE_CHANGE, 0, 0, (uintptr_t)tqpair, tqpair->recv_state); + spdk_trace_record(TRACE_TCP_QP_RCV_STATE_CHANGE, 0, 0, (uintptr_t)tqpair, tqpair->recv_state); switch (state) { case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_CH: