meter: remove experimental alias
Checks
Commit Message
Remove ABI versioning for APIs:
'rte_meter_trtcm_rfc4115_profile_config()'
'rte_meter_trtcm_rfc4115_config()'
The alias was introduced in
commit 60197bda97a0 ("meter: provide experimental alias for matured API")
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
lib/librte_meter/rte_meter.c | 73 ++------------------------
lib/librte_meter/rte_meter_version.map | 7 ---
2 files changed, 3 insertions(+), 77 deletions(-)
Comments
On 17/08/2020 11:18, Ferruh Yigit wrote:
> Remove ABI versioning for APIs:
> 'rte_meter_trtcm_rfc4115_profile_config()'
> 'rte_meter_trtcm_rfc4115_config()'
>
> The alias was introduced in
> commit 60197bda97a0 ("meter: provide experimental alias for matured API")
>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> ---
> lib/librte_meter/rte_meter.c | 73 ++------------------------
> lib/librte_meter/rte_meter_version.map | 7 ---
> 2 files changed, 3 insertions(+), 77 deletions(-)
>
> diff --git a/lib/librte_meter/rte_meter.c b/lib/librte_meter/rte_meter.c
> index 149cf58bdd..da01429a8b 100644
> --- a/lib/librte_meter/rte_meter.c
> +++ b/lib/librte_meter/rte_meter.c
> @@ -9,7 +9,6 @@
> #include <rte_common.h>
> #include <rte_log.h>
> #include <rte_cycles.h>
> -#include <rte_function_versioning.h>
>
> #include "rte_meter.h"
>
> @@ -120,15 +119,8 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m,
> return 0;
> }
>
> -/*
> - * ABI aliasing done for 'rte_meter_trtcm_rfc4115_profile_config'
> - * to support both EXPERIMENTAL and DPDK_21 versions
> - * This versioning will be removed on next ABI version (v20.11)
> - * and '__rte_meter_trtcm_rfc4115_profile_config' will be restrored back to
> - * 'rte_meter_trtcm_rfc4115_profile_config' without versioning.
> - */
> -static int
> -__rte_meter_trtcm_rfc4115_profile_config(
> +int
> +rte_meter_trtcm_rfc4115_profile_config(
> struct rte_meter_trtcm_rfc4115_profile *p,
> struct rte_meter_trtcm_rfc4115_params *params)
> {
> @@ -153,42 +145,7 @@ __rte_meter_trtcm_rfc4115_profile_config(
> }
>
> int
> -rte_meter_trtcm_rfc4115_profile_config_s(
> - struct rte_meter_trtcm_rfc4115_profile *p,
> - struct rte_meter_trtcm_rfc4115_params *params);
> -int
> -rte_meter_trtcm_rfc4115_profile_config_s(
> - struct rte_meter_trtcm_rfc4115_profile *p,
> - struct rte_meter_trtcm_rfc4115_params *params)
> -{
> - return __rte_meter_trtcm_rfc4115_profile_config(p, params);
> -}
> -BIND_DEFAULT_SYMBOL(rte_meter_trtcm_rfc4115_profile_config, _s, 21);
> -MAP_STATIC_SYMBOL(int rte_meter_trtcm_rfc4115_profile_config(struct rte_meter_trtcm_rfc4115_profile *p,
> - struct rte_meter_trtcm_rfc4115_params *params), rte_meter_trtcm_rfc4115_profile_config_s);
> -
> -int
> -rte_meter_trtcm_rfc4115_profile_config_e(
> - struct rte_meter_trtcm_rfc4115_profile *p,
> - struct rte_meter_trtcm_rfc4115_params *params);
> -int
> -rte_meter_trtcm_rfc4115_profile_config_e(
> - struct rte_meter_trtcm_rfc4115_profile *p,
> - struct rte_meter_trtcm_rfc4115_params *params)
> -{
> - return __rte_meter_trtcm_rfc4115_profile_config(p, params);
> -}
> -VERSION_SYMBOL_EXPERIMENTAL(rte_meter_trtcm_rfc4115_profile_config, _e);
> -
> -/*
> - * ABI aliasing done for 'rte_meter_trtcm_rfc4115_config'
> - * to support both EXPERIMENTAL and DPDK_21 versions
> - * This versioning will be removed on next ABI version (v20.11)
> - * and '__rte_meter_trtcm_rfc4115_config' will be restrored back to
> - * 'rte_meter_trtcm_rfc4115_config' without versioning.
> - */
> -static int
> -__rte_meter_trtcm_rfc4115_config(
> +rte_meter_trtcm_rfc4115_config(
> struct rte_meter_trtcm_rfc4115 *m,
> struct rte_meter_trtcm_rfc4115_profile *p)
> {
> @@ -203,27 +160,3 @@ __rte_meter_trtcm_rfc4115_config(
>
> return 0;
> }
> -
> -int
> -rte_meter_trtcm_rfc4115_config_s(struct rte_meter_trtcm_rfc4115 *m,
> - struct rte_meter_trtcm_rfc4115_profile *p);
> -int
> -rte_meter_trtcm_rfc4115_config_s(struct rte_meter_trtcm_rfc4115 *m,
> - struct rte_meter_trtcm_rfc4115_profile *p)
> -{
> - return __rte_meter_trtcm_rfc4115_config(m, p);
> -}
> -BIND_DEFAULT_SYMBOL(rte_meter_trtcm_rfc4115_config, _s, 21);
> -MAP_STATIC_SYMBOL(int rte_meter_trtcm_rfc4115_config(struct rte_meter_trtcm_rfc4115 *m,
> - struct rte_meter_trtcm_rfc4115_profile *p), rte_meter_trtcm_rfc4115_config_s);
> -
> -int
> -rte_meter_trtcm_rfc4115_config_e(struct rte_meter_trtcm_rfc4115 *m,
> - struct rte_meter_trtcm_rfc4115_profile *p);
> -int
> -rte_meter_trtcm_rfc4115_config_e(struct rte_meter_trtcm_rfc4115 *m,
> - struct rte_meter_trtcm_rfc4115_profile *p)
> -{
> - return __rte_meter_trtcm_rfc4115_config(m, p);
> -}
> -VERSION_SYMBOL_EXPERIMENTAL(rte_meter_trtcm_rfc4115_config, _e);
> diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
> index e2a2607f28..b67f860b15 100644
> --- a/lib/librte_meter/rte_meter_version.map
> +++ b/lib/librte_meter/rte_meter_version.map
> @@ -10,10 +10,3 @@ DPDK_21 {
>
> local: *;
> };
> -
> -EXPERIMENTAL {
> - global:
> -
> - rte_meter_trtcm_rfc4115_config;
> - rte_meter_trtcm_rfc4115_profile_config;
> -};
>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
@@ -9,7 +9,6 @@
#include <rte_common.h>
#include <rte_log.h>
#include <rte_cycles.h>
-#include <rte_function_versioning.h>
#include "rte_meter.h"
@@ -120,15 +119,8 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m,
return 0;
}
-/*
- * ABI aliasing done for 'rte_meter_trtcm_rfc4115_profile_config'
- * to support both EXPERIMENTAL and DPDK_21 versions
- * This versioning will be removed on next ABI version (v20.11)
- * and '__rte_meter_trtcm_rfc4115_profile_config' will be restrored back to
- * 'rte_meter_trtcm_rfc4115_profile_config' without versioning.
- */
-static int
-__rte_meter_trtcm_rfc4115_profile_config(
+int
+rte_meter_trtcm_rfc4115_profile_config(
struct rte_meter_trtcm_rfc4115_profile *p,
struct rte_meter_trtcm_rfc4115_params *params)
{
@@ -153,42 +145,7 @@ __rte_meter_trtcm_rfc4115_profile_config(
}
int
-rte_meter_trtcm_rfc4115_profile_config_s(
- struct rte_meter_trtcm_rfc4115_profile *p,
- struct rte_meter_trtcm_rfc4115_params *params);
-int
-rte_meter_trtcm_rfc4115_profile_config_s(
- struct rte_meter_trtcm_rfc4115_profile *p,
- struct rte_meter_trtcm_rfc4115_params *params)
-{
- return __rte_meter_trtcm_rfc4115_profile_config(p, params);
-}
-BIND_DEFAULT_SYMBOL(rte_meter_trtcm_rfc4115_profile_config, _s, 21);
-MAP_STATIC_SYMBOL(int rte_meter_trtcm_rfc4115_profile_config(struct rte_meter_trtcm_rfc4115_profile *p,
- struct rte_meter_trtcm_rfc4115_params *params), rte_meter_trtcm_rfc4115_profile_config_s);
-
-int
-rte_meter_trtcm_rfc4115_profile_config_e(
- struct rte_meter_trtcm_rfc4115_profile *p,
- struct rte_meter_trtcm_rfc4115_params *params);
-int
-rte_meter_trtcm_rfc4115_profile_config_e(
- struct rte_meter_trtcm_rfc4115_profile *p,
- struct rte_meter_trtcm_rfc4115_params *params)
-{
- return __rte_meter_trtcm_rfc4115_profile_config(p, params);
-}
-VERSION_SYMBOL_EXPERIMENTAL(rte_meter_trtcm_rfc4115_profile_config, _e);
-
-/*
- * ABI aliasing done for 'rte_meter_trtcm_rfc4115_config'
- * to support both EXPERIMENTAL and DPDK_21 versions
- * This versioning will be removed on next ABI version (v20.11)
- * and '__rte_meter_trtcm_rfc4115_config' will be restrored back to
- * 'rte_meter_trtcm_rfc4115_config' without versioning.
- */
-static int
-__rte_meter_trtcm_rfc4115_config(
+rte_meter_trtcm_rfc4115_config(
struct rte_meter_trtcm_rfc4115 *m,
struct rte_meter_trtcm_rfc4115_profile *p)
{
@@ -203,27 +160,3 @@ __rte_meter_trtcm_rfc4115_config(
return 0;
}
-
-int
-rte_meter_trtcm_rfc4115_config_s(struct rte_meter_trtcm_rfc4115 *m,
- struct rte_meter_trtcm_rfc4115_profile *p);
-int
-rte_meter_trtcm_rfc4115_config_s(struct rte_meter_trtcm_rfc4115 *m,
- struct rte_meter_trtcm_rfc4115_profile *p)
-{
- return __rte_meter_trtcm_rfc4115_config(m, p);
-}
-BIND_DEFAULT_SYMBOL(rte_meter_trtcm_rfc4115_config, _s, 21);
-MAP_STATIC_SYMBOL(int rte_meter_trtcm_rfc4115_config(struct rte_meter_trtcm_rfc4115 *m,
- struct rte_meter_trtcm_rfc4115_profile *p), rte_meter_trtcm_rfc4115_config_s);
-
-int
-rte_meter_trtcm_rfc4115_config_e(struct rte_meter_trtcm_rfc4115 *m,
- struct rte_meter_trtcm_rfc4115_profile *p);
-int
-rte_meter_trtcm_rfc4115_config_e(struct rte_meter_trtcm_rfc4115 *m,
- struct rte_meter_trtcm_rfc4115_profile *p)
-{
- return __rte_meter_trtcm_rfc4115_config(m, p);
-}
-VERSION_SYMBOL_EXPERIMENTAL(rte_meter_trtcm_rfc4115_config, _e);
@@ -10,10 +10,3 @@ DPDK_21 {
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_meter_trtcm_rfc4115_config;
- rte_meter_trtcm_rfc4115_profile_config;
-};