Skip to content

Commit 51cbeed

Browse files
telemetry: remove v23 ABI compatibility
v23.11 is a ABI breaking release, remove compatibility code for the previous major ABI version. Signed-off-by: David Marchand <[email protected]> Acked-by: Bruce Richardson <[email protected]>
1 parent 6903de6 commit 51cbeed

File tree

4 files changed

+5
-44
lines changed

4 files changed

+5
-44
lines changed

lib/telemetry/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ includes = [global_inc]
66
sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c')
77
headers = files('rte_telemetry.h')
88
includes += include_directories('../metrics')
9-
use_function_versioning = true

lib/telemetry/telemetry_data.c

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#undef RTE_USE_LIBBSD
1111
#include <stdbool.h>
1212

13-
#include <rte_function_versioning.h>
1413
#include <rte_string_fns.h>
1514

1615
#include "telemetry_data.h"
@@ -63,8 +62,8 @@ rte_tel_data_add_array_string(struct rte_tel_data *d, const char *str)
6362
return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG;
6463
}
6564

66-
int __vsym
67-
rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t x)
65+
int
66+
rte_tel_data_add_array_int(struct rte_tel_data *d, int64_t x)
6867
{
6968
if (d->type != TEL_ARRAY_INT)
7069
return -EINVAL;
@@ -74,18 +73,6 @@ rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t x)
7473
return 0;
7574
}
7675

77-
int __vsym
78-
rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int x)
79-
{
80-
return rte_tel_data_add_array_int_v24(d, x);
81-
}
82-
83-
/* mark the v23 function as the older version, and v24 as the default version */
84-
VERSION_SYMBOL(rte_tel_data_add_array_int, _v23, 23);
85-
BIND_DEFAULT_SYMBOL(rte_tel_data_add_array_int, _v24, 24);
86-
MAP_STATIC_SYMBOL(int rte_tel_data_add_array_int(struct rte_tel_data *d,
87-
int64_t x), rte_tel_data_add_array_int_v24);
88-
8976
int
9077
rte_tel_data_add_array_uint(struct rte_tel_data *d, uint64_t x)
9178
{
@@ -190,8 +177,8 @@ rte_tel_data_add_dict_string(struct rte_tel_data *d, const char *name,
190177
return 0;
191178
}
192179

193-
int __vsym
194-
rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t val)
180+
int
181+
rte_tel_data_add_dict_int(struct rte_tel_data *d, const char *name, int64_t val)
195182
{
196183
struct tel_dict_entry *e = &d->data.dict[d->data_len];
197184
if (d->type != TEL_DICT)
@@ -209,18 +196,6 @@ rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t
209196
return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG;
210197
}
211198

212-
int __vsym
213-
rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name, int val)
214-
{
215-
return rte_tel_data_add_dict_int_v24(d, name, val);
216-
}
217-
218-
/* mark the v23 function as the older version, and v24 as the default version */
219-
VERSION_SYMBOL(rte_tel_data_add_dict_int, _v23, 23);
220-
BIND_DEFAULT_SYMBOL(rte_tel_data_add_dict_int, _v24, 24);
221-
MAP_STATIC_SYMBOL(int rte_tel_data_add_dict_int(struct rte_tel_data *d,
222-
const char *name, int64_t val), rte_tel_data_add_dict_int_v24);
223-
224199
int
225200
rte_tel_data_add_dict_uint(struct rte_tel_data *d,
226201
const char *name, uint64_t val)

lib/telemetry/telemetry_data.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,4 @@ struct rte_tel_data {
4949
} data; /* data container */
5050
};
5151

52-
/* versioned functions */
53-
int rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int val);
54-
int rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t val);
55-
int rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name, int val);
56-
int rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t val);
57-
5852
#endif

lib/telemetry/version.map

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DPDK_23 {
1+
DPDK_24 {
22
global:
33

44
rte_tel_data_add_array_container;
@@ -31,13 +31,6 @@ EXPERIMENTAL {
3131
local: *;
3232
};
3333

34-
DPDK_24 {
35-
global:
36-
37-
rte_tel_data_add_array_int;
38-
rte_tel_data_add_dict_int;
39-
} DPDK_23;
40-
4134
INTERNAL {
4235
rte_telemetry_legacy_register;
4336
rte_telemetry_init;

0 commit comments

Comments
 (0)