From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id DAF7599E6 for ; Thu, 25 May 2017 11:52:23 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 May 2017 02:52:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,391,1491289200"; d="scan'208";a="91624747" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by orsmga002.jf.intel.com with ESMTP; 25 May 2017 02:52:22 -0700 From: Yuanhan Liu To: Bruce Richardson Cc: Yuanhan Liu , Pablo de Lara , dpdk stable Date: Thu, 25 May 2017 17:49:43 +0800 Message-Id: <1495705809-21416-131-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1495705809-21416-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1495705809-21416-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-stable] patch 'examples/performance-thread: fix build on FreeBSD 10.0' has been queued to stable release 17.02.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 May 2017 09:52:24 -0000 Hi, FYI, your patch has been queued to stable release 17.02.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 05/28/17. So please shout if anyone has objections. Thanks. --yliu --- >>From a12d3c5e9bc520a466cd4c6fbd1ea51cfa65f45e Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 28 Apr 2017 11:18:15 +0100 Subject: [PATCH] examples/performance-thread: fix build on FreeBSD 10.0 [ upstream commit b7162fee8811461fb87dd9c5b843b3d1ba283e5c ] While later releases in the FreeBSD 10 series have a CPU_COUNT macro defined, FreeBSD 10.0 and 10.1 do not have this macro. Therefore we provide a basic fallback implementation of the macro for platforms where it is not defined. Fixes: 433ba6228f9a ("examples/performance-thread: add pthread_shim app") Signed-off-by: Bruce Richardson Acked-by: Pablo de Lara --- examples/performance-thread/pthread_shim/pthread_shim.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/examples/performance-thread/pthread_shim/pthread_shim.c b/examples/performance-thread/pthread_shim/pthread_shim.c index 7167311..113bafa 100644 --- a/examples/performance-thread/pthread_shim/pthread_shim.c +++ b/examples/performance-thread/pthread_shim/pthread_shim.c @@ -48,6 +48,21 @@ #define POSIX_ERRNO(x) (x) +/* some releases of FreeBSD 10, e.g. 10.0, don't have CPU_COUNT macro */ +#ifndef CPU_COUNT +#define CPU_COUNT(x) __cpu_count(x) + +static inline unsigned int +__cpu_count(const rte_cpuset_t *cpuset) +{ + unsigned int i, count = 0; + for (i = 0; i < RTE_MAX_LCORE; i++) + if (CPU_ISSET(i, cpuset)) + count++; + return count; +} +#endif + /* * this flag determines at run time if we override pthread * calls and map then to equivalent lthread calls -- 1.9.0