From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B4419A034F for ; Tue, 1 Mar 2022 11:43:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6718D426E4; Tue, 1 Mar 2022 11:43:26 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 87BF5426D9 for ; Tue, 1 Mar 2022 11:43:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6O+g8mSv1QmGLwC5NDeV3dBLL6mxx3/FcEtGmlB7Qlo=; b=Eq0eXeq9yVMb7/DbRA7qhfuGD4ZBG3Gj6Ku+4bC4qv1ARkKY9/bT/RdryGxJuR/XpSo8gk b5ONqFzdGcoiS7L50vjxeNxicnYPT4aLrbMmWkXLepWTL9VVGZaSH1AHL2SG/SJAxQzexL i6FEDw3xccwO+//M2YThx1sPEEdJaXY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-464-2ztMm0NQPsazAQcoZnr4Gg-1; Tue, 01 Mar 2022 05:43:20 -0500 X-MC-Unique: 2ztMm0NQPsazAQcoZnr4Gg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CBBF1801AB2; Tue, 1 Mar 2022 10:43:19 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DCAE7554A; Tue, 1 Mar 2022 10:43:18 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'metrics: add missing C++ guards' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:21 +0000 Message-Id: <20220301104300.334382-5-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 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/06/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/447210e07c60732669a14fe09021ae39deb191ae Thanks. Kevin --- >From 447210e07c60732669a14fe09021ae39deb191ae Mon Sep 17 00:00:00 2001 From: Brian Dooley 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 Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/metrics/rte_metrics_telemetry.h | 7 +++++++ 1 file changed, 7 insertions(+) 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 @@ -14,4 +14,7 @@ #define _RTE_METRICS_TELEMETRY_H_ +#ifdef __cplusplus +extern "C" { +#endif enum rte_telemetry_stats_type { @@ -61,3 +64,7 @@ int32_t rte_metrics_tel_extract_data(struct telemetry_encode_param *ep, json_t *data); +#ifdef __cplusplus +} +#endif + #endif -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.598034067 +0000 +++ 0005-metrics-add-missing-C-guards.patch 2022-03-01 10:41:01.241244085 +0000 @@ -1 +1 @@ -From 4e90b3a3d6cc476ee1a39be7368675c31a28b093 Mon Sep 17 00:00:00 2001 +From 447210e07c60732669a14fe09021ae39deb191ae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4e90b3a3d6cc476ee1a39be7368675c31a28b093 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org