From: Thomas Monjalon <thomas@monjalon.net>
To: matan@mellanox.com
Cc: dev@dpdk.org, gaetan.rivet@6wind.com
Subject: [dpdk-dev] [PATCH] net/failsafe: fix FreeBSD build
Date: Tue, 13 Feb 2018 22:33:12 +0100 [thread overview]
Message-ID: <20180213213312.22225-1-thomas@monjalon.net> (raw)
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 <thomas@monjalon.net>
---
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
next reply other threads:[~2018-02-13 21:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 21:33 Thomas Monjalon [this message]
2018-02-13 21:39 ` Thomas Monjalon
2018-02-13 22:13 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2018-02-13 22:18 ` De Lara Guarch, Pablo
2018-02-13 22:19 ` Matan Azrad
2018-02-13 22:20 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180213213312.22225-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=dev@dpdk.org \
--cc=gaetan.rivet@6wind.com \
--cc=matan@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).