diff mbox

[dpdk-dev,v2] net/failsafe: fix FreeBSD build

Message ID 20180213221324.24524-1-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Thomas Monjalon Feb. 13, 2018, 10:13 p.m. UTC 
  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.
On FreeBSD, it is a pointer which can be printed with %p.

That's why there was this error:
drivers/net/failsafe/failsafe_private.h:377:53: error:
	format specifies type 'unsigned long' but the argument has
	type 'pthread_t' (aka 'struct pthread *')

Fixes: 655fcd68c7d2 ("net/failsafe: fix hotplug races")

Reported-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v2: adapt printing to BSD and Linux
---
 drivers/net/failsafe/failsafe_private.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Comments

De Lara Guarch, Pablo Feb. 13, 2018, 10:18 p.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Thomas Monjalon
> Sent: Tuesday, February 13, 2018 10:13 PM
> To: matan@mellanox.com
> Cc: dev@dpdk.org; gaetan.rivet@6wind.com
> Subject: [dpdk-dev] [PATCH v2] net/failsafe: fix FreeBSD build
> 
> 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.
> On FreeBSD, it is a pointer which can be printed with %p.
> 
> That's why there was this error:
> drivers/net/failsafe/failsafe_private.h:377:53: error:
> 	format specifies type 'unsigned long' but the argument has
> 	type 'pthread_t' (aka 'struct pthread *')
> 
> Fixes: 655fcd68c7d2 ("net/failsafe: fix hotplug races")
> 
> Reported-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Tested-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Matan Azrad Feb. 13, 2018, 10:19 p.m. UTC | #2 
> -----Original Message-----
> From: De Lara Guarch, Pablo [mailto:pablo.de.lara.guarch@intel.com]
> Sent: Wednesday, February 14, 2018 12:19 AM
> To: Thomas Monjalon <thomas@monjalon.net>; Matan Azrad
> <matan@mellanox.com>
> Cc: dev@dpdk.org; gaetan.rivet@6wind.com
> Subject: RE: [dpdk-dev] [PATCH v2] net/failsafe: fix FreeBSD build
> 
> 
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Thomas Monjalon
> > Sent: Tuesday, February 13, 2018 10:13 PM
> > To: matan@mellanox.com
> > Cc: dev@dpdk.org; gaetan.rivet@6wind.com
> > Subject: [dpdk-dev] [PATCH v2] net/failsafe: fix FreeBSD build
> >
> > 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.
> > On FreeBSD, it is a pointer which can be printed with %p.
> >
> > That's why there was this error:
> > drivers/net/failsafe/failsafe_private.h:377:53: error:
> > 	format specifies type 'unsigned long' but the argument has
> > 	type 'pthread_t' (aka 'struct pthread *')
> >
> > Fixes: 655fcd68c7d2 ("net/failsafe: fix hotplug races")
> >
> > Reported-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> 
> Tested-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> 
Acked-by: Matan Azrad <matan@mellanox.com>
Thomas Monjalon Feb. 13, 2018, 10:20 p.m. UTC | #3 
> > > 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.
> > > On FreeBSD, it is a pointer which can be printed with %p.
> > >
> > > That's why there was this error:
> > > drivers/net/failsafe/failsafe_private.h:377:53: error:
> > > 	format specifies type 'unsigned long' but the argument has
> > > 	type 'pthread_t' (aka 'struct pthread *')
> > >
> > > Fixes: 655fcd68c7d2 ("net/failsafe: fix hotplug races")
> > >
> > > Reported-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > 
> > Tested-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> > 
> Acked-by: Matan Azrad <matan@mellanox.com>

Applied
diff mbox

Patch

diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 5b84db905..2d16ba4ca 100644
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -318,6 +318,14 @@  extern int mac_from_arg;
 	 &((struct txq *)((s)->fs_dev->data->tx_queues[i]))->refcnt[(s)->sid] \
 	)
 
+#ifdef RTE_EXEC_ENV_BSDAPP
+#define FS_THREADID_TYPE void*
+#define FS_THREADID_FMT  "p"
+#else
+#define FS_THREADID_TYPE unsigned long
+#define FS_THREADID_FMT  "lu"
+#endif
+
 #define LOG__(level, m, ...) \
 	RTE_LOG(level, PMD, "net_failsafe: " m "%c", __VA_ARGS__)
 #define LOG_(level, ...) LOG__(level, __VA_ARGS__, '\n')
@@ -374,7 +382,8 @@  fs_lock(struct rte_eth_dev *dev, unsigned int is_alarm)
 			return ret;
 		}
 	}
-	DEBUG("Hot-plug mutex was locked by thread %lu%s", pthread_self(),
+	DEBUG("Hot-plug mutex was locked by thread %" FS_THREADID_FMT "%s",
+	      (FS_THREADID_TYPE)pthread_self(),
 	      PRIV(dev)->alarm_lock ? " by the hot-plug alarm" : "");
 	return ret;
 }
@@ -397,8 +406,8 @@  fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm)
 	if (ret)
 		ERROR("Cannot unlock hot-plug mutex(%s)", strerror(ret));
 	else
-		DEBUG("Hot-plug mutex was unlocked by thread %lu%s",
-		      pthread_self(),
+		DEBUG("Hot-plug mutex was unlocked by thread %" FS_THREADID_FMT "%s",
+		      (FS_THREADID_TYPE)pthread_self(),
 		      prev_alarm_lock ? " by the hot-plug alarm" : "");
 }