patch 'telemetry: add missing C++ guards' has been queued to stable release 20.11.5
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Mon Feb 28 22:19:59 CET 2022
Hi,
FYI, your patch has been queued to stable release 20.11.5
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/02/22. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/f749277d0828804da96f741eed8f782f04127df4
Thanks.
Luca Boccassi
---
>From f749277d0828804da96f741eed8f782f04127df4 Mon Sep 17 00:00:00 2001
From: Brian Dooley <brian.dooley at intel.com>
Date: Wed, 16 Feb 2022 15:14:47 +0000
Subject: [PATCH] telemetry: add missing C++ guards
[ upstream commit cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 ]
Some public header files were missing 'extern "C"' C++ guards,
and couldn't be used by C++ applications. Add the missing guards.
Fixes: 8877ac688b52 ("telemetry: introduce infrastructure")
Signed-off-by: Brian Dooley <brian.dooley at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
lib/librte_telemetry/rte_telemetry.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h
index 9cd6d0cd4c..fb4842a56e 100644
--- a/lib/librte_telemetry/rte_telemetry.h
+++ b/lib/librte_telemetry/rte_telemetry.h
@@ -11,8 +11,13 @@
#ifndef _RTE_TELEMETRY_H_
#define _RTE_TELEMETRY_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/** Maximum number of telemetry callbacks. */
#define TELEMETRY_MAX_CALLBACKS 64
+
/** Maximum length for string used in object. */
#define RTE_TEL_MAX_STRING_LEN 64
/** Maximum length of string. */
@@ -341,4 +346,8 @@ __rte_experimental
void
rte_tel_data_free(struct rte_tel_data *data);
+#ifdef __cplusplus
+}
+#endif
+
#endif
--
2.30.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-02-28 21:17:54.258354925 +0000
+++ 0003-telemetry-add-missing-C-guards.patch 2022-02-28 21:17:53.788928092 +0000
@@ -1 +1 @@
-From cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 Mon Sep 17 00:00:00 2001
+From f749277d0828804da96f741eed8f782f04127df4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -16,2 +17,2 @@
- lib/telemetry/rte_telemetry.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ lib/librte_telemetry/rte_telemetry.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
@@ -19,5 +20,5 @@
-diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
-index 7bca8a9a49..3372b32f38 100644
---- a/lib/telemetry/rte_telemetry.h
-+++ b/lib/telemetry/rte_telemetry.h
-@@ -9,6 +9,10 @@
+diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h
+index 9cd6d0cd4c..fb4842a56e 100644
+--- a/lib/librte_telemetry/rte_telemetry.h
++++ b/lib/librte_telemetry/rte_telemetry.h
+@@ -11,8 +11,13 @@
@@ -30,0 +32,3 @@
+ /** Maximum number of telemetry callbacks. */
+ #define TELEMETRY_MAX_CALLBACKS 64
++
@@ -32 +36 @@
- #define RTE_TEL_MAX_STRING_LEN 128
+ #define RTE_TEL_MAX_STRING_LEN 64
@@ -34 +38 @@
-@@ -294,4 +298,8 @@ rte_tel_data_alloc(void);
+@@ -341,4 +346,8 @@ __rte_experimental
More information about the stable
mailing list