From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yong Wang Subject: Re: [PATCH 5/7] vmxnet3: get rid of DEBUG ifdefs Date: Wed, 11 Feb 2015 00:54:57 +0000 Message-ID: References: <1418793196-17953-1-git-send-email-stephen@networkplumber.org> <1418793196-17953-6-git-send-email-stephen@networkplumber.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: Stephen Hemminger To: Stephen Hemminger , "dev-VfR2kkLFssw@public.gmane.org" Return-path: In-Reply-To: <1418793196-17953-6-git-send-email-stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org> Content-Language: en-US Content-ID: <7F22C4559A5AF4478062E23280F500D7-xOhs/FgTdIXLi+/K9TH57EEOCMrvLtNR@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" On 12/16/14, 9:13 PM, "Stephen Hemminger" wrote: >From: Stephen Hemminger > >By defining macro as a stub it is possible to get rid of #ifdef's >in the actual code. > >Signed-off-by: Stephen Hemminger >--- > 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_ >=20 > #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=B9s not the case for current usages. > #endif >=20 > #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 =3D=3D comp_ring->gen) { >=20 > /* Release cmd_ring descriptor and free mbuf */ >-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER > VMXNET3_ASSERT(txq->cmd_ring.base[tcd->txdIdx].txd.eop =3D=3D 1); >-#endif > mbuf =3D txq->cmd_ring.buf_info[tcd->txdIdx].m; > rte_pktmbuf_free_seg(mbuf); > txq->cmd_ring.buf_info[tcd->txdIdx].m =3D NULL; >@@ -539,16 +537,13 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf >**rx_pkts, uint16_t nb_pkts) >=20 > PMD_RX_LOG(DEBUG, "rxd idx: %d ring idx: %d.", idx, ring_idx); >=20 >-#ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER > VMXNET3_ASSERT(rcd->len <=3D rxd->len); > VMXNET3_ASSERT(rbi->m); >-#endif >+ > if (unlikely(rcd->len =3D=3D 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 =3D=3D VMXNET3_RXD_BTYPE_HEAD); >-#endif > /* Get the packet buffer pointer from buf_info */ > rxm =3D rbi->m; >=20 >--=20 >2.1.3 >