From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id AC580423B9;
Thu, 12 Jan 2023 18:42:28 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 1C61C42DC5;
Thu, 12 Jan 2023 18:42:11 +0100 (CET)
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
by mails.dpdk.org (Postfix) with ESMTP id 1E4B042DC4
for <dev@dpdk.org>; Thu, 12 Jan 2023 18:42:08 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1673545329; x=1705081329;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=xWbYIwVQ0M81LaqonYVZcgWHfu5BAq4hrEvLJLDGSxg=;
b=Y2OEeRvavxGGLdhMie3sQWi3UksS4BTouG980nQwIGmVhRKQoy8xite+
7YhCQhWql/ICQ7JprJYnAUxYqtVUDaJ4QmCNZv4hX9C3XR7EuprduSg3B
qZTwEglICVtIv1fUM0DC79WbZmB1jej+b6a87tvsSHapMs73zrTYFR2AR
eOSkYYS5ATZYFNGllCqijMDm88350CiN6sINh+pdyN0sM+35JKEA8faqj
VSs5un/fCGrVRTsNJYxr5swX6t+CTm/3vBj89MEsH5co9gdK3VEmU4q8S
acUsCRsVMuvT63mSOYdQDvPTDDNVgugxEK3gkXVNycOx0V7Mz1ZKFlz/h Q==;
X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="388264895"
X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="388264895"
Received: from fmsmga005.fm.intel.com ([10.253.24.32])
by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
12 Jan 2023 09:42:08 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="986678195"
X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="986678195"
Received: from silpixa00401385.ir.intel.com ([10.237.214.166])
by fmsmga005.fm.intel.com with ESMTP; 12 Jan 2023 09:42:01 -0800
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Ciara Power <ciara.power@intel.com>,
Nithin Dabilpuram <ndabilpuram@marvell.com>,
Kiran Kumar K <kirankumark@marvell.com>,
Sunil Kumar Kori <skori@marvell.com>, Satha Rao <skoteshwar@marvell.com>,
Radu Nicolau <radu.nicolau@intel.com>, Akhil Goyal <gakhil@marvell.com>,
David Hunt <david.hunt@intel.com>, Fan Zhang <fanzhang.oss@gmail.com>,
Chengwen Feng <fengchengwen@huawei.com>,
Kevin Laatz <kevin.laatz@intel.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Thomas Monjalon <thomas@monjalon.net>, Ferruh Yigit <ferruh.yigit@amd.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
Naga Harish K S V <s.v.naga.harish.k@intel.com>,
Jerin Jacob <jerinj@marvell.com>,
Erik Gabriel Carrillo <erik.g.carrillo@intel.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Sachin Saxena <sachin.saxena@nxp.com>,
Hemant Agrawal <hemant.agrawal@nxp.com>
Subject: [PATCH v3 5/9] global: rename telemetry functions to newer versions
Date: Thu, 12 Jan 2023 17:41:12 +0000
Message-Id: <20230112174116.2105237-6-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.37.2
In-Reply-To: <20230112174116.2105237-1-bruce.richardson@intel.com>
References: <20221213182730.97065-1-bruce.richardson@intel.com>
<20230112174116.2105237-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Within the DPDK code-base, replace all occurences of
"rte_tel_data_add_array_u64" with "rte_tel_data_add_array_uint", and
similarly replace all occurences of "rte_tel_data_add_dict_u64" with
"rte_tel_data_add_dict_uint". This allows us to later mark the older
functions as deprecated without hitting warnings.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test/test_telemetry_data.c | 12 ++--
drivers/common/cnxk/roc_platform.h | 4 +-
drivers/net/cnxk/cnxk_ethdev_sec_telemetry.c | 20 +++---
drivers/net/cnxk/cnxk_ethdev_telemetry.c | 4 +-
examples/ipsec-secgw/ipsec-secgw.c | 72 +++++++++-----------
examples/l3fwd-power/main.c | 4 +-
lib/cryptodev/rte_cryptodev.c | 4 +-
lib/dmadev/rte_dmadev.c | 2 +-
lib/eal/common/eal_common_memory.c | 19 +++---
lib/ethdev/rte_ethdev.c | 10 +--
lib/eventdev/rte_event_eth_rx_adapter.c | 22 +++---
lib/eventdev/rte_event_timer_adapter.c | 38 +++++++----
lib/eventdev/rte_eventdev.c | 5 +-
lib/ipsec/ipsec_telemetry.c | 31 +++++----
lib/rawdev/rte_rawdev.c | 4 +-
lib/security/rte_security.c | 4 +-
16 files changed, 130 insertions(+), 125 deletions(-)
diff --git a/app/test/test_telemetry_data.c b/app/test/test_telemetry_data.c
index 24a2035b61..b00c148a57 100644
--- a/app/test/test_telemetry_data.c
+++ b/app/test/test_telemetry_data.c
@@ -285,7 +285,7 @@ test_case_array_u64(void)
rte_tel_data_start_array(&response_data, RTE_TEL_UINT_VAL);
for (i = 0; i < 5; i++)
- rte_tel_data_add_array_u64(&response_data, i);
+ rte_tel_data_add_array_uint(&response_data, i);
return CHECK_OUTPUT("[0,1,2,3,4]");
}
@@ -299,7 +299,7 @@ test_case_add_dict_u64(void)
for (i = 0; i < 5; i++) {
sprintf(name_of_value, "dict_%d", i);
- rte_tel_data_add_dict_u64(&response_data, name_of_value, i);
+ rte_tel_data_add_dict_uint(&response_data, name_of_value, i);
}
return CHECK_OUTPUT("{\"dict_0\":0,\"dict_1\":1,\"dict_2\":2,\"dict_3\":3,\"dict_4\":4}");
}
@@ -318,8 +318,8 @@ test_dict_with_array_u64_values(void)
rte_tel_data_start_dict(&response_data);
for (i = 0; i < 10; i++) {
- rte_tel_data_add_array_u64(child_data, i);
- rte_tel_data_add_array_u64(child_data2, i);
+ rte_tel_data_add_array_uint(child_data, i);
+ rte_tel_data_add_array_uint(child_data2, i);
}
rte_tel_data_add_dict_container(&response_data, "dict_0",
@@ -344,8 +344,8 @@ test_array_with_array_u64_values(void)
rte_tel_data_start_array(&response_data, RTE_TEL_CONTAINER);
for (i = 0; i < 5; i++) {
- rte_tel_data_add_array_u64(child_data, i);
- rte_tel_data_add_array_u64(child_data2, i);
+ rte_tel_data_add_array_uint(child_data, i);
+ rte_tel_data_add_array_uint(child_data2, i);
}
rte_tel_data_add_array_container(&response_data, child_data, 0);
rte_tel_data_add_array_container(&response_data, child_data2, 0);
diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h
index 1a48ff3db4..c151a3cc8e 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -224,9 +224,9 @@
#define plt_tel_data_start_dict rte_tel_data_start_dict
#define plt_tel_data_add_dict_int rte_tel_data_add_dict_int
#define plt_tel_data_add_dict_ptr(d, n, v) \
- rte_tel_data_add_dict_u64(d, n, (uint64_t)v)
+ rte_tel_data_add_dict_uint(d, n, (uint64_t)v)
#define plt_tel_data_add_dict_string rte_tel_data_add_dict_string
-#define plt_tel_data_add_dict_u64 rte_tel_data_add_dict_u64
+#define plt_tel_data_add_dict_u64 rte_tel_data_add_dict_uint
#define plt_telemetry_register_cmd rte_telemetry_register_cmd
/* Log */
diff --git a/drivers/net/cnxk/cnxk_ethdev_sec_telemetry.c b/drivers/net/cnxk/cnxk_ethdev_sec_telemetry.c
index 59f0cce5ab..386278cfc9 100644
--- a/drivers/net/cnxk/cnxk_ethdev_sec_telemetry.c
+++ b/drivers/net/cnxk/cnxk_ethdev_sec_telemetry.c
@@ -53,10 +53,10 @@ copy_inb_sa_9k(struct rte_tel_data *d, uint32_t i, void *sa)
rte_tel_data_add_dict_string(d, str, strw0);
snprintf(str, sizeof(str), "insa_esnh_%u", i);
- rte_tel_data_add_dict_u64(d, str, in_sa->common_sa.seq_t.th);
+ rte_tel_data_add_dict_uint(d, str, in_sa->common_sa.seq_t.th);
snprintf(str, sizeof(str), "insa_esnl_%u", i);
- rte_tel_data_add_dict_u64(d, str, in_sa->common_sa.seq_t.tl);
+ rte_tel_data_add_dict_uint(d, str, in_sa->common_sa.seq_t.tl);
return 0;
}
@@ -97,12 +97,12 @@ copy_outb_sa_10k(struct rte_tel_data *d, uint32_t i, void *sa)
rte_tel_data_start_array(outer_hdr, RTE_TEL_UINT_VAL);
for (j = 0; j < RTE_DIM(out_sa->outer_hdr.ipv6.src_addr); j++)
- rte_tel_data_add_array_u64(outer_hdr,
- out_sa->outer_hdr.ipv6.src_addr[j]);
+ rte_tel_data_add_array_uint(outer_hdr,
+ out_sa->outer_hdr.ipv6.src_addr[j]);
for (j = 0; j < RTE_DIM(out_sa->outer_hdr.ipv6.dst_addr); j++)
- rte_tel_data_add_array_u64(outer_hdr,
- out_sa->outer_hdr.ipv6.dst_addr[j]);
+ rte_tel_data_add_array_uint(outer_hdr,
+ out_sa->outer_hdr.ipv6.dst_addr[j]);
snprintf(str, sizeof(str), "outsa_outer_hdr_%u", i);
rte_tel_data_add_dict_container(d, str, outer_hdr, 0);
@@ -170,12 +170,12 @@ copy_inb_sa_10k(struct rte_tel_data *d, uint32_t i, void *sa)
rte_tel_data_start_array(outer_hdr, RTE_TEL_UINT_VAL);
for (j = 0; j < RTE_DIM(in_sa->outer_hdr.ipv6.src_addr); j++)
- rte_tel_data_add_array_u64(outer_hdr,
- in_sa->outer_hdr.ipv6.src_addr[j]);
+ rte_tel_data_add_array_uint(outer_hdr,
+ in_sa->outer_hdr.ipv6.src_addr[j]);
for (j = 0; j < RTE_DIM(in_sa->outer_hdr.ipv6.dst_addr); j++)
- rte_tel_data_add_array_u64(outer_hdr,
- in_sa->outer_hdr.ipv6.dst_addr[j]);
+ rte_tel_data_add_array_uint(outer_hdr,
+ in_sa->outer_hdr.ipv6.dst_addr[j]);
snprintf(str, sizeof(str), "insa_outer_hdr_%u", i);
rte_tel_data_add_dict_container(d, str, outer_hdr, 0);
diff --git a/drivers/net/cnxk/cnxk_ethdev_telemetry.c b/drivers/net/cnxk/cnxk_ethdev_telemetry.c
index 5db973d620..3027ca4735 100644
--- a/drivers/net/cnxk/cnxk_ethdev_telemetry.c
+++ b/drivers/net/cnxk/cnxk_ethdev_telemetry.c
@@ -80,8 +80,8 @@ ethdev_tel_handle_info(const char *cmd __rte_unused,
}
for (j = 0; j < ETH_INFO_SZ; j++)
- rte_tel_data_add_array_u64(i_data,
- eth_info.val[j]);
+ rte_tel_data_add_array_uint(i_data,
+ eth_info.val[j]);
j++;
}
diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index a64a26c992..d2d9d85b4a 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -2588,14 +2588,12 @@ handle_telemetry_cmd_ipsec_secgw_stats(const char *cmd __rte_unused,
}
/* add telemetry key/values pairs */
- rte_tel_data_add_dict_u64(data, "packets received",
- total_pkts_rx);
+ rte_tel_data_add_dict_uint(data, "packets received", total_pkts_rx);
- rte_tel_data_add_dict_u64(data, "packets transmitted",
- total_pkts_tx);
+ rte_tel_data_add_dict_uint(data, "packets transmitted", total_pkts_tx);
- rte_tel_data_add_dict_u64(data, "packets dropped",
- total_pkts_dropped);
+ rte_tel_data_add_dict_uint(data, "packets dropped",
+ total_pkts_dropped);
return 0;
@@ -2695,30 +2693,30 @@ handle_telemetry_cmd_ipsec_secgw_stats_outbound(const char *cmd __rte_unused,
/* add spd 4 telemetry key/values pairs */
- rte_tel_data_add_dict_u64(spd4_data, "protect",
- total_stats.outbound.spd4.protect);
- rte_tel_data_add_dict_u64(spd4_data, "bypass",
- total_stats.outbound.spd4.bypass);
- rte_tel_data_add_dict_u64(spd4_data, "discard",
- total_stats.outbound.spd4.discard);
+ rte_tel_data_add_dict_uint(spd4_data, "protect",
+ total_stats.outbound.spd4.protect);
+ rte_tel_data_add_dict_uint(spd4_data, "bypass",
+ total_stats.outbound.spd4.bypass);
+ rte_tel_data_add_dict_uint(spd4_data, "discard",
+ total_stats.outbound.spd4.discard);
rte_tel_data_add_dict_container(data, "spd4", spd4_data, 0);
/* add spd 6 telemetry key/values pairs */
- rte_tel_data_add_dict_u64(spd6_data, "protect",
- total_stats.outbound.spd6.protect);
- rte_tel_data_add_dict_u64(spd6_data, "bypass",
- total_stats.outbound.spd6.bypass);
- rte_tel_data_add_dict_u64(spd6_data, "discard",
- total_stats.outbound.spd6.discard);
+ rte_tel_data_add_dict_uint(spd6_data, "protect",
+ total_stats.outbound.spd6.protect);
+ rte_tel_data_add_dict_uint(spd6_data, "bypass",
+ total_stats.outbound.spd6.bypass);
+ rte_tel_data_add_dict_uint(spd6_data, "discard",
+ total_stats.outbound.spd6.discard);
rte_tel_data_add_dict_container(data, "spd6", spd6_data, 0);
/* add sad telemetry key/values pairs */
- rte_tel_data_add_dict_u64(sad_data, "miss",
- total_stats.outbound.sad.miss);
+ rte_tel_data_add_dict_uint(sad_data, "miss",
+ total_stats.outbound.sad.miss);
rte_tel_data_add_dict_container(data, "sad", sad_data, 0);
@@ -2769,30 +2767,30 @@ handle_telemetry_cmd_ipsec_secgw_stats_inbound(const char *cmd __rte_unused,
/* add sad telemetry key/values pairs */
- rte_tel_data_add_dict_u64(sad_data, "miss",
- total_stats.inbound.sad.miss);
+ rte_tel_data_add_dict_uint(sad_data, "miss",
+ total_stats.inbound.sad.miss);
rte_tel_data_add_dict_container(data, "sad", sad_data, 0);
/* add spd 4 telemetry key/values pairs */
- rte_tel_data_add_dict_u64(spd4_data, "protect",
- total_stats.inbound.spd4.protect);
- rte_tel_data_add_dict_u64(spd4_data, "bypass",
- total_stats.inbound.spd4.bypass);
- rte_tel_data_add_dict_u64(spd4_data, "discard",
- total_stats.inbound.spd4.discard);
+ rte_tel_data_add_dict_uint(spd4_data, "protect",
+ total_stats.inbound.spd4.protect);
+ rte_tel_data_add_dict_uint(spd4_data, "bypass",
+ total_stats.inbound.spd4.bypass);
+ rte_tel_data_add_dict_uint(spd4_data, "discard",
+ total_stats.inbound.spd4.discard);
rte_tel_data_add_dict_container(data, "spd4", spd4_data, 0);
/* add spd 6 telemetry key/values pairs */
- rte_tel_data_add_dict_u64(spd6_data, "protect",
- total_stats.inbound.spd6.protect);
- rte_tel_data_add_dict_u64(spd6_data, "bypass",
- total_stats.inbound.spd6.bypass);
- rte_tel_data_add_dict_u64(spd6_data, "discard",
- total_stats.inbound.spd6.discard);
+ rte_tel_data_add_dict_uint(spd6_data, "protect",
+ total_stats.inbound.spd6.protect);
+ rte_tel_data_add_dict_uint(spd6_data, "bypass",
+ total_stats.inbound.spd6.bypass);
+ rte_tel_data_add_dict_uint(spd6_data, "discard",
+ total_stats.inbound.spd6.discard);
rte_tel_data_add_dict_container(data, "spd6", spd6_data, 0);
@@ -2839,14 +2837,12 @@ handle_telemetry_cmd_ipsec_secgw_stats_routing(const char *cmd __rte_unused,
update_statistics(&total_stats, coreid);
/* add lpm 4 telemetry key/values pairs */
- rte_tel_data_add_dict_u64(lpm4_data, "miss",
- total_stats.lpm4.miss);
+ rte_tel_data_add_dict_uint(lpm4_data, "miss", total_stats.lpm4.miss);
rte_tel_data_add_dict_container(data, "IPv4 LPM", lpm4_data, 0);
/* add lpm 6 telemetry key/values pairs */
- rte_tel_data_add_dict_u64(lpm6_data, "miss",
- total_stats.lpm6.miss);
+ rte_tel_data_add_dict_uint(lpm6_data, "miss", total_stats.lpm6.miss);
rte_tel_data_add_dict_container(data, "IPv6 LPM", lpm6_data, 0);
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index fd3ade330f..caf26b373e 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -2555,8 +2555,8 @@ handle_app_stats(const char *cmd __rte_unused,
rte_tel_data_start_dict(d);
get_current_stat_values(values);
for (i = 0; i < NUM_TELSTATS; i++)
- rte_tel_data_add_dict_u64(d, telstats_strings[i].name,
- values[i]);
+ rte_tel_data_add_dict_uint(d, telstats_strings[i].name,
+ values[i]);
return 0;
}
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index 79ea958db4..bc53aab100 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -2698,7 +2698,7 @@ cryptodev_handle_dev_info(const char *cmd __rte_unused,
return 0;
}
-#define ADD_DICT_STAT(s) rte_tel_data_add_dict_u64(d, #s, cryptodev_stats.s)
+#define ADD_DICT_STAT(s) rte_tel_data_add_dict_uint(d, #s, cryptodev_stats.s)
static int
cryptodev_handle_dev_stats(const char *cmd __rte_unused,
@@ -2751,7 +2751,7 @@ crypto_caps_array(struct rte_tel_data *d,
memset(&caps_val, 0, CRYPTO_CAPS_SZ * sizeof(caps_val[0]));
rte_memcpy(caps_val, dev_caps, sizeof(capabilities[0]));
for (j = 0; j < CRYPTO_CAPS_SZ; j++)
- rte_tel_data_add_array_u64(d, caps_val[j]);
+ rte_tel_data_add_array_uint(d, caps_val[j]);
}
return i;
diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 4da653eec7..8c095e1f35 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -944,7 +944,7 @@ dmadev_handle_dev_info(const char *cmd __rte_unused,
return 0;
}
-#define ADD_DICT_STAT(s) rte_tel_data_add_dict_u64(d, #s, dma_stats.s)
+#define ADD_DICT_STAT(s) rte_tel_data_add_dict_uint(d, #s, dma_stats.s)
static int
dmadev_handle_dev_stats(const char *cmd __rte_unused,
diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
index 688dc615d7..3d2fc8e98b 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -1141,15 +1141,16 @@ handle_eal_heap_info_request(const char *cmd __rte_unused, const char *params,
rte_tel_data_start_dict(d);
rte_tel_data_add_dict_int(d, "Head id", heap_id);
rte_tel_data_add_dict_string(d, "Name", heap->name);
- rte_tel_data_add_dict_u64(d, "Heap_size",
- sock_stats.heap_totalsz_bytes);
- rte_tel_data_add_dict_u64(d, "Free_size", sock_stats.heap_freesz_bytes);
- rte_tel_data_add_dict_u64(d, "Alloc_size",
- sock_stats.heap_allocsz_bytes);
- rte_tel_data_add_dict_u64(d, "Greatest_free_size",
- sock_stats.greatest_free_size);
- rte_tel_data_add_dict_u64(d, "Alloc_count", sock_stats.alloc_count);
- rte_tel_data_add_dict_u64(d, "Free_count", sock_stats.free_count);
+ rte_tel_data_add_dict_uint(d, "Heap_size",
+ sock_stats.heap_totalsz_bytes);
+ rte_tel_data_add_dict_uint(d, "Free_size",
+ sock_stats.heap_freesz_bytes);
+ rte_tel_data_add_dict_uint(d, "Alloc_size",
+ sock_stats.heap_allocsz_bytes);
+ rte_tel_data_add_dict_uint(d, "Greatest_free_size",
+ sock_stats.greatest_free_size);
+ rte_tel_data_add_dict_uint(d, "Alloc_count", sock_stats.alloc_count);
+ rte_tel_data_add_dict_uint(d, "Free_count", sock_stats.free_count);
return 0;
}
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 28028e5de5..4dd2968a01 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -5820,11 +5820,11 @@ eth_dev_add_port_queue_stats(struct rte_tel_data *d, uint64_t *q_stats,
return;
rte_tel_data_start_array(q_data, RTE_TEL_UINT_VAL);
for (q = 0; q < RTE_ETHDEV_QUEUE_STAT_CNTRS; q++)
- rte_tel_data_add_array_u64(q_data, q_stats[q]);
+ rte_tel_data_add_array_uint(q_data, q_stats[q]);
rte_tel_data_add_dict_container(d, stat_name, q_data, 0);
}
-#define ADD_DICT_STAT(stats, s) rte_tel_data_add_dict_u64(d, #s, stats.s)
+#define ADD_DICT_STAT(stats, s) rte_tel_data_add_dict_uint(d, #s, stats.s)
static int
eth_dev_handle_port_stats(const char *cmd __rte_unused,
@@ -5909,8 +5909,8 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused,
rte_tel_data_start_dict(d);
for (i = 0; i < num_xstats; i++)
- rte_tel_data_add_dict_u64(d, xstat_names[i].name,
- eth_xstats[i].value);
+ rte_tel_data_add_dict_uint(d, xstat_names[i].name,
+ eth_xstats[i].value);
free(eth_xstats);
return 0;
}
@@ -5987,7 +5987,7 @@ eth_dev_handle_port_link_status(const char *cmd __rte_unused,
return 0;
}
rte_tel_data_add_dict_string(d, status_str, "UP");
- rte_tel_data_add_dict_u64(d, "speed", link.link_speed);
+ rte_tel_data_add_dict_uint(d, "speed", link.link_speed);
rte_tel_data_add_dict_string(d, "duplex",
(link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX) ?
"full-duplex" : "half-duplex");
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index cf7bbd4d69..13d7163b79 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3433,7 +3433,7 @@ rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id,
return -EINVAL;
}
-#define RXA_ADD_DICT(stats, s) rte_tel_data_add_dict_u64(d, #s, stats.s)
+#define RXA_ADD_DICT(stats, s) rte_tel_data_add_dict_uint(d, #s, stats.s)
static int
handle_rxa_stats(const char *cmd __rte_unused,
@@ -3458,7 +3458,7 @@ handle_rxa_stats(const char *cmd __rte_unused,
}
rte_tel_data_start_dict(d);
- rte_tel_data_add_dict_u64(d, "rx_adapter_id", rx_adapter_id);
+ rte_tel_data_add_dict_uint(d, "rx_adapter_id", rx_adapter_id);
RXA_ADD_DICT(rx_adptr_stats, rx_packets);
RXA_ADD_DICT(rx_adptr_stats, rx_poll_count);
RXA_ADD_DICT(rx_adptr_stats, rx_dropped);
@@ -3552,9 +3552,9 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
}
rte_tel_data_start_dict(d);
- rte_tel_data_add_dict_u64(d, "rx_adapter_id", rx_adapter_id);
- rte_tel_data_add_dict_u64(d, "eth_dev_id", eth_dev_id);
- rte_tel_data_add_dict_u64(d, "rx_queue_id", rx_queue_id);
+ rte_tel_data_add_dict_uint(d, "rx_adapter_id", rx_adapter_id);
+ rte_tel_data_add_dict_uint(d, "eth_dev_id", eth_dev_id);
+ rte_tel_data_add_dict_uint(d, "rx_queue_id", rx_queue_id);
RXA_ADD_DICT(queue_conf, rx_queue_flags);
RXA_ADD_DICT(queue_conf, servicing_weight);
RXA_ADD_DICT(queue_conf.ev, queue_id);
@@ -3624,9 +3624,9 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
}
rte_tel_data_start_dict(d);
- rte_tel_data_add_dict_u64(d, "rx_adapter_id", rx_adapter_id);
- rte_tel_data_add_dict_u64(d, "eth_dev_id", eth_dev_id);
- rte_tel_data_add_dict_u64(d, "rx_queue_id", rx_queue_id);
+ rte_tel_data_add_dict_uint(d, "rx_adapter_id", rx_adapter_id);
+ rte_tel_data_add_dict_uint(d, "eth_dev_id", eth_dev_id);
+ rte_tel_data_add_dict_uint(d, "rx_queue_id", rx_queue_id);
RXA_ADD_DICT(q_stats, rx_event_buf_count);
RXA_ADD_DICT(q_stats, rx_event_buf_size);
RXA_ADD_DICT(q_stats, rx_poll_count);
@@ -3752,9 +3752,9 @@ handle_rxa_instance_get(const char *cmd __rte_unused,
}
rte_tel_data_start_dict(d);
- rte_tel_data_add_dict_u64(d, "eth_dev_id", eth_dev_id);
- rte_tel_data_add_dict_u64(d, "rx_queue_id", rx_queue_id);
- rte_tel_data_add_dict_u64(d, "rxa_instance_id", instance_id);
+ rte_tel_data_add_dict_uint(d, "eth_dev_id", eth_dev_id);
+ rte_tel_data_add_dict_uint(d, "rx_queue_id", rx_queue_id);
+ rte_tel_data_add_dict_uint(d, "rxa_instance_id", instance_id);
return 0;
diff --git a/lib/eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
index a0f14bf861..1c3f91605a 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -1316,15 +1316,20 @@ handle_ta_info(const char *cmd __rte_unused, const char *params,
}
rte_tel_data_start_dict(d);
- rte_tel_data_add_dict_u64(d, "timer_adapter_id", adapter_id);
- rte_tel_data_add_dict_u64(d, "min_resolution_ns", adapter_info.min_resolution_ns);
- rte_tel_data_add_dict_u64(d, "max_tmo_ns", adapter_info.max_tmo_ns);
- rte_tel_data_add_dict_u64(d, "event_dev_id", adapter_info.conf.event_dev_id);
- rte_tel_data_add_dict_u64(d, "socket_id", adapter_info.conf.socket_id);
- rte_tel_data_add_dict_u64(d, "clk_src", adapter_info.conf.clk_src);
- rte_tel_data_add_dict_u64(d, "timer_tick_ns", adapter_info.conf.timer_tick_ns);
- rte_tel_data_add_dict_u64(d, "nb_timers", adapter_info.conf.nb_timers);
- rte_tel_data_add_dict_u64(d, "flags", adapter_info.conf.flags);
+ rte_tel_data_add_dict_uint(d, "timer_adapter_id", adapter_id);
+ rte_tel_data_add_dict_uint(d, "min_resolution_ns",
+ adapter_info.min_resolution_ns);
+ rte_tel_data_add_dict_uint(d, "max_tmo_ns", adapter_info.max_tmo_ns);
+ rte_tel_data_add_dict_uint(d, "event_dev_id",
+ adapter_info.conf.event_dev_id);
+ rte_tel_data_add_dict_uint(d, "socket_id",
+ adapter_info.conf.socket_id);
+ rte_tel_data_add_dict_uint(d, "clk_src", adapter_info.conf.clk_src);
+ rte_tel_data_add_dict_uint(d, "timer_tick_ns",
+ adapter_info.conf.timer_tick_ns);
+ rte_tel_data_add_dict_uint(d, "nb_timers",
+ adapter_info.conf.nb_timers);
+ rte_tel_data_add_dict_uint(d, "flags", adapter_info.conf.flags);
return 0;
}
@@ -1357,12 +1362,15 @@ handle_ta_stats(const char *cmd __rte_unused, const char *params,
}
rte_tel_data_start_dict(d);
- rte_tel_data_add_dict_u64(d, "timer_adapter_id", adapter_id);
- rte_tel_data_add_dict_u64(d, "evtim_exp_count", stats.evtim_exp_count);
- rte_tel_data_add_dict_u64(d, "ev_enq_count", stats.ev_enq_count);
- rte_tel_data_add_dict_u64(d, "ev_inv_count", stats.ev_inv_count);
- rte_tel_data_add_dict_u64(d, "evtim_retry_count", stats.evtim_retry_count);
- rte_tel_data_add_dict_u64(d, "adapter_tick_count", stats.adapter_tick_count);
+ rte_tel_data_add_dict_uint(d, "timer_adapter_id", adapter_id);
+ rte_tel_data_add_dict_uint(d, "evtim_exp_count",
+ stats.evtim_exp_count);
+ rte_tel_data_add_dict_uint(d, "ev_enq_count", stats.ev_enq_count);
+ rte_tel_data_add_dict_uint(d, "ev_inv_count", stats.ev_inv_count);
+ rte_tel_data_add_dict_uint(d, "evtim_retry_count",
+ stats.evtim_retry_count);
+ rte_tel_data_add_dict_uint(d, "adapter_tick_count",
+ stats.adapter_tick_count);
return 0;
}
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index b0414206d9..027e6a93ce 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -1645,7 +1645,7 @@ handle_queue_links(const char *cmd __rte_unused,
char qid_name[32];
snprintf(qid_name, 31, "qid_%u", queues[i]);
- rte_tel_data_add_dict_u64(d, qid_name, priorities[i]);
+ rte_tel_data_add_dict_uint(d, qid_name, priorities[i]);
}
return 0;
@@ -1711,8 +1711,7 @@ eventdev_build_telemetry_data(int dev_id,
rte_tel_data_start_dict(d);
for (i = 0; i < num_xstats; i++)
- rte_tel_data_add_dict_u64(d, xstat_names[i].name,
- values[i]);
+ rte_tel_data_add_dict_uint(d, xstat_names[i].name, values[i]);
free(xstat_names);
free(ids);
diff --git a/lib/ipsec/ipsec_telemetry.c b/lib/ipsec/ipsec_telemetry.c
index b184e8df99..90d4b67156 100644
--- a/lib/ipsec/ipsec_telemetry.c
+++ b/lib/ipsec/ipsec_telemetry.c
@@ -26,7 +26,7 @@ handle_telemetry_cmd_ipsec_sa_list(const char *cmd __rte_unused,
LIST_FOREACH(entry, &ipsec_telemetry_list, next) {
const struct rte_ipsec_sa *sa = entry->sa;
- rte_tel_data_add_array_u64(data, rte_be_to_cpu_32(sa->spi));
+ rte_tel_data_add_array_uint(data, rte_be_to_cpu_32(sa->spi));
}
return 0;
@@ -80,15 +80,15 @@ handle_telemetry_cmd_ipsec_sa_stats(const char *cmd __rte_unused,
rte_tel_data_start_dict(sa_data);
/* add telemetry key/values pairs */
- rte_tel_data_add_dict_u64(sa_data, name_pkt_cnt,
- sa->statistics.count);
+ rte_tel_data_add_dict_uint(sa_data, name_pkt_cnt,
+ sa->statistics.count);
- rte_tel_data_add_dict_u64(sa_data, name_byte_cnt,
- sa->statistics.bytes -
- (sa->statistics.count * sa->hdr_len));
+ rte_tel_data_add_dict_uint(sa_data, name_byte_cnt,
+ sa->statistics.bytes -
+ (sa->statistics.count * sa->hdr_len));
- rte_tel_data_add_dict_u64(sa_data, name_error_cnt,
- sa->statistics.errors.count);
+ rte_tel_data_add_dict_uint(sa_data, name_error_cnt,
+ sa->statistics.errors.count);
/* generate telemetry label */
snprintf(sa_name, sizeof(sa_name), "SA_SPI_%i",
@@ -177,15 +177,16 @@ handle_telemetry_cmd_ipsec_sa_details(const char *cmd __rte_unused,
RTE_IPSEC_SATP_DIR_IB)
if (sa->sqn.inb.rsn[sa->sqn.inb.rdidx])
- rte_tel_data_add_dict_u64(data,
- "sequence-number",
- sa->sqn.inb.rsn[sa->sqn.inb.rdidx]->sqn);
+ rte_tel_data_add_dict_uint(data,
+ "sequence-number",
+ sa->sqn.inb.rsn[sa->sqn.inb.rdidx]->sqn);
else
- rte_tel_data_add_dict_u64(data,
- "sequence-number", 0);
+ rte_tel_data_add_dict_uint(data,
+ "sequence-number",
+ 0);
else
- rte_tel_data_add_dict_u64(data, "sequence-number",
- sa->sqn.outb);
+ rte_tel_data_add_dict_uint(data, "sequence-number",
+ sa->sqn.outb);
rte_tel_data_add_dict_string(data,
"explicit-congestion-notification",
diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c
index 5fbdb94229..dacaa60e22 100644
--- a/lib/rawdev/rte_rawdev.c
+++ b/lib/rawdev/rte_rawdev.c
@@ -631,8 +631,8 @@ handle_dev_xstats(const char *cmd __rte_unused,
rte_tel_data_start_dict(d);
for (i = 0; i < num_xstats; i++)
- rte_tel_data_add_dict_u64(d, xstat_names[i].name,
- rawdev_xstats[i]);
+ rte_tel_data_add_dict_uint(d, xstat_names[i].name,
+ rawdev_xstats[i]);
free(rawdev_xstats);
return 0;
diff --git a/lib/security/rte_security.c b/lib/security/rte_security.c
index 68063f6450..e102c55e55 100644
--- a/lib/security/rte_security.c
+++ b/lib/security/rte_security.c
@@ -323,7 +323,7 @@ crypto_caps_array(struct rte_tel_data *d,
memset(&caps_val, 0, CRYPTO_CAPS_SZ * sizeof(caps_val[0]));
rte_memcpy(caps_val, dev_caps, sizeof(capabilities[0]));
for (j = 0; j < CRYPTO_CAPS_SZ; j++)
- rte_tel_data_add_array_u64(d, caps_val[j]);
+ rte_tel_data_add_array_uint(d, caps_val[j]);
}
return (i - 1);
@@ -348,7 +348,7 @@ sec_caps_array(struct rte_tel_data *d,
memset(&caps_val, 0, SEC_CAPS_SZ * sizeof(caps_val[0]));
rte_memcpy(caps_val, dev_caps, sizeof(capabilities[0]));
for (j = 0; j < SEC_CAPS_SZ; j++)
- rte_tel_data_add_array_u64(d, caps_val[j]);
+ rte_tel_data_add_array_uint(d, caps_val[j]);
}
return i - 1;
--
2.37.2