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 AC5EEA0350 for ; Mon, 28 Feb 2022 22:20:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0B8941181; Mon, 28 Feb 2022 22:20:55 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 1795841181 for ; Mon, 28 Feb 2022 22:20:53 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id bg16-20020a05600c3c9000b00380f6f473b0so199476wmb.1 for ; Mon, 28 Feb 2022 13:20:53 -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=X9CmRZHjSK6xgLsJci4utpTcLqDB5vOU72XVETcnVXY=; b=mnntvDfQ4dAHZDpNctLQEJoyxLdewSCR+qg2bC/etkmtu23ieeI5recxOowjrhXxKP i8IMOQIT6gjYk7bTvAznTLrUODoVOTVH8SHedimnHN+1tupimpp9GAbKuxCcWJxlQSuN vw6mHJTNVSakbQ8zN7La0XlTqEgQIKSx6etNZ/SxIr5G4Zb/NMrBDMZrNGKJyH909wSc CFFezM9Sm2b3jeabwHv5mggETvAZogDHxmIwXBcNvIckGt9wPuXEUPiusKumEIRu+3ub agd1VD6wy2zWW5GzeS6pMZsUpXAzl8XSSCm8e/+sRh9X451hZNusqYdmHlkEFZ0CBPt8 +kVg== 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=X9CmRZHjSK6xgLsJci4utpTcLqDB5vOU72XVETcnVXY=; b=A1gN0nPNt5A0rHzaxr5jE7G/7bwkIHkcj9tZb/xxlBT+eqeCr6SJ65T3PVT2wz2swA fWPZRwl4PBf+BlKsFlz6jjlDoAMFsc1nZfUl3brRVGOupHmEbhuhLPb0ppG2mZB84MuN K7chcCgE4kBXvgLZr9YIkKQ106enGVxlkVbA8Gcv3gTplEMHkcJmYnVBYPHO/CJEgxjM Tcvf10xKkFQ5yoIpPxZji3AxqcxauKTVWyimWFexeUuN2RrAsFsXkvPslrZQtxAa27t/ FokynV5s6k4x6vM9lwT6mvpJ4yvU4TshbDNiYlVCvBW7GGaIFd+Q0vFlGWB8m29xCSEY MRcQ== X-Gm-Message-State: AOAM532mq+V0H2ifGcqdc8Ln/zIgznZsXQh22FyzW/3XRQYrQijuUA11 /xkgUkoUPkeqhqS1l11nWF5pGQk09y62/w== X-Google-Smtp-Source: ABdhPJz07bVi45UfReKw0cqxkV6R7CM4yLu+Y+K5tu8r8YdmGqB78vdprWPY9aKF9pAp3AMgaR94HQ== X-Received: by 2002:a1c:46c2:0:b0:381:2353:140b with SMTP id t185-20020a1c46c2000000b003812353140bmr14856781wma.76.1646083252813; Mon, 28 Feb 2022 13:20:52 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id u4-20020adfdb84000000b001e8d8ac5394sm12142801wri.110.2022.02.28.13.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:20:52 -0800 (PST) From: luca.boccassi@gmail.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'telemetry: add missing C++ guards' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:19:59 +0000 Message-Id: <20220228212047.3341966-3-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/f749277d0828804da96f741eed8f782f04127df4 Thanks. Luca Boccassi --- >From f749277d0828804da96f741eed8f782f04127df4 Mon Sep 17 00:00:00 2001 From: Brian Dooley 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 Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- 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@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