From a4c37c6a56495affb6c67659d7fc5b944b5ac207 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 5 May 2021 21:54:03 +0000 Subject: [PATCH] ftl: use SPDK_TRACE_ARG_TYPE #defines Signed-off-by: Jim Harris Change-Id: I10a0a2bf3f2bdcef0b4e4c76ee6958151c2b61e6 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7759 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Paul Luse --- lib/ftl/ftl_trace.c | 63 ++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/lib/ftl/ftl_trace.c b/lib/ftl/ftl_trace.c index ba66323ad..646200ec9 100644 --- a/lib/ftl/ftl_trace.c +++ b/lib/ftl/ftl_trace.c @@ -89,72 +89,93 @@ 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), - OWNER_FTL, OBJECT_NONE, 0, 0, "band: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "band: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "band_write"); spdk_trace_register_description(descbuf, FTL_TRACE_BAND_WRITE(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "band: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "band: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "limits"); spdk_trace_register_description(descbuf, FTL_TRACE_LIMITS(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "limits: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "limits: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "rwb_pop"); spdk_trace_register_description(descbuf, FTL_TRACE_WBUF_POP(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_read_sched"); spdk_trace_register_description(descbuf, FTL_TRACE_MD_READ_SCHEDULE(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_read_submit"); spdk_trace_register_description(descbuf, FTL_TRACE_MD_READ_SUBMISSION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_read_cmpl"); spdk_trace_register_description(descbuf, FTL_TRACE_MD_READ_COMPLETION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_write_sched"); spdk_trace_register_description(descbuf, FTL_TRACE_MD_WRITE_SCHEDULE(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_write_submit"); spdk_trace_register_description(descbuf, FTL_TRACE_MD_WRITE_SUBMISSION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "md_write_cmpl"); spdk_trace_register_description(descbuf, FTL_TRACE_MD_WRITE_COMPLETION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_sched"); spdk_trace_register_description(descbuf, FTL_TRACE_READ_SCHEDULE(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_submit"); spdk_trace_register_description(descbuf, FTL_TRACE_READ_SUBMISSION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_cmpl_invld"); spdk_trace_register_description(descbuf, FTL_TRACE_READ_COMPLETION_INVALID(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_cmpl_cache"); spdk_trace_register_description(descbuf, FTL_TRACE_READ_COMPLETION_CACHE(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "read_cmpl_ssd"); spdk_trace_register_description(descbuf, FTL_TRACE_READ_COMPLETION_DISK(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "write_sched"); spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_SCHEDULE(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "rwb_fill"); spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_WBUF_FILL(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "write_submit"); spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_SUBMISSION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "write_cmpl"); spdk_trace_register_description(descbuf, FTL_TRACE_WRITE_COMPLETION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "lba: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "lba: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "erase_submit"); spdk_trace_register_description(descbuf, FTL_TRACE_ERASE_SUBMISSION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); snprintf(descbuf, sizeof(descbuf), "%c %s", source[i], "erase_cmpl"); spdk_trace_register_description(descbuf, FTL_TRACE_ERASE_COMPLETION(i), - OWNER_FTL, OBJECT_NONE, 0, 0, "addr: "); + OWNER_FTL, OBJECT_NONE, 0, + SPDK_TRACE_ARG_TYPE_INT, "addr: "); } }