* [dpdk-dev] [PATCH] meter: remove experimental alias
@ 2020-08-17 10:18 Ferruh Yigit
2020-08-17 10:22 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit
2020-08-18 8:21 ` [dpdk-dev] [PATCH] " Kinsella, Ray
0 siblings, 2 replies; 5+ messages in thread
From: Ferruh Yigit @ 2020-08-17 10:18 UTC (permalink / raw)
To: Cristian Dumitrescu, Ray Kinsella, Neil Horman; +Cc: dev, Ferruh Yigit
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;
-};
--
2.25.4
^ permalink raw reply [flat|nested] 5+ messages in thread* [dpdk-dev] [PATCH v2] meter: remove experimental alias
2020-08-17 10:18 [dpdk-dev] [PATCH] meter: remove experimental alias Ferruh Yigit
@ 2020-08-17 10:22 ` Ferruh Yigit
2020-08-17 10:54 ` Dumitrescu, Cristian
2020-10-05 9:33 ` David Marchand
2020-08-18 8:21 ` [dpdk-dev] [PATCH] " Kinsella, Ray
1 sibling, 2 replies; 5+ messages in thread
From: Ferruh Yigit @ 2020-08-17 10:22 UTC (permalink / raw)
To: Cristian Dumitrescu, Ray Kinsella, Neil Horman; +Cc: dev, Ferruh Yigit
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>
---
v2:
* Update meson to remove 'use_function_versioning' flag
---
lib/librte_meter/meson.build | 1 -
lib/librte_meter/rte_meter.c | 73 ++------------------------
lib/librte_meter/rte_meter_version.map | 7 ---
3 files changed, 3 insertions(+), 78 deletions(-)
diff --git a/lib/librte_meter/meson.build b/lib/librte_meter/meson.build
index fce0368437..646fd4d43f 100644
--- a/lib/librte_meter/meson.build
+++ b/lib/librte_meter/meson.build
@@ -3,4 +3,3 @@
sources = files('rte_meter.c')
headers = files('rte_meter.h')
-use_function_versioning = true
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;
-};
--
2.25.4
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dpdk-dev] [PATCH v2] meter: remove experimental alias
2020-08-17 10:22 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit
@ 2020-08-17 10:54 ` Dumitrescu, Cristian
2020-10-05 9:33 ` David Marchand
1 sibling, 0 replies; 5+ messages in thread
From: Dumitrescu, Cristian @ 2020-08-17 10:54 UTC (permalink / raw)
To: Yigit, Ferruh, Ray Kinsella, Neil Horman; +Cc: dev
> -----Original Message-----
> From: Yigit, Ferruh <ferruh.yigit@intel.com>
> Sent: Monday, August 17, 2020 11:22 AM
> To: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Ray Kinsella
> <mdr@ashroe.eu>; Neil Horman <nhorman@tuxdriver.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>
> Subject: [PATCH v2] meter: remove experimental alias
>
> 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>
> ---
> v2:
> * Update meson to remove 'use_function_versioning' flag
> ---
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dpdk-dev] [PATCH v2] meter: remove experimental alias
2020-08-17 10:22 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit
2020-08-17 10:54 ` Dumitrescu, Cristian
@ 2020-10-05 9:33 ` David Marchand
1 sibling, 0 replies; 5+ messages in thread
From: David Marchand @ 2020-10-05 9:33 UTC (permalink / raw)
To: Ferruh Yigit; +Cc: Cristian Dumitrescu, Ray Kinsella, Neil Horman, dev
On Mon, Aug 17, 2020 at 12:22 PM Ferruh Yigit <ferruh.yigit@intel.com> 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>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
Applied, thanks Ferruh.
--
David Marchand
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH] meter: remove experimental alias
2020-08-17 10:18 [dpdk-dev] [PATCH] meter: remove experimental alias Ferruh Yigit
2020-08-17 10:22 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit
@ 2020-08-18 8:21 ` Kinsella, Ray
1 sibling, 0 replies; 5+ messages in thread
From: Kinsella, Ray @ 2020-08-18 8:21 UTC (permalink / raw)
To: Ferruh Yigit, Cristian Dumitrescu, Neil Horman; +Cc: dev
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-05 9:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-17 10:18 [dpdk-dev] [PATCH] meter: remove experimental alias Ferruh Yigit
2020-08-17 10:22 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit
2020-08-17 10:54 ` Dumitrescu, Cristian
2020-10-05 9:33 ` David Marchand
2020-08-18 8:21 ` [dpdk-dev] [PATCH] " Kinsella, Ray
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).