patch 'metrics: 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:20:01 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/8f9c5d8497f713ca4133655dbf9b10dc7fb00a75

Thanks.

Luca Boccassi

---
>From 8f9c5d8497f713ca4133655dbf9b10dc7fb00a75 Mon Sep 17 00:00:00 2001
From: Brian Dooley <brian.dooley at intel.com>
Date: Wed, 16 Feb 2022 15:14:49 +0000
Subject: [PATCH] metrics: add missing C++ guards

[ upstream commit 4e90b3a3d6cc476ee1a39be7368675c31a28b093 ]

Some public header files were missing 'extern "C"' C++ guards,
and couldn't be used by C++ applications. Add the missing guards.

Fixes: c5b7197f662e ("telemetry: move some functions to metrics library")

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_metrics/rte_metrics_telemetry.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/librte_metrics/rte_metrics_telemetry.h
index 5dbb32ca0c..ce9408ab10 100644
--- a/lib/librte_metrics/rte_metrics_telemetry.h
+++ b/lib/librte_metrics/rte_metrics_telemetry.h
@@ -13,6 +13,9 @@
 #ifndef _RTE_METRICS_TELEMETRY_H_
 #define _RTE_METRICS_TELEMETRY_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 enum rte_telemetry_stats_type {
 	PORT_STATS = 0,
@@ -60,4 +63,8 @@ __rte_experimental
 int32_t
 rte_metrics_tel_extract_data(struct telemetry_encode_param *ep, json_t *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.414359429 +0000
+++ 0005-metrics-add-missing-C-guards.patch	2022-02-28 21:17:53.800928355 +0000
@@ -1 +1 @@
-From 4e90b3a3d6cc476ee1a39be7368675c31a28b093 Mon Sep 17 00:00:00 2001
+From 8f9c5d8497f713ca4133655dbf9b10dc7fb00a75 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4e90b3a3d6cc476ee1a39be7368675c31a28b093 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- lib/metrics/rte_metrics_telemetry.h | 7 +++++++
+ lib/librte_metrics/rte_metrics_telemetry.h | 7 +++++++
@@ -19,4 +20,4 @@
-diff --git a/lib/metrics/rte_metrics_telemetry.h b/lib/metrics/rte_metrics_telemetry.h
-index 2b6eb1ccc8..09b14d9336 100644
---- a/lib/metrics/rte_metrics_telemetry.h
-+++ b/lib/metrics/rte_metrics_telemetry.h
+diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/librte_metrics/rte_metrics_telemetry.h
+index 5dbb32ca0c..ce9408ab10 100644
+--- a/lib/librte_metrics/rte_metrics_telemetry.h
++++ b/lib/librte_metrics/rte_metrics_telemetry.h


More information about the stable mailing list