diff --git a/app/trace/trace.cpp b/app/trace/trace.cpp index cc1b26adf..a2c22fb5b 100644 --- a/app/trace/trace.cpp +++ b/app/trace/trace.cpp @@ -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"); } diff --git a/include/spdk/trace.h b/include/spdk/trace.h index ae83f09ae..9f14cf590 100644 --- a/include/spdk/trace.h +++ b/include/spdk/trace.h @@ -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); diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 08dec451f..1524ed37d 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -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, ""); } diff --git a/lib/ftl/ftl_trace.c b/lib/ftl/ftl_trace.c index 2afe0188a..543b64040 100644 --- a/lib/ftl/ftl_trace.c +++ b/lib/ftl/ftl_trace.c @@ -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: "); } } diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c index a94fa5860..0f87608eb 100644 --- a/lib/iscsi/conn.c +++ b/lib/iscsi/conn.c @@ -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, ""); } diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 972960d48..aa92d8a53 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -162,54 +162,52 @@ enum spdk_nvmf_rdma_request_state { SPDK_TRACE_REGISTER_FN(nvmf_trace, "nvmf_rdma", TRACE_GROUP_NVMF_RDMA) { spdk_trace_register_object(OBJECT_NVMF_RDMA_IO, 'r'); - spdk_trace_register_description("RDMA_REQ_NEW", "", - TRACE_RDMA_REQUEST_STATE_NEW, + spdk_trace_register_description("RDMA_REQ_NEW", TRACE_RDMA_REQUEST_STATE_NEW, OWNER_NONE, OBJECT_NVMF_RDMA_IO, 1, 1, "cmid: "); - spdk_trace_register_description("RDMA_REQ_NEED_BUFFER", "", - TRACE_RDMA_REQUEST_STATE_NEED_BUFFER, + 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_C_TO_H", 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_H_TO_C", 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_H_TO_C", 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", "", + spdk_trace_register_description("RDMA_REQ_RDY_TO_EXECUTE", TRACE_RDMA_REQUEST_STATE_READY_TO_EXECUTE, OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid: "); - spdk_trace_register_description("RDMA_REQ_EXECUTING", "", + spdk_trace_register_description("RDMA_REQ_EXECUTING", TRACE_RDMA_REQUEST_STATE_EXECUTING, OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid: "); - spdk_trace_register_description("RDMA_REQ_EXECUTED", "", + 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_COMPLETE", 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_CONTROLLER_TO_HOST", 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_INCAPSULE", TRACE_RDMA_REQUEST_STATE_COMPLETING, OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid: "); - spdk_trace_register_description("RDMA_REQ_COMPLETED", "", + spdk_trace_register_description("RDMA_REQ_COMPLETED", TRACE_RDMA_REQUEST_STATE_COMPLETED, OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid: "); - spdk_trace_register_description("RDMA_QP_CREATE", "", TRACE_RDMA_QP_CREATE, + spdk_trace_register_description("RDMA_QP_CREATE", TRACE_RDMA_QP_CREATE, OWNER_NONE, OBJECT_NONE, 0, 0, ""); - spdk_trace_register_description("RDMA_IBV_ASYNC_EVENT", "", TRACE_RDMA_IBV_ASYNC_EVENT, + spdk_trace_register_description("RDMA_IBV_ASYNC_EVENT", TRACE_RDMA_IBV_ASYNC_EVENT, OWNER_NONE, OBJECT_NONE, 0, 0, "type: "); - spdk_trace_register_description("RDMA_CM_ASYNC_EVENT", "", TRACE_RDMA_CM_ASYNC_EVENT, + spdk_trace_register_description("RDMA_CM_ASYNC_EVENT", TRACE_RDMA_CM_ASYNC_EVENT, OWNER_NONE, OBJECT_NONE, 0, 0, "type: "); - spdk_trace_register_description("RDMA_QP_STATE_CHANGE", "", TRACE_RDMA_QP_STATE_CHANGE, + spdk_trace_register_description("RDMA_QP_STATE_CHANGE", TRACE_RDMA_QP_STATE_CHANGE, OWNER_NONE, OBJECT_NONE, 0, 1, "state: "); - spdk_trace_register_description("RDMA_QP_DISCONNECT", "", TRACE_RDMA_QP_DISCONNECT, + spdk_trace_register_description("RDMA_QP_DISCONNECT", TRACE_RDMA_QP_DISCONNECT, OWNER_NONE, OBJECT_NONE, 0, 0, ""); - spdk_trace_register_description("RDMA_QP_DESTROY", "", TRACE_RDMA_QP_DESTROY, + spdk_trace_register_description("RDMA_QP_DESTROY", TRACE_RDMA_QP_DESTROY, OWNER_NONE, OBJECT_NONE, 0, 0, ""); } diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 8ff0c280a..a7b72c573 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -127,43 +127,43 @@ static const char *spdk_nvmf_tcp_term_req_fes_str[] = { SPDK_TRACE_REGISTER_FN(nvmf_tcp_trace, "nvmf_tcp", TRACE_GROUP_NVMF_TCP) { spdk_trace_register_object(OBJECT_NVMF_TCP_IO, 'r'); - spdk_trace_register_description("TCP_REQ_NEW", "", + spdk_trace_register_description("TCP_REQ_NEW", TRACE_TCP_REQUEST_STATE_NEW, OWNER_NONE, OBJECT_NVMF_TCP_IO, 1, 1, ""); - spdk_trace_register_description("TCP_REQ_NEED_BUFFER", "", + spdk_trace_register_description("TCP_REQ_NEED_BUFFER", TRACE_TCP_REQUEST_STATE_NEED_BUFFER, OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, ""); - spdk_trace_register_description("TCP_REQ_TX_PENDING_R2T", "", + spdk_trace_register_description("TCP_REQ_TX_PENDING_R2T", TRACE_TCP_REQUEST_STATE_DATA_PENDING_FOR_R2T, OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, ""); - spdk_trace_register_description("TCP_REQ_TX_H_TO_C", "", + spdk_trace_register_description("TCP_REQ_TX_H_TO_C", TRACE_TCP_REQUEST_STATE_TRANSFERRING_HOST_TO_CONTROLLER, OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, ""); - spdk_trace_register_description("TCP_REQ_RDY_TO_EXECUTE", "", + spdk_trace_register_description("TCP_REQ_RDY_TO_EXECUTE", TRACE_TCP_REQUEST_STATE_READY_TO_EXECUTE, OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, ""); - spdk_trace_register_description("TCP_REQ_EXECUTING", "", + spdk_trace_register_description("TCP_REQ_EXECUTING", TRACE_TCP_REQUEST_STATE_EXECUTING, OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, ""); - spdk_trace_register_description("TCP_REQ_EXECUTED", "", + spdk_trace_register_description("TCP_REQ_EXECUTED", TRACE_TCP_REQUEST_STATE_EXECUTED, OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, ""); - spdk_trace_register_description("TCP_REQ_RDY_TO_COMPLETE", "", + 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_COMPLETING_INCAPSULE", TRACE_TCP_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST, OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, ""); - spdk_trace_register_description("TCP_REQ_COMPLETED", "", + 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_FLUSH_WRITEBUF_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_FLUSH_WRITEBUF_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_FROM_SOCKET_DONE", TRACE_TCP_READ_FROM_SOCKET_DONE, OWNER_NONE, OBJECT_NONE, 0, 0, ""); } diff --git a/lib/scsi/scsi.c b/lib/scsi/scsi.c index 28cb18f02..4d1a68beb 100644 --- a/lib/scsi/scsi.c +++ b/lib/scsi/scsi.c @@ -60,9 +60,9 @@ SPDK_TRACE_REGISTER_FN(scsi_trace, "scsi", TRACE_GROUP_SCSI) { spdk_trace_register_owner(OWNER_SCSI_DEV, 'd'); spdk_trace_register_object(OBJECT_SCSI_TASK, 't'); - spdk_trace_register_description("SCSI_TASK_DONE", "", TRACE_SCSI_TASK_DONE, + spdk_trace_register_description("SCSI_TASK_DONE", TRACE_SCSI_TASK_DONE, OWNER_SCSI_DEV, OBJECT_SCSI_TASK, 0, 0, ""); - spdk_trace_register_description("SCSI_TASK_START", "", TRACE_SCSI_TASK_START, + spdk_trace_register_description("SCSI_TASK_START", TRACE_SCSI_TASK_START, OWNER_SCSI_DEV, OBJECT_SCSI_TASK, 0, 0, ""); } diff --git a/lib/trace/trace_flags.c b/lib/trace/trace_flags.c index 1c8d86248..c01632304 100644 --- a/lib/trace/trace_flags.c +++ b/lib/trace/trace_flags.c @@ -237,8 +237,7 @@ spdk_trace_register_object(uint8_t type, char id_prefix) } void -spdk_trace_register_description(const char *name, const char *short_name, - uint16_t tpoint_id, uint8_t owner_type, +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) { @@ -251,7 +250,6 @@ spdk_trace_register_description(const char *name, const char *short_name, assert(tpoint->tpoint_id == 0); snprintf(tpoint->name, sizeof(tpoint->name), "%s", name); - snprintf(tpoint->short_name, sizeof(tpoint->short_name), "%s", short_name); tpoint->tpoint_id = tpoint_id; tpoint->object_type = object_type; tpoint->owner_type = owner_type; diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index 99f10a16a..3a903173f 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -52,7 +52,7 @@ struct spdk_trace_histories *g_trace_histories; DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn)); DEFINE_STUB_V(spdk_trace_register_owner, (uint8_t type, char id_prefix)); DEFINE_STUB_V(spdk_trace_register_object, (uint8_t type, char id_prefix)); -DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *short_name, +DEFINE_STUB_V(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)); diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c index d4c1db5ed..97770e98e 100644 --- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c @@ -54,7 +54,7 @@ struct spdk_trace_histories *g_trace_histories; DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn)); DEFINE_STUB_V(spdk_trace_register_owner, (uint8_t type, char id_prefix)); DEFINE_STUB_V(spdk_trace_register_object, (uint8_t type, char id_prefix)); -DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *short_name, +DEFINE_STUB_V(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)); diff --git a/test/unit/lib/bdev/part.c/part_ut.c b/test/unit/lib/bdev/part.c/part_ut.c index ca42f799f..87bfa5e3f 100644 --- a/test/unit/lib/bdev/part.c/part_ut.c +++ b/test/unit/lib/bdev/part.c/part_ut.c @@ -55,7 +55,7 @@ struct spdk_trace_histories *g_trace_histories; DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn)); DEFINE_STUB_V(spdk_trace_register_owner, (uint8_t type, char id_prefix)); DEFINE_STUB_V(spdk_trace_register_object, (uint8_t type, char id_prefix)); -DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *short_name, +DEFINE_STUB_V(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)); diff --git a/test/unit/lib/nvmf/rdma.c/rdma_ut.c b/test/unit/lib/nvmf/rdma.c/rdma_ut.c index 7484d7f83..f859a32a4 100644 --- a/test/unit/lib/nvmf/rdma.c/rdma_ut.c +++ b/test/unit/lib/nvmf/rdma.c/rdma_ut.c @@ -65,7 +65,7 @@ DEFINE_STUB_V(spdk_mem_map_free, (struct spdk_mem_map **pmap)); struct spdk_trace_histories *g_trace_histories; DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn)); DEFINE_STUB_V(spdk_trace_register_object, (uint8_t type, char id_prefix)); -DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *short_name, +DEFINE_STUB_V(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)); DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id, diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c index 0710c1560..6beb660b6 100644 --- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c +++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c @@ -180,7 +180,7 @@ spdk_trace_register_object(uint8_t type, char id_prefix) } void -spdk_trace_register_description(const char *name, const char *short_name, +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)