Commit 82c3c30f authored by Jim Harris's avatar Jim Harris
Browse files

trace: remove alias concept 



This was added a long time back for tracking an rte_mbuf
whose buffer was a different rte_mbuf - all related to
a userspace TCP stack that is no longer in development.
The concept isn't useful now, so remove it to reduce
the complexity of the tracing code.

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

Reviewed-on: https://review.gerrithub.io/424565


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 094e980d

app/trace/trace.cpp

+0 −6
Original line number Diff line number Diff line
@@ -164,12 +164,6 @@ print_event(struct spdk_trace_entry *e, uint64_t tsc_rate, 
		stats->size[e->object_id] = e->size;

	}



	if (d->arg1_is_alias) {

		stats->index[e->arg1] = stats->index[e->object_id];

		stats->start[e->arg1] = stats->start[e->object_id];

		stats->size[e->arg1] = stats->size[e->object_id];

	}



	us = get_us_from_tsc(e->tsc - tsc_offset, tsc_rate);



	printf("%2d: %10.3f (%9ju) ", lcore, us, e->tsc - tsc_offset);

include/spdk/trace.h

+2 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct spdk_trace_tpoint { 
	uint8_t		object_type;

	uint8_t		new_object;

	uint8_t		arg1_is_ptr;

	uint8_t		arg1_is_alias;

	uint8_t		reserved;

	char		arg1_name[8];

};
@@ -281,14 +281,12 @@ void spdk_trace_register_object(uint8_t type, char id_prefix); 
 * \param object_type Object type for the tpoint.

 * \param new_object New object for the tpoint.

 * \param arg1_is_ptr This argument indicates whether argument1 is a pointer.

 * \param arg1_is_alias This argument indicates whether argument1 is an alias.

 * \param arg1_name Name of argument.

 */

void spdk_trace_register_description(const char *name, const char *short_name,

				     uint16_t tpoint_id, uint8_t owner_type,

				     uint8_t object_type, uint8_t new_object,

				     uint8_t arg1_is_ptr, uint8_t arg1_is_alias,

				     const char *arg1_name);

				     uint8_t arg1_is_ptr, const char *arg1_name);



struct spdk_trace_register_fn {

	void (*reg_fn)(void);

lib/bdev/bdev.c

+2 −2
Original line number Diff line number Diff line
@@ -3668,7 +3668,7 @@ SPDK_TRACE_REGISTER_FN(bdev_trace) 
	spdk_trace_register_owner(OWNER_BDEV, 'b');

	spdk_trace_register_object(OBJECT_BDEV_IO, 'i');

	spdk_trace_register_description("BDEV_IO_START", "", TRACE_BDEV_IO_START, OWNER_BDEV,

					OBJECT_BDEV_IO, 1, 0, 0, "type:   ");

					OBJECT_BDEV_IO, 1, 0, "type:   ");

	spdk_trace_register_description("BDEV_IO_DONE", "", TRACE_BDEV_IO_DONE, OWNER_BDEV,

					OBJECT_BDEV_IO, 0, 0, 0, "");

					OBJECT_BDEV_IO, 0, 0, "");

}

lib/iscsi/conn.c

+8 −8
Original line number Diff line number Diff line
@@ -1363,19 +1363,19 @@ SPDK_TRACE_REGISTER_FN(iscsi_conn_trace) 
	spdk_trace_register_owner(OWNER_ISCSI_CONN, 'c');

	spdk_trace_register_object(OBJECT_ISCSI_PDU, 'p');

	spdk_trace_register_description("READ_FROM_SOCKET_DONE", "", TRACE_READ_FROM_SOCKET_DONE,

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

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

	spdk_trace_register_description("FLUSH_WRITEBUF_START", "", TRACE_FLUSH_WRITEBUF_START,

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

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

	spdk_trace_register_description("FLUSH_WRITEBUF_DONE", "", TRACE_FLUSH_WRITEBUF_DONE,

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

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

	spdk_trace_register_description("READ_PDU", "", TRACE_READ_PDU,

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

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

	spdk_trace_register_description("ISCSI_TASK_DONE", "", TRACE_ISCSI_TASK_DONE,

					OWNER_ISCSI_CONN, OBJECT_SCSI_TASK, 0, 0, 0, "");

					OWNER_ISCSI_CONN, OBJECT_SCSI_TASK, 0, 0, "");

	spdk_trace_register_description("ISCSI_TASK_QUEUE", "", TRACE_ISCSI_TASK_QUEUE,

					OWNER_ISCSI_CONN, OBJECT_SCSI_TASK, 1, 1, 0, "pdu:   ");

					OWNER_ISCSI_CONN, OBJECT_SCSI_TASK, 1, 1, "pdu:   ");

	spdk_trace_register_description("ISCSI_CONN_ACTIVE", "", TRACE_ISCSI_CONN_ACTIVE,

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

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

	spdk_trace_register_description("ISCSI_CONN_IDLE", "", TRACE_ISCSI_CONN_IDLE,

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

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

}

lib/nvmf/rdma.c

+11 −11
Original line number Diff line number Diff line
@@ -132,37 +132,37 @@ SPDK_TRACE_REGISTER_FN(nvmf_trace) 
	spdk_trace_register_object(OBJECT_NVMF_RDMA_IO, 'r');

	spdk_trace_register_description("RDMA_REQ_NEW", "",

					TRACE_RDMA_REQUEST_STATE_NEW,

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

					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, 0, "cmid:   ");

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

	spdk_trace_register_description("RDMA_REQ_TX_PENDING_H_TO_C", "",

					TRACE_RDMA_REQUEST_STATE_DATA_TRANSFER_PENDING,

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

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

	spdk_trace_register_description("RDMA_REQ_TX_H_TO_C", "",

					TRACE_RDMA_REQUEST_STATE_TRANSFERRING_HOST_TO_CONTROLLER,

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

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

	spdk_trace_register_description("RDMA_REQ_RDY_TO_EXECUTE", "",

					TRACE_RDMA_REQUEST_STATE_READY_TO_EXECUTE,

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

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

	spdk_trace_register_description("RDMA_REQ_EXECUTING", "",

					TRACE_RDMA_REQUEST_STATE_EXECUTING,

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

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

	spdk_trace_register_description("RDMA_REQ_EXECUTED", "",

					TRACE_RDMA_REQUEST_STATE_EXECUTED,

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

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

	spdk_trace_register_description("RDMA_REQ_RDY_TO_COMPLETE", "",

					TRACE_RDMA_REQUEST_STATE_READY_TO_COMPLETE,

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

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

	spdk_trace_register_description("RDMA_REQ_COMPLETING_CONTROLLER_TO_HOST", "",

					TRACE_RDMA_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST,

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

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

	spdk_trace_register_description("RDMA_REQ_COMPLETING_INCAPSULE", "",

					TRACE_RDMA_REQUEST_STATE_COMPLETING,

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

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

	spdk_trace_register_description("RDMA_REQ_COMPLETED", "",

					TRACE_RDMA_REQUEST_STATE_COMPLETED,

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

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

}



/* This structure holds commands as they are received off the wire.