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 21DC6A0350 for ; Mon, 28 Feb 2022 22:20:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1CA9C411B8; Mon, 28 Feb 2022 22:20:57 +0100 (CET) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mails.dpdk.org (Postfix) with ESMTP id 938824068C for ; Mon, 28 Feb 2022 22:20:55 +0100 (CET) Received: by mail-ed1-f48.google.com with SMTP id s1so19379104edd.13 for ; Mon, 28 Feb 2022 13:20:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mn+RbOmr+l5f2FfrujYXxZLamGAE+NyEPxZvGbrzbSM=; b=ULvxW9tg+AHS8Rc5VP2fc5c1DzhvD881wKhlq7pBJrCa5EHNdyqx8CacS4uHq1r9PC Z1mzt23ki/8gp/kMNhof7vxBtS3oDpP1ozTrr0AZaBBbYAGXGTPfreKaPt2uDCh99JTQ nJ8qy+yQBnFgoUEjg5x6z3hfTfZNd6+2ncwiuvLkprgMYoPtjNVni0Lj8BnXl3pveUWY IbA05A5OrVCl75/LuulTVxdAPiUV1DeZRW+b9F+Ybwtd//mxqO5hrZRMRaTRjmGp/ISb ydwVaWMJUgiImV51jbht9FzBOR5ZIsY/uMs2tFGOhXb1CCOorqUIbUcPaY+Qr6ugzdwK +oQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mn+RbOmr+l5f2FfrujYXxZLamGAE+NyEPxZvGbrzbSM=; b=Bz/46DrGfEghk31jHGJC7+hnxYWRa0bWje1sEFfxJC/vQw5Pn7Z9DziFUEKyNTw6Ml LZC3nVc4qU+SlLaN6CFlwm7tSMalxm6x8hWaZE7LPdLT/K5mj3efLOfna8E01jS1GyQu Ue39PSI/jPLbMU0NmV2aabOyrB/FCwaFiiLmQuPJlUVeVgdlX3mU7OZ51Unm7n870N5Y dZvC6vL2aosdRXWp6wbSljF5gh1otQt+cfRMGS56itbCKiiy8H5ieH1QU6qSmlCPfzu3 P18ZwmQhfIUPdZ4XUtBwlxx3Ud1lbZpnsB8zr5YUz2gyGYdk03kYhMgcqHfvShz8gE5u FjAQ== X-Gm-Message-State: AOAM533RtKX/uaaBtybx3SfkTIWTZX/gK/GyB2M9K+xtWZm852VMyvP7 3tZJ8s/5uY5dwssccLTtORLA0ILBPGCKtQ== X-Google-Smtp-Source: ABdhPJxUytcDSSITqCroijUmjq2UwtizjB9NEJMStOqHFWy41b3u5nYBt3Qj3OnwuRlvXOJCcKliPw== X-Received: by 2002:aa7:db47:0:b0:413:7649:c2bb with SMTP id n7-20020aa7db47000000b004137649c2bbmr16831897edt.123.1646083255160; Mon, 28 Feb 2022 13:20:55 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id y14-20020a50eb8e000000b00410a2e7798dsm6398482edr.38.2022.02.28.13.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:20:54 -0800 (PST) From: luca.boccassi@gmail.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'metrics: add missing C++ guards' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:01 +0000 Message-Id: <20220228212047.3341966-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 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/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@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