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

trace: remove short_name 



This was not used by any of the trace register descriptions.
Let's remove it rather keeping it around if we don't need it.

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

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
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>
parent af252044

app/trace/trace.cpp

+0 −6
Original line number Diff line number Diff line
@@ -194,16 +194,10 @@ print_event(struct spdk_trace_entry *e, uint64_t tsc_rate, 
		print_object_id(d->object_type, stats->index[e->object_id]);

	} else if (d->object_type != OBJECT_NONE) {

		if (stats->start.find(e->object_id) != stats->start.end()) {

			struct spdk_trace_tpoint *start_description;



			us = get_us_from_tsc(e->tsc - stats->start[e->object_id],

					     tsc_rate);

			print_object_id(d->object_type, stats->index[e->object_id]);

			print_float("time:", us);

			start_description = &g_histories->flags.tpoint[stats->tpoint_id[e->object_id]];

			if (start_description->short_name[0] != 0) {

				printf(" (%.4s)", start_description->short_name);

			}

		} else {

			printf("id:    N/A");

		}

include/spdk/trace.h

+1 −4
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ struct spdk_trace_object { 


struct spdk_trace_tpoint {

	char		name[44];

	char		short_name[4];

	uint16_t	tpoint_id;

	uint8_t		owner_type;

	uint8_t		object_type;
@@ -330,7 +329,6 @@ void spdk_trace_register_object(uint8_t type, char id_prefix); 
 * Register the description for the tpoint.

 *

 * \param name Name for the tpoint.

 * \param short_name Short name for the tpoint.

 * \param tpoint_id Id for the tpoint.

 * \param owner_type Owner type for the tpoint.

 * \param object_type Object type for the tpoint.
@@ -338,8 +336,7 @@ void spdk_trace_register_object(uint8_t type, char id_prefix); 
 * \param arg1_type Type of arg1.

 * \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,

void spdk_trace_register_description(const char *name, uint16_t tpoint_id, uint8_t owner_type,

				     uint8_t object_type, uint8_t new_object,

				     uint8_t arg1_type, const char *arg1_name);

lib/bdev/bdev.c

+2 −2
Original line number Diff line number Diff line
@@ -4674,8 +4674,8 @@ SPDK_TRACE_REGISTER_FN(bdev_trace, "bdev", TRACE_GROUP_BDEV) 
{

	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,

	spdk_trace_register_description("BDEV_IO_START", TRACE_BDEV_IO_START, OWNER_BDEV,

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

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

	spdk_trace_register_description("BDEV_IO_DONE", TRACE_BDEV_IO_DONE, OWNER_BDEV,

					OBJECT_BDEV_IO, 0, 0, "");

}

lib/ftl/ftl_trace.c

+21 −21
Original line number Diff line number Diff line
@@ -87,72 +87,72 @@ SPDK_TRACE_REGISTER_FN(ftl_trace_func, "ftl", TRACE_GROUP_FTL) 


	for (i = 0; i < FTL_TRACE_SOURCE_MAX; ++i) {

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "band_defrag");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_BAND_DEFRAG(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_BAND_DEFRAG(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "band: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "band_write");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_BAND_WRITE(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_BAND_WRITE(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "band: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "limits");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_LIMITS(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_LIMITS(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "limits: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "rwb_pop");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_RWB_POP(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_RWB_POP(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");



		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_read_sched");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_MD_READ_SCHEDULE(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_MD_READ_SCHEDULE(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_read_submit");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_MD_READ_SUBMISSION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_MD_READ_SUBMISSION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_read_cmpl");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_MD_READ_COMPLETION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_MD_READ_COMPLETION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");



		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_write_sched");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_MD_WRITE_SCHEDULE(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_MD_WRITE_SCHEDULE(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_write_submit");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_MD_WRITE_SUBMISSION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_MD_WRITE_SUBMISSION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_write_cmpl");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_MD_WRITE_COMPLETION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_MD_WRITE_COMPLETION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");



		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_sched");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_READ_SCHEDULE(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_READ_SCHEDULE(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_submit");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_READ_SUBMISSION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_READ_SUBMISSION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_cmpl_invld");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_READ_COMPLETION_INVALID(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_READ_COMPLETION_INVALID(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_cmpl_cache");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_READ_COMPLETION_CACHE(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_READ_COMPLETION_CACHE(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_cmpl_ssd");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_READ_COMPLETION_DISK(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_READ_COMPLETION_DISK(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");



		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "write_sched");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_WRITE_SCHEDULE(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_SCHEDULE(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "rwb_fill");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_WRITE_RWB_FILL(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_RWB_FILL(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "write_submit");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_WRITE_SUBMISSION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_SUBMISSION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "write_cmpl");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_WRITE_COMPLETION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_COMPLETION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "lba: ");



		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "erase_submit");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_ERASE_SUBMISSION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_ERASE_SUBMISSION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

		snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "erase_cmpl");

		spdk_trace_register_description(descbuf, "", FTL_TRACE_ERASE_COMPLETION(i),

		spdk_trace_register_description(descbuf, FTL_TRACE_ERASE_COMPLETION(i),

						OWNER_FTL, OBJECT_NONE, 0, 0, "ppa: ");

	}

}

lib/iscsi/conn.c

+8 −9
Original line number Diff line number Diff line
@@ -1578,21 +1578,20 @@ 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_FROM_SOCKET_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_FLUSH_WRITEBUF_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_FLUSH_WRITEBUF_DONE", TRACE_ISCSI_FLUSH_WRITEBUF_DONE,

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

	spdk_trace_register_description("ISCSI_READ_PDU", "", TRACE_ISCSI_READ_PDU,

	spdk_trace_register_description("ISCSI_READ_PDU", TRACE_ISCSI_READ_PDU,

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

	spdk_trace_register_description("ISCSI_TASK_DONE", "", TRACE_ISCSI_TASK_DONE,

	spdk_trace_register_description("ISCSI_TASK_DONE", TRACE_ISCSI_TASK_DONE,

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

	spdk_trace_register_description("ISCSI_TASK_QUEUE", "", TRACE_ISCSI_TASK_QUEUE,

	spdk_trace_register_description("ISCSI_TASK_QUEUE", TRACE_ISCSI_TASK_QUEUE,

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

	spdk_trace_register_description("ISCSI_TASK_EXECUTED", "", TRACE_ISCSI_TASK_EXECUTED,

	spdk_trace_register_description("ISCSI_TASK_EXECUTED", TRACE_ISCSI_TASK_EXECUTED,

					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 0, 0, "");

	spdk_trace_register_description("ISCSI_PDU_COMPLETED", "", TRACE_ISCSI_PDU_COMPLETED,

	spdk_trace_register_description("ISCSI_PDU_COMPLETED", TRACE_ISCSI_PDU_COMPLETED,

					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 0, 0, "");

}