From ca743ea84ee1fe59dec991d1ea766e9525675c0c Mon Sep 17 00:00:00 2001 From: Jasvinder Singh Date: Thu, 22 Oct 2015 15:03:03 +0100 Subject: [PATCH] cfgfile: increase entry name and value sizes This patch refers to the ABI change proposed for librte_cfgfile(rte_cfgfile.h). In order to allow for longer names and values, the values of macro CFG_NAME_LEN and CFG_VAL_LEN is increased. Signed-off-by: Jasvinder Singh Acked-by: Cristian Dumitrescu --- doc/guides/rel_notes/deprecation.rst | 4 ---- doc/guides/rel_notes/release_2_2.rst | 5 ++++- lib/librte_cfgfile/Makefile | 2 +- lib/librte_cfgfile/rte_cfgfile.h | 9 +++++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 018a11967f..a391ff091d 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -41,10 +41,6 @@ Deprecation Notices * The scheduler statistics structure will change to allow keeping track of RED actions. -* librte_cfgfile: In order to allow for longer names and values, - the value of macros CFG_NAME_LEN and CFG_NAME_VAL will be increased. - Most likely, the new values will be 64 and 256, respectively. - * librte_table: New functions for table entry bulk add/delete will be added to the table operations structure. diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst index 080fd9ffb0..ab1c25f1f0 100644 --- a/doc/guides/rel_notes/release_2_2.rst +++ b/doc/guides/rel_notes/release_2_2.rst @@ -119,6 +119,9 @@ ABI Changes * librte_port: Macros to access the packet meta-data stored within the packet buffer has been adjusted to cover the packet mbuf structure. +* librte_cfgfile: Allow longer names and values by increasing the constants + CFG_NAME_LEN and CFG_VALUE_LEN to 64 and 256 respectively. + Shared Library Versions ----------------------- @@ -129,7 +132,7 @@ The libraries prepended with a plus sign were incremented in this version. + libethdev.so.2 + librte_acl.so.2 - librte_cfgfile.so.1 + + librte_cfgfile.so.2 librte_cmdline.so.1 librte_distributor.so.1 + librte_eal.so.2 diff --git a/lib/librte_cfgfile/Makefile b/lib/librte_cfgfile/Makefile index 032c240f5e..616aef0927 100644 --- a/lib/librte_cfgfile/Makefile +++ b/lib/librte_cfgfile/Makefile @@ -41,7 +41,7 @@ CFLAGS += $(WERROR_FLAGS) EXPORT_MAP := rte_cfgfile_version.map -LIBABIVER := 1 +LIBABIVER := 2 # # all source are stored in SRCS-y diff --git a/lib/librte_cfgfile/rte_cfgfile.h b/lib/librte_cfgfile/rte_cfgfile.h index 7c9fc91671..d44378266f 100644 --- a/lib/librte_cfgfile/rte_cfgfile.h +++ b/lib/librte_cfgfile/rte_cfgfile.h @@ -47,8 +47,13 @@ extern "C" { * ***/ -#define CFG_NAME_LEN 32 -#define CFG_VALUE_LEN 64 +#ifndef CFG_NAME_LEN +#define CFG_NAME_LEN 64 +#endif + +#ifndef CFG_VALUE_LEN +#define CFG_VALUE_LEN 256 +#endif /** Configuration file */ struct rte_cfgfile; -- 2.20.1