The "_u64" telemetry functions were replaced by the "_uint" versions back in 2023 [1], so can be removed from the release.
[1] https://doc.dpdk.org/guides-23.03/rel_notes/deprecation.html Signed-off-by: Bruce Richardson <[email protected]> Acked-by: David Marchand <[email protected]> --- doc/guides/rel_notes/deprecation.rst | 5 ---- doc/guides/rel_notes/release_25_11.rst | 4 +++ lib/telemetry/rte_telemetry.h | 35 -------------------------- lib/telemetry/telemetry_data.c | 14 ----------- 4 files changed, 4 insertions(+), 54 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index bdcd2775b6..483030cda8 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -20,11 +20,6 @@ Deprecation Notices * kvargs: The function ``rte_kvargs_process`` will get a new parameter for returning key match count. It will ease handling of no-match case. -* telemetry: The functions ``rte_tel_data_add_array_u64`` and ``rte_tel_data_add_dict_u64``, - used by telemetry callbacks for adding unsigned integer values to be returned to the user, - are renamed to ``rte_tel_data_add_array_uint`` and ``rte_tel_data_add_dict_uint`` respectively. - As such, the old function names are deprecated and will be removed in a future release. - * eal: The ``-c <coremask>`` commandline parameter is deprecated and will be removed in a future release. Use the ``-l <corelist>`` or ``--lcores=<corelist>`` parameters instead diff --git a/doc/guides/rel_notes/release_25_11.rst b/doc/guides/rel_notes/release_25_11.rst index efb88bbbb0..03cee47369 100644 --- a/doc/guides/rel_notes/release_25_11.rst +++ b/doc/guides/rel_notes/release_25_11.rst @@ -89,6 +89,10 @@ Removed Items Also, make sure to start the actual text at the margin. ======================================================= +* telemetry: As previously announced in the deprecation notices, + the functions ``rte_tel_data_add_array_u64`` and ``rte_tel_data_add_dict_u64`` are removed. + They are replaced by ``rte_tel_data_add_array_uint`` and ``rte_tel_data_add_dict_uint`` respectively. + API Changes ----------- diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h index c4554e4028..b9662a5213 100644 --- a/lib/telemetry/rte_telemetry.h +++ b/lib/telemetry/rte_telemetry.h @@ -136,22 +136,6 @@ rte_tel_data_add_array_int(struct rte_tel_data *d, int64_t x); int rte_tel_data_add_array_uint(struct rte_tel_data *d, uint64_t x); - /** - * Add a uint64_t to an array. - * The array must have been started by rte_tel_data_start_array() with - * RTE_TEL_UINT_VAL as the type parameter. - * - * @param d - * The data structure passed to the callback - * @param x - * The number to be returned in the array - * @return - * 0 on success, negative errno on error - */ -int -rte_tel_data_add_array_u64(struct rte_tel_data *d, uint64_t x) - __rte_deprecated_msg("use 'rte_tel_data_add_array_uint' instead"); - /** * Add a container to an array. A container is an existing telemetry data * array. The array the container is to be added to must have been started by @@ -249,25 +233,6 @@ int rte_tel_data_add_dict_uint(struct rte_tel_data *d, const char *name, uint64_t val); - /** - * Add a uint64_t value to a dictionary. - * The dict must have been started by rte_tel_data_start_dict(). - * - * @param d - * The data structure passed to the callback - * @param name - * The name the value is to be stored under in the dict - * Must contain only alphanumeric characters or the symbols: '_' or '/' - * @param val - * The number to be stored in the dict - * @return - * 0 on success, negative errno on error, E2BIG on string truncation of name. - */ -int -rte_tel_data_add_dict_u64(struct rte_tel_data *d, - const char *name, uint64_t val) - __rte_deprecated_msg("use 'rte_tel_data_add_dict_uint' instead"); - /** * Add a container to a dictionary. A container is an existing telemetry data * array. The dict the container is to be added to must have been started by diff --git a/lib/telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c index c120600622..0354a06548 100644 --- a/lib/telemetry/telemetry_data.c +++ b/lib/telemetry/telemetry_data.c @@ -91,13 +91,6 @@ rte_tel_data_add_array_uint(struct rte_tel_data *d, uint64_t x) return 0; } -RTE_EXPORT_SYMBOL(rte_tel_data_add_array_u64) -int -rte_tel_data_add_array_u64(struct rte_tel_data *d, uint64_t x) -{ - return rte_tel_data_add_array_uint(d, x); -} - RTE_EXPORT_SYMBOL(rte_tel_data_add_array_container) int rte_tel_data_add_array_container(struct rte_tel_data *d, @@ -229,13 +222,6 @@ rte_tel_data_add_dict_uint(struct rte_tel_data *d, return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG; } -RTE_EXPORT_SYMBOL(rte_tel_data_add_dict_u64) -int -rte_tel_data_add_dict_u64(struct rte_tel_data *d, const char *name, uint64_t val) -{ - return rte_tel_data_add_dict_uint(d, name, val); -} - RTE_EXPORT_SYMBOL(rte_tel_data_add_dict_container) int rte_tel_data_add_dict_container(struct rte_tel_data *d, const char *name, -- 2.48.1
