[dpdk-dev] [PATCH 4/4] eal: add assert macro for debug

[Yuanhan Liu]

On Fri, Apr 22, 2016 at 03:44:00PM +0200, Thomas Monjalon wrote:
> diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
> index 4ac0456..b7486cd 100644
> --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
> +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
> @@ -296,7 +296,7 @@ vmxnet3_unmap_pkt(uint16_t eop_idx, vmxnet3_tx_queue_t *txq)
>  	struct rte_mbuf *mbuf;
>  
>  	/* Release cmd_ring descriptor and free mbuf */
> -	VMXNET3_ASSERT(txq->cmd_ring.base[eop_idx].txd.eop == 1);
> +	RTE_ASSERT(txq->cmd_ring.base[eop_idx].txd.eop == 1);
>  
>  	mbuf = txq->cmd_ring.buf_info[eop_idx].m;
>  	if (mbuf == NULL)
> @@ -307,7 +307,7 @@ vmxnet3_unmap_pkt(uint16_t eop_idx, vmxnet3_tx_queue_t *txq)
>  
>  	while (txq->cmd_ring.next2comp != eop_idx) {
>  		/* no out-of-order completion */
> -		VMXNET3_ASSERT(txq->cmd_ring.base[txq->cmd_ring.next2comp].txd.cq == 0);
> +		RTE_ASSERT(txq->cmd_ring.base[txq->cmd_ring.next2comp].txd.cq == 0);
>  		vmxnet3_cmd_ring_adv_next2comp(&txq->cmd_ring);
>  		completed++;
>  	}
> @@ -454,7 +454,7 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
>  		if (tso) {
>  			uint16_t mss = txm->tso_segsz;
>  
> -			VMXNET3_ASSERT(mss > 0);
> +			RTE_ASSERT(mss > 0);
>  
>  			gdesc->txd.hlen = txm->l2_len + txm->l3_len + txm->l4_len;
>  			gdesc->txd.om = VMXNET3_OM_TSO;
> @@ -662,8 +662,8 @@ 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);
>  
> -		VMXNET3_ASSERT(rcd->len <= rxd->len);
> -		VMXNET3_ASSERT(rbi->m);
> +		RTE_ASSERT(rcd->len <= rxd->len);
> +		RTE_ASSERT(rbi->m);
>  


Seems this piece of code introduces a build error:

    drivers/net/vmxnet3/vmxnet3_rxtx.c: In function ‘vmxnet3_recv_pkts’:
    drivers/net/vmxnet3/vmxnet3_rxtx.c:635:18: error: variable ‘rxd’ set but not used [-Werror=unused-but-set-variable]
      Vmxnet3_RxDesc *rxd;
                      ^
    cc1: all warnings being treated as errors
    make[6]: *** [vmxnet3_rxtx.o] Error 1


	--yliu