Re: [PATCH 5/7] vmxnet3: get rid of DEBUG ifdefs

[Yong Wang <yongwang-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org>]

On 12/16/14, 9:13 PM, "Stephen Hemminger" <stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org>
wrote:

>From: Stephen Hemminger <shemming-43mecJUBy8ZBDgjK7y7TUQ@public.gmane.org>
>
>By defining macro as a stub it is possible to get rid of #ifdef's
>in the actual code.
>
>Signed-off-by: Stephen Hemminger <stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org>
>---
> lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h | 6 ++++--
> lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c   | 9 +--------
> 2 files changed, 5 insertions(+), 10 deletions(-)
>
>diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h
>b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h
>index 258fbae..0990f59 100644
>--- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h
>+++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h
>@@ -35,9 +35,11 @@
> #define _VMXNET3_ETHDEV_H_
> 
> #ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
>-#define VMXNET3_ASSERT(x) do { \
>-	if (!(x)) rte_panic("VMXNET3: x"); \
>+#define VMXNET3_ASSERT(x) do {					\
>+	if (unlikely(!(x))) rte_panic("VMXNET3: %s\n", #x);	\
> } while(0)
>+#else
>+#define VMXNET3_ASSERT(x) do { (void)(x); } while (0)

Why not
#define VMXNET_ASSERT(x) do { (void)(0); } while (0)

or simply
#define VMXNET_ASSERT(x)


Are you expecting the condition (x) to have some side effects?
At least that¹s not the case for current usages.

> #endif
> 
> #define VMXNET3_MAX_MAC_ADDRS 1
>diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
>b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
>index 7cb0b93..bd47c6c 100644
>--- a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
>+++ b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
>@@ -308,9 +308,7 @@ vmxnet3_tq_tx_complete(vmxnet3_tx_queue_t *txq)
> 	while (tcd->gen == comp_ring->gen) {
> 
> 		/* Release cmd_ring descriptor and free mbuf */
>-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
> 		VMXNET3_ASSERT(txq->cmd_ring.base[tcd->txdIdx].txd.eop == 1);
>-#endif
> 		mbuf = txq->cmd_ring.buf_info[tcd->txdIdx].m;
> 		rte_pktmbuf_free_seg(mbuf);
> 		txq->cmd_ring.buf_info[tcd->txdIdx].m = NULL;
>@@ -539,16 +537,13 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf
>**rx_pkts, uint16_t nb_pkts)
> 
> 		PMD_RX_LOG(DEBUG, "rxd idx: %d ring idx: %d.", idx, ring_idx);
> 
>-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
> 		VMXNET3_ASSERT(rcd->len <= rxd->len);
> 		VMXNET3_ASSERT(rbi->m);
>-#endif
>+
> 		if (unlikely(rcd->len == 0)) {
> 			PMD_RX_LOG(DEBUG, "Rx buf was skipped. rxring[%d][%d]\n)",
> 				   ring_idx, idx);
>-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
> 			VMXNET3_ASSERT(rcd->sop && rcd->eop);
>-#endif
> 			rte_pktmbuf_free_seg(rbi->m);
> 			goto rcd_done;
> 		}
>@@ -561,9 +556,7 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf
>**rx_pkts, uint16_t nb_pkts)
> 			rte_pktmbuf_free_seg(rbi->m);
> 			goto rcd_done;
> 		}
>-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER
> 		VMXNET3_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_HEAD);
>-#endif
> 		/* Get the packet buffer pointer from buf_info */
> 		rxm = rbi->m;
> 
>-- 
>2.1.3
>