From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 95050A0540; Mon, 12 Dec 2022 07:43:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 585A942D46; Mon, 12 Dec 2022 07:43:14 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 2001141141 for ; Mon, 12 Dec 2022 07:43:06 +0100 (CET) Received: from kwepemm600004.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NVsVm5kh3zmWTs; Mon, 12 Dec 2022 14:42:08 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 12 Dec 2022 14:43:04 +0800 From: Huisong Li To: CC: , , , , , , Subject: [PATCH V3 08/11] telemetry: refactor mapping betwween value and array type Date: Mon, 12 Dec 2022 14:43:03 +0800 Message-ID: <20221212064306.39232-9-lihuisong@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20221212064306.39232-1-lihuisong@huawei.com> References: <20221208080540.62913-1-lihuisong@huawei.com> <20221212064306.39232-1-lihuisong@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Currently, use rte_tel_value_type as index of array to find the tel_container_types in rte_tel_data_start_array. It's not good for maintenance. Fixes: ed1bfad7d384 ("telemetry: add functions for returning callback data") Cc: stable@dpdk.org Signed-off-by: Huisong Li Acked-by: Morten Brørup Acked-by: Chengwen Feng --- lib/telemetry/telemetry_data.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c index c120bf6281..f8efc37763 100644 --- a/lib/telemetry/telemetry_data.c +++ b/lib/telemetry/telemetry_data.c @@ -15,14 +15,30 @@ int rte_tel_data_start_array(struct rte_tel_data *d, enum rte_tel_value_type type) { - enum tel_container_types array_types[] = { - RTE_TEL_ARRAY_STRING, /* RTE_TEL_STRING_VAL = 0 */ - RTE_TEL_ARRAY_INT, /* RTE_TEL_INT_VAL = 1 */ - RTE_TEL_ARRAY_U64, /* RTE_TEL_U64_VAL = 2 */ - RTE_TEL_ARRAY_CONTAINER, /* RTE_TEL_CONTAINER = 3 */ - RTE_TEL_ARRAY_U32, /* RTE_TEL_U32_VAL = 4 */ + struct { + enum rte_tel_value_type value_type; + enum tel_container_types array_type; + } value2array_types_map[] = { + {RTE_TEL_STRING_VAL, RTE_TEL_ARRAY_STRING}, + {RTE_TEL_INT_VAL, RTE_TEL_ARRAY_INT}, + {RTE_TEL_U64_VAL, RTE_TEL_ARRAY_U64}, + {RTE_TEL_CONTAINER, RTE_TEL_ARRAY_CONTAINER}, + {RTE_TEL_U32_VAL, RTE_TEL_ARRAY_U32}, }; - d->type = array_types[type]; + int array_types = -1; + uint16_t i; + + for (i = 0; i < RTE_DIM(value2array_types_map); i++) { + if (type == value2array_types_map[i].value_type) { + array_types = value2array_types_map[i].array_type; + break; + } + } + + if (array_types == -1) + return -EINVAL; + + d->type = array_types; d->data_len = 0; return 0; } -- 2.33.0