Commit b6206d65 authored by Jim Harris's avatar Jim Harris Committed by Darek Stojaczyk
Browse files

trace: shorten max name from 44 to 24 characters 



This restriction helps reduce the amount of padding when
printing out the event trace, allowing it to fit in a
small number of columns.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ifa31e5a6967c7b9bc7028069effb71533f80596f

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452736


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 11ca2e0d

include/spdk/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct spdk_trace_object { 
#define SPDK_TRACE_ARG_TYPE_STR 2



struct spdk_trace_tpoint {

	char		name[44];

	char		name[24];

	uint16_t	tpoint_id;

	uint8_t		owner_type;

	uint8_t		object_type;

lib/iscsi/conn.c

+3 −3
Original line number Diff line number Diff line
@@ -1578,11 +1578,11 @@ SPDK_TRACE_REGISTER_FN(iscsi_conn_trace, "iscsi_conn", TRACE_GROUP_ISCSI) 
{

	spdk_trace_register_owner(OWNER_ISCSI_CONN, 'c');

	spdk_trace_register_object(OBJECT_ISCSI_PDU, 'p');

	spdk_trace_register_description("ISCSI_READ_FROM_SOCKET_DONE", TRACE_ISCSI_READ_FROM_SOCKET_DONE,

	spdk_trace_register_description("ISCSI_READ_DONE", TRACE_ISCSI_READ_FROM_SOCKET_DONE,

					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, "");

	spdk_trace_register_description("ISCSI_FLUSH_WRITEBUF_START", TRACE_ISCSI_FLUSH_WRITEBUF_START,

	spdk_trace_register_description("ISCSI_WRITE_START", TRACE_ISCSI_FLUSH_WRITEBUF_START,

					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, "iovec: ");

	spdk_trace_register_description("ISCSI_FLUSH_WRITEBUF_DONE", TRACE_ISCSI_FLUSH_WRITEBUF_DONE,

	spdk_trace_register_description("ISCSI_WRITE_DONE", TRACE_ISCSI_FLUSH_WRITEBUF_DONE,

					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, "");

	spdk_trace_register_description("ISCSI_READ_PDU", TRACE_ISCSI_READ_PDU,

					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 1, 0, "opc:   ");

lib/nvmf/rdma.c

+6 −6
Original line number Diff line number Diff line
@@ -166,13 +166,13 @@ SPDK_TRACE_REGISTER_FN(nvmf_trace, "nvmf_rdma", TRACE_GROUP_NVMF_RDMA) 
					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 1, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_NEED_BUFFER", TRACE_RDMA_REQUEST_STATE_NEED_BUFFER,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_TX_PENDING_C_TO_H",

	spdk_trace_register_description("RDMA_REQ_TX_PENDING_C2H",

					TRACE_RDMA_REQUEST_STATE_DATA_TRANSFER_TO_HOST_PENDING,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_TX_PENDING_H_TO_C",

	spdk_trace_register_description("RDMA_REQ_TX_PENDING_H2C",

					TRACE_RDMA_REQUEST_STATE_DATA_TRANSFER_TO_CONTROLLER_PENDING,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_TX_H_TO_C",

	spdk_trace_register_description("RDMA_REQ_TX_H2C",

					TRACE_RDMA_REQUEST_STATE_TRANSFERRING_HOST_TO_CONTROLLER,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_RDY_TO_EXECUTE",
@@ -184,13 +184,13 @@ SPDK_TRACE_REGISTER_FN(nvmf_trace, "nvmf_rdma", TRACE_GROUP_NVMF_RDMA) 
	spdk_trace_register_description("RDMA_REQ_EXECUTED",

					TRACE_RDMA_REQUEST_STATE_EXECUTED,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_RDY_TO_COMPLETE",

	spdk_trace_register_description("RDMA_REQ_RDY_TO_COMPL",

					TRACE_RDMA_REQUEST_STATE_READY_TO_COMPLETE,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_COMPLETING_CONTROLLER_TO_HOST",

	spdk_trace_register_description("RDMA_REQ_COMPLETING_C2H",

					TRACE_RDMA_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_COMPLETING_INCAPSULE",

	spdk_trace_register_description("RDMA_REQ_COMPLETING",

					TRACE_RDMA_REQUEST_STATE_COMPLETING,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_COMPLETED",

lib/nvmf/tcp.c

+4 −4
Original line number Diff line number Diff line
@@ -151,19 +151,19 @@ SPDK_TRACE_REGISTER_FN(nvmf_tcp_trace, "nvmf_tcp", TRACE_GROUP_NVMF_TCP) 
	spdk_trace_register_description("TCP_REQ_RDY_TO_COMPLETE",

					TRACE_TCP_REQUEST_STATE_READY_TO_COMPLETE,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

	spdk_trace_register_description("TCP_REQ_COMPLETING_INCAPSULE",

	spdk_trace_register_description("TCP_REQ_TRANSFER_C2H",

					TRACE_TCP_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

	spdk_trace_register_description("TCP_REQ_COMPLETED",

					TRACE_TCP_REQUEST_STATE_COMPLETED,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

	spdk_trace_register_description("TCP_FLUSH_WRITEBUF_START",

	spdk_trace_register_description("TCP_WRITE_START",

					TRACE_TCP_FLUSH_WRITEBUF_START,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

	spdk_trace_register_description("TCP_FLUSH_WRITEBUF_DONE",

	spdk_trace_register_description("TCP_WRITE_DONE",

					TRACE_TCP_FLUSH_WRITEBUF_DONE,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

	spdk_trace_register_description("TCP_READ_FROM_SOCKET_DONE",

	spdk_trace_register_description("TCP_READ_DONE",

					TRACE_TCP_READ_FROM_SOCKET_DONE,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

}