Re: [PATCH] windows: make getopt functions have const properties
Is "lib/eal/windows/getopt.c.orig" committed by mistake or the license mandates storing the original code? Acked-by: Dmitry Kozlyuk
[PATCH v2] windows: make getopt functions have const properties
Having different prototypes on different platforms can lead
to lots of unnecessary workarounds. Looks like the version of
getopt used from windows was based on an older out of date
version from FreeBSD.
This patch changes getopt, getopt_long, etc to have the same const
attributes as Linux and FreeBSD. The changes are derived from
the current FreeBSD version of getopt_long.
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
Acked-by: Dmitry Kozlyuk
---
v2 - remove orig file
lib/eal/windows/getopt.c | 23 ---
lib/eal/windows/include/getopt.h | 8
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/lib/eal/windows/getopt.c b/lib/eal/windows/getopt.c
index a1f51c6c2318..50ff71b9300d 100644
--- a/lib/eal/windows/getopt.c
+++ b/lib/eal/windows/getopt.c
@@ -20,7 +20,7 @@
#include
#include
-const char*optarg; /* argument associated with option */
+char*optarg; /* argument associated with option */
intopterr = 1; /* if error message should be printed */
intoptind = 1; /* index into parent argv vector */
intoptopt = '?'; /* character checked for validity */
@@ -39,9 +39,9 @@ static void pass(const char *a) {(void) a; }
#defineBADARG ((*options == ':') ? (int)':' : (int)'?')
#defineINORDER 1
-#defineEMSG""
+static char EMSG[] = "";
-static const char *place = EMSG; /* option letter processing */
+static char *place = EMSG; /* option letter processing */
/* XXX: set optreset to 1 rather than these two */
static int nonopt_start = -1; /* first non option argument (for permute) */
@@ -80,7 +80,7 @@ gcd(int a, int b)
*/
static void
permute_args(int panonopt_start, int panonopt_end, int opt_end,
- char **nargv)
+ char * const *nargv)
{
int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
char *swap;
@@ -101,11 +101,12 @@ permute_args(int panonopt_start, int panonopt_end, int
opt_end,
pos -= nnonopts;
else
pos += nopts;
+
swap = nargv[pos];
/* LINTED const cast */
- ((char **) nargv)[pos] = nargv[cstart];
+ ((char **)(uintptr_t)nargv)[pos] = nargv[cstart];
/* LINTED const cast */
- ((char **)nargv)[cstart] = swap;
+ ((char **)(uintptr_t)nargv)[cstart] = swap;
}
}
}
@@ -116,7 +117,7 @@ permute_args(int panonopt_start, int panonopt_end, int
opt_end,
* Returns -1 if short_too is set and the option does not match long_options.
*/
static int
-parse_long_options(char **nargv, const char *options,
+parse_long_options(char * const *nargv, const char *options,
const struct option *long_options, int *idx, int short_too)
{
const char *current_argv;
@@ -236,7 +237,7 @@ parse_long_options(char **nargv, const char *options,
* Parse argc/argv argument vector. Called by user level routines.
*/
static int
-getopt_internal(int nargc, char **nargv, const char *options,
+getopt_internal(int nargc, char *const nargv[], const char *options,
const struct option *long_options, int *idx, int flags)
{
char *oli; /* option letter list index */
@@ -434,7 +435,7 @@ getopt_internal(int nargc, char **nargv, const char
*options,
* Parse argc/argv argument vector.
*/
int
-getopt(int nargc, char *nargv[], const char *options)
+getopt(int nargc, char *const nargv[], const char *options)
{
return getopt_internal(nargc, nargv, options, NULL, NULL,
FLAG_PERMUTE);
@@ -445,7 +446,7 @@ getopt(int nargc, char *nargv[], const char *options)
* Parse argc/argv argument vector.
*/
int
-getopt_long(int nargc, char *nargv[], const char *options,
+getopt_long(int nargc, char *const nargv[], const char *options,
const struct option *long_options, int *idx)
{
@@ -458,7 +459,7 @@ getopt_long(int nargc, char *nargv[], const char *options,
* Parse argc/argv argument vector.
*/
int
-getopt_long_only(int nargc, char *nargv[], const char *options,
+getopt_long_only(int nargc, char *const nargv[], const char *options,
const struct option *long_options, int *idx)
{
diff --git a/lib/eal/windows/include/getopt.h b/lib/eal/windows/include/getopt.h
index 6f57af454b17..e4cf6873cb0c 100644
--- a/lib/eal/windows/include/getopt.h
+++ b/lib/eal/windows/include/getopt.h
@@ -44,7 +44,7 @@
/** argument to current option, or NULL if it has none */
-extern const char *optarg;
+extern char *optarg;
/** Current position in arg string. Starts from 1.
* Setting to 0 resets state.
*/
@@ -80,14 +80,14 @@ struct option {
};
/** Compat: getopt */
-int getopt(int argc, char *argv[], const char *options);
+i
[DPDK/examples Bug 1390] examples/l3fwd: in event mode tries to RX for not ready port
https://bugs.dpdk.org/show_bug.cgi?id=1390 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #1 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=495709d32b -- You are receiving this mail because: You are the assignee for the bug.
[DPDK/ethdev Bug 1146] bnx2x: rte_memcpy buffer overflows
https://bugs.dpdk.org/show_bug.cgi?id=1146 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Resolution|--- |FIXED Status|UNCONFIRMED |RESOLVED --- Comment #2 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=c50b86f7d6 -- You are receiving this mail because: You are the assignee for the bug.
[DPDK/eventdev Bug 1368] inconsistency in eventdev dev_info and config structs makes some valid configs impossible
https://bugs.dpdk.org/show_bug.cgi?id=1368 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #3 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=1203462c5a -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH v2 4/5] argparse: fix argument flags operate as uint32 type
07/03/2024 14:07, Chengwen Feng: > --- a/app/test/test_argparse.c > +++ b/app/test/test_argparse.c > +#define TEST_ARGPARSE_FLAG_HAS_ARG_BITMASK RTE_SHIFT_VAL64(3, 0) > +#define TEST_ARGPARSE_FLAG_VAL_TYPE_BITMASK RTE_SHIFT_VAL64(255, 2) These masks should be defined in the API probably.
Re: [PATCH v3] app/dma-perf: add average latency per worker
12/03/2024 02:53, fengchengwen: > On 2024/3/9 3:06, Vipin Varghese wrote: > > Modify the user information with total average latency per worker > > in both CSV and console logs. > > > > Signed-off-by: Vipin Varghese > > > > V3 Changes: > > - update CSV_TOTAL_LINE_FMT to change Avg Cycles / op per worker > > > > V2 Changes: > > - keep one-digit precision is enough, suggested by Chengwen The changelog should not appear in git so it must be below the 3 dashes. > > --- > > app/test-dma-perf/benchmark.c | 7 --- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > Acked-by: Chengwen Feng Applied, thanks.
[PATCH v2 1/1] eal: add C++ include guard in generic/rte_vect.h
The header was missing the extern "C" directive which causes name
mangling of functions by C++ compilers, leading to linker errors
complaining of undefined references to these functions.
Also updated the coding style contribution guideline with a new
"Language Linkage" section stating `extern "C"` block should be added to
public headers.
Fixes: 86c743cf9140 ("eal: define generic vector types")
Cc: nelio.laranje...@6wind.com
Cc: sta...@dpdk.org
Signed-off-by: Ashish Sadanandan
---
.mailmap | 2 +-
doc/guides/contributing/coding_style.rst | 21 +
lib/eal/include/generic/rte_vect.h | 8
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index 50726e1232..24de59ba89 100644
--- a/.mailmap
+++ b/.mailmap
@@ -142,7 +142,7 @@ Ashijeet Acharya
Ashish Gupta
Ashish Jain
Ashish Paul
-Ashish Sadanandan
+Ashish Sadanandan
Ashish Shah
Ashwin Sekhar T K
Asim Jamshed
diff --git a/doc/guides/contributing/coding_style.rst
b/doc/guides/contributing/coding_style.rst
index 1ebc79ca3c..da57cc1f80 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -106,6 +106,27 @@ Headers should be protected against multiple inclusion
with the usual:
#endif /* _FILE_H_ */
+Language Linkage
+
+
+Public headers should enclose all function and variable declarations and
defintions in an ``extern "C"`` block to facilitate interoperability with C++.
+
+.. code-block:: c
+
+ #ifndef _FILE_H_
+ #define _FILE_H_
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+ /* Code */
+
+ #ifdef __cplusplus
+ }
+ #endif
+
+ #endif /* _FILE_H_ */
Macros
~~
diff --git a/lib/eal/include/generic/rte_vect.h
b/lib/eal/include/generic/rte_vect.h
index 6540419cd2..3578d8749b 100644
--- a/lib/eal/include/generic/rte_vect.h
+++ b/lib/eal/include/generic/rte_vect.h
@@ -15,6 +15,10 @@
#include
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef RTE_TOOLCHAIN_MSVC
/* Unsigned vector types */
@@ -226,4 +230,8 @@ uint16_t rte_vect_get_max_simd_bitwidth(void);
*/
int rte_vect_set_max_simd_bitwidth(uint16_t bitwidth);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _RTE_VECT_H_ */
--
2.31.1
[PATCH v3 1/1] eal: add C++ include guard in generic/rte_vect.h
The header was missing the extern "C" directive which causes name
mangling of functions by C++ compilers, leading to linker errors
complaining of undefined references to these functions.
Also updated the coding style contribution guideline with a new
"Language Linkage" section stating `extern "C"` block should be added to
public headers.
Fixes: 86c743cf9140 ("eal: define generic vector types")
Cc: nelio.laranje...@6wind.com
Cc: sta...@dpdk.org
Signed-off-by: Ashish Sadanandan
---
.mailmap | 2 +-
doc/guides/contributing/coding_style.rst | 21 +
lib/eal/include/generic/rte_vect.h | 8
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index 50726e1232..24de59ba89 100644
--- a/.mailmap
+++ b/.mailmap
@@ -142,7 +142,7 @@ Ashijeet Acharya
Ashish Gupta
Ashish Jain
Ashish Paul
-Ashish Sadanandan
+Ashish Sadanandan
Ashish Shah
Ashwin Sekhar T K
Asim Jamshed
diff --git a/doc/guides/contributing/coding_style.rst
b/doc/guides/contributing/coding_style.rst
index 1ebc79ca3c..27c947fcec 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -106,6 +106,27 @@ Headers should be protected against multiple inclusion
with the usual:
#endif /* _FILE_H_ */
+Language Linkage
+
+
+Public headers should enclose all function and variable declarations and
definitions in an ``extern "C"`` block to facilitate interoperability with C++.
+
+.. code-block:: c
+
+ #ifndef _FILE_H_
+ #define _FILE_H_
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+ /* Code */
+
+ #ifdef __cplusplus
+ }
+ #endif
+
+ #endif /* _FILE_H_ */
Macros
~~
diff --git a/lib/eal/include/generic/rte_vect.h
b/lib/eal/include/generic/rte_vect.h
index 6540419cd2..3578d8749b 100644
--- a/lib/eal/include/generic/rte_vect.h
+++ b/lib/eal/include/generic/rte_vect.h
@@ -15,6 +15,10 @@
#include
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef RTE_TOOLCHAIN_MSVC
/* Unsigned vector types */
@@ -226,4 +230,8 @@ uint16_t rte_vect_get_max_simd_bitwidth(void);
*/
int rte_vect_set_max_simd_bitwidth(uint16_t bitwidth);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _RTE_VECT_H_ */
--
2.31.1
Re: [PATCH v2] doc: update size parameter details
12/03/2024 07:17, fengchengwen: > Sorry for same reply, > > @Vipin, > the title should reflect which submodule, so pls add prefix: test/dma-perf: No it should be app/dma-perf. If not sure about a prefix, you may check the git history for the directory. > Suggest: test/dma-perf: refine size parameter details in doc > Just a suggestion, you could refine it. > > On 2024/3/12 14:07, fengchengwen wrote: > > Acked-by: Chengwen Feng Please add your ack below the sign-off for clearer reply chain. > > On 2024/3/12 12:22, Vipin Varghese wrote: > >> For configuration parameters `mem_size` and `buf_size` are represented > >> as megabytes and bytes respectively in application. Update the > >> documentation and to represent the same. > >> > >> V2 Changes: > >> - add mem_size and buf_size in config.ini, suggested by Chengwen. > >> > >> Signed-off-by: Vipin Varghese Applied, thanks.
Re: [PATCH v2] dumpcap: correctly disable promiscuous mode at exit
08/03/2024 08:09, Isaac Boukris:
> On Fri, Mar 8, 2024 at 12:39 AM Stephen Hemminger
> wrote:
> >
> > From: Isaac Boukris
> >
> > If request to set promiscious mode failed at startup,
> > then it is not necessary to disable it when shutting down.
> >
> > This should only be issue if with a buggy driver because if
> > driver does not support setting promiscious it would just
> > ignore request to disable it as well.
> >
> > Fixes: 6026bfae07d4 ("app/dumpcap: support multiple interfaces")
> > Signed-off-by: Isaac Boukris
> > Signed-off-by: Stephen Hemminger
>
> V2 looks good to me.
>
> Thanks!
Applied, thanks.
Re: [PATCH] examples/ipsec-secgw: fix Rx queue ID in Rx callback
11/03/2024 03:32, Chaoyong He:
> From: Shihong Wang
>
> The Rx queue ID on the core and on the port are not necessarily
> equal, for example, there are two RX queues on core0, queue0 and
> queue1, queue0 is the rx_queueid0 on port0 and queue1 is the
> rx_queueid0 on port1.
>
> The 'rte_eth_add_rx_callback()' function is based on the port
> registration callback function, so should be the RX queue ID on
> the port.
>
> Fixes: d04bb1c52647 ("examples/ipsec-secgw: use HW parsed packet type in poll
> mode")
> Cc: sta...@dpdk.org
> Cc: Akhil Goyal
> Cc: Radu Nicolau
>
> Signed-off-by: Shihong Wang
> Reviewed-by: Chaoyong He
> Reviewed-by: Peng Zhang
Applied, thanks.
Re: [PATCH] maintainers: assign some programming guides
08/03/2024 11:41, David Marchand: > Maintaining the documentation is part of the job of maintaining a library. > > Signed-off-by: David Marchand Applied, thanks.
release candidate 24.03-rc3
A new DPDK release candidate is ready for testing: https://git.dpdk.org/dpdk/tag/?id=v24.03-rc3 There are 153 new patches in this snapshot. Release notes: https://doc.dpdk.org/guides/rel_notes/release_24_03.html As usual, you can report any issue on https://bugs.dpdk.org Only documentation and bug fixes should be accepted at this stage. DPDK 24.03-rc4 should be the last release candidate. The final release should be done on 27th if no surprise. Thank you everyone
Re: [PATCH] net/igc: fix disabling timesync
Tested-by: Tingting Liao
> -Original Message-
> From: Ma, WenwuX
> Sent: Friday, March 15, 2024 09:06
> To: dev@dpdk.org ; Guo, Junfeng ; Su,
> Simei
> Cc: Liao, TingtingX ; Ma, WenwuX
> ; sta...@dpdk.org
> Subject: [PATCH] net/igc: fix disabling timesync
>
> When disabling timesync, we should clear the IGC_RXPBS_CFG_TS_EN bit
> of IGC_RXPBS, the patch fixes this.
>
> Fixes: 4f6fbbf6f17d ("net/igc: support IEEE 1588 PTP")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Wenwu Ma
> ---
