From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id E21751B321 for ; Tue, 13 Feb 2018 22:33:47 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 2F00421855; Tue, 13 Feb 2018 16:33:46 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 13 Feb 2018 16:33:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=mesmtp; bh=63w0H9R8RQKnwlyHGhg0dAZvGPOsgImvQrs8VR X0WQs=; b=OmVfq8LmDme0aMx8esPc+czRX6rpOKGxlUj+aga6H1ItxscSBXWWZg ipbYTdW3uTcMALUYCoDf2/USZujntEuGwVj8nPDWBqra6KPYYos/627xPJqJ+qAE ZZSSOwyb8pFuU7vfnny2BHl9eJQNb5KgxcagkNJEIUix5cH/Zbm1k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=63w0H9R8RQKnwlyHG hg0dAZvGPOsgImvQrs8VRX0WQs=; b=K3jRmhnxxLH8OPyEeAa4o2ob38XOhloXE IjCtntPTFWIoJNwhi2LSJe+3ttCHPa970RnbA8S/Xc2e2EAFSt+NegwU52O7c0DM Lq5ZLZXdWOfO0pexanWi9kIl9JfCTHBmtOCAmXQRl7Pp4jDnm/sIcJq+CFoan/Ak QqLKX0ZSELf0BvbcDm2lXYf3S0kSrzrhCqi37AiN+9oOwP4C44e5YWNjP7EFYcOd A6zyZYNeBw+qTRqY0mLWooXDoTAqKnowXlLiToH14XV8R6so1etRL99/jWrZ5gjs JcbB6eJRh4i67tVbINMoJJK3/vMXFTKz96ARuq90cbhbLloCZoHfQ== X-ME-Sender: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 5F97A246AC; Tue, 13 Feb 2018 16:33:45 -0500 (EST) From: Thomas Monjalon To: matan@mellanox.com Cc: dev@dpdk.org, gaetan.rivet@6wind.com Date: Tue, 13 Feb 2018 22:33:12 +0100 Message-Id: <20180213213312.22225-1-thomas@monjalon.net> X-Mailer: git-send-email 2.15.1 Subject: [dpdk-dev] [PATCH] net/failsafe: fix FreeBSD build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 21:33:48 -0000 The type pthread_t is not portable because it is freely defined. On Linux, it is an unsigned long int which can be printed with %l. The debug printing of the thread id is restricted to Linux only. Fixes: 655fcd68c7d2 ("net/failsafe: fix hotplug races") Signed-off-by: Thomas Monjalon --- drivers/net/failsafe/failsafe_private.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 5b84db905..86ade029f 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -374,8 +374,10 @@ fs_lock(struct rte_eth_dev *dev, unsigned int is_alarm) return ret; } } +#ifdef RTE_EXEC_ENV_LINUXAPP DEBUG("Hot-plug mutex was locked by thread %lu%s", pthread_self(), PRIV(dev)->alarm_lock ? " by the hot-plug alarm" : ""); +#endif return ret; } @@ -387,7 +389,6 @@ static inline void fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm) { int ret; - unsigned int prev_alarm_lock = PRIV(dev)->alarm_lock; if (is_alarm) { RTE_ASSERT(PRIV(dev)->alarm_lock == 1); @@ -396,10 +397,14 @@ fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm) ret = pthread_mutex_unlock(&PRIV(dev)->hotplug_mutex); if (ret) ERROR("Cannot unlock hot-plug mutex(%s)", strerror(ret)); - else +#ifdef RTE_EXEC_ENV_LINUXAPP + else { + unsigned int prev_alarm_lock = PRIV(dev)->alarm_lock; DEBUG("Hot-plug mutex was unlocked by thread %lu%s", pthread_self(), prev_alarm_lock ? " by the hot-plug alarm" : ""); + } +#endif } /* -- 2.15.1