Commit b0396da0 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme/pcie: rename trace object to NVME_PCIE_REQ 



We were using "TR" for "tracker" previously, but
we are tracing the nvme_requests, not nvme_trackers,
so use the right names for the trace object to avoid
confusion.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ia3886d74b162138c2cdbe0017224d9494f74966c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13990


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 97661e86

include/spdk_internal/trace_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
/* Object definitions */

#define OBJECT_ISCSI_PDU	0x1

#define OBJECT_BDEV_IO		0x2

#define OBJECT_NVME_PCIE_TR	0x3

#define OBJECT_NVME_PCIE_REQ	0x3

#define OBJECT_SCSI_TASK	0x10

#define OBJECT_NVMF_RDMA_IO	0x40

#define OBJECT_NVMF_TCP_IO	0x80

lib/nvme/nvme_pcie_common.c

+3 −3
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ SPDK_TRACE_REGISTER_FN(nvme_pcie, "nvme_pcie", TRACE_GROUP_NVME_PCIE) 
	struct spdk_trace_tpoint_opts opts[] = {

		{

			"NVME_PCIE_SUBMIT", TRACE_NVME_PCIE_SUBMIT,

			OWNER_NVME_PCIE_QP, OBJECT_NVME_PCIE_TR, 1,

			OWNER_NVME_PCIE_QP, OBJECT_NVME_PCIE_REQ, 1,

			{	{ "cid", SPDK_TRACE_ARG_TYPE_INT, 4 },

				{ "opc", SPDK_TRACE_ARG_TYPE_INT, 4 },

				{ "dw10", SPDK_TRACE_ARG_TYPE_PTR, 4 },
@@ -1827,14 +1827,14 @@ SPDK_TRACE_REGISTER_FN(nvme_pcie, "nvme_pcie", TRACE_GROUP_NVME_PCIE) 
		},

		{

			"NVME_PCIE_COMPLETE", TRACE_NVME_PCIE_COMPLETE,

			OWNER_NVME_PCIE_QP, OBJECT_NVME_PCIE_TR, 0,

			OWNER_NVME_PCIE_QP, OBJECT_NVME_PCIE_REQ, 0,

			{	{ "cid", SPDK_TRACE_ARG_TYPE_INT, 4 },

				{ "cpl", SPDK_TRACE_ARG_TYPE_PTR, 4 }

			}

		},

	};



	spdk_trace_register_object(OBJECT_NVME_PCIE_TR, 'p');

	spdk_trace_register_object(OBJECT_NVME_PCIE_REQ, 'p');

	spdk_trace_register_owner(OWNER_NVME_PCIE_QP, 'q');

	spdk_trace_register_description_ext(opts, SPDK_COUNTOF(opts));

}