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 21D5AA04A4 for ; Tue, 1 Mar 2022 15:08:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15C6540DF6; Tue, 1 Mar 2022 15:08:58 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 2D75A40DF6 for ; Tue, 1 Mar 2022 15:08:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646143736; x=1677679736; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qc/3elsjB2A3qZ0+in0AsEfDLCwlgDobZfxxtC9Jwmg=; b=J4mYZ0Loh1IJB2gLCvGPQcaKnVNKI6faHKJc1B7Z2HNEnNUDxmKl7UoA FzFIKX98D5wMyqqkFSU8SIKWqQ6b6JRpQt97dGPCxZyZbW7sKloyxDOgW gaRQ8Sml9XjgdyMJNP+PFebHPhzrAOtnxCcaP+aJ+iD4D/KABQXcV5agN Ph65JFiqsBz0N2JblD0NPwQSWYvD1BVtwNtQdgY5nT+ofBT4EFxnQgJKP 7z5aAGsqI5AxZjOoYQvgyl4VhSNuz9+IIPqFCJ5A8RIw4z1DGUqSSnayd sWwtGikIYQ5QbKoQSlMkeJyo5ajsDNXBOxCMkQ4pi+iCX+DoN8b1sg1+J A==; X-IronPort-AV: E=McAfee;i="6200,9189,10272"; a="251967496" X-IronPort-AV: E=Sophos;i="5.90,146,1643702400"; d="scan'208";a="251967496" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 06:08:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,146,1643702400"; d="scan'208";a="510522975" Received: from silpixa00399126.ir.intel.com ([10.237.223.34]) by orsmga006.jf.intel.com with ESMTP; 01 Mar 2022 06:08:54 -0800 From: Bruce Richardson To: stable@dpdk.org Cc: christian.ehrhardt@canonical.com, Bruce Richardson Subject: [PATCH 19.11 2/4] eal: fix C++ include Date: Tue, 1 Mar 2022 14:08:36 +0000 Message-Id: <20220301140838.406891-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220301140838.406891-1-bruce.richardson@intel.com> References: <20220301140838.406891-1-bruce.richardson@intel.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 C++ files could not include some headers because "new" is a keyword in C++, so can't be a variable name Fixes: 184104fc6121 ("ticketlock: introduce fair ticket based locking") Cc: stable@dpdk.org (This is a backport of patch 59144f6edd from mainline) Signed-off-by: Bruce Richardson --- .../common/include/generic/rte_ticketlock.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/librte_eal/common/include/generic/rte_ticketlock.h b/lib/librte_eal/common/include/generic/rte_ticketlock.h index d9bec87692..5f432cfbe8 100644 --- a/lib/librte_eal/common/include/generic/rte_ticketlock.h +++ b/lib/librte_eal/common/include/generic/rte_ticketlock.h @@ -96,13 +96,13 @@ __rte_experimental static inline int rte_ticketlock_trylock(rte_ticketlock_t *tl) { - rte_ticketlock_t old, new; - old.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED); - new.tickets = old.tickets; - new.s.next++; - if (old.s.next == old.s.current) { - if (__atomic_compare_exchange_n(&tl->tickets, &old.tickets, - new.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) + rte_ticketlock_t oldl, newl; + oldl.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED); + newl.tickets = oldl.tickets; + newl.s.next++; + if (oldl.s.next == oldl.s.current) { + if (__atomic_compare_exchange_n(&tl->tickets, &oldl.tickets, + newl.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) return 1; } -- 2.32.0