diff mbox

[API-NEXT,v8] queue: handle return value of odp_queue_enq_multi()

Message ID 1436795007-16158-1-git-send-email-zoltan.kiss@linaro.org
State Accepted
Commit f98df8bbdb991fa1257d42924c75847122549db6
Headers show

Commit Message

Zoltan Kiss July 13, 2015, 1:43 p.m. UTC 
Unsent packet has to be released. If the event type is obvious from the
context, use directly the relevant release functions, otherwise
odp_event_free().
Wider error handling is attempted, but this patch can't fix all the flaws
in the many calling functions of odp_queue_enq()

Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
---

v5: fix array use in last hunk

v6: handle negative 'ret' in last hunk

v7: refactor all hunks to similar than last one

v8: fix pktio_txrx_multi and the commit message

 test/performance/odp_pktio_perf.c | 10 +++++++++-
 test/performance/odp_scheduling.c |  8 ++++++--
 test/validation/pktio/pktio.c     |  3 +++
 test/validation/queue/queue.c     |  4 ++++
 4 files changed, 22 insertions(+), 3 deletions(-)

Comments

Maxim Uvarov July 13, 2015, 2:04 p.m. UTC | #1 
Merged with changing subject from queue: to test:.

Maxim.

On 07/13/15 16:43, Zoltan Kiss wrote:
> Unsent packet has to be released. If the event type is obvious from the
> context, use directly the relevant release functions, otherwise
> odp_event_free().
> Wider error handling is attempted, but this patch can't fix all the flaws
> in the many calling functions of odp_queue_enq()
>
> Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
> ---
>
> v5: fix array use in last hunk
>
> v6: handle negative 'ret' in last hunk
>
> v7: refactor all hunks to similar than last one
>
> v8: fix pktio_txrx_multi and the commit message
>
>   test/performance/odp_pktio_perf.c | 10 +++++++++-
>   test/performance/odp_scheduling.c |  8 ++++++--
>   test/validation/pktio/pktio.c     |  3 +++
>   test/validation/queue/queue.c     |  4 ++++
>   4 files changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
> index f4d9d2d..c2e95fb 100644
> --- a/test/performance/odp_pktio_perf.c
> +++ b/test/performance/odp_pktio_perf.c
> @@ -270,12 +270,20 @@ static int alloc_packets(odp_event_t *event_tbl, int num_pkts)
>   static int send_packets(odp_queue_t outq,
>   			odp_event_t *event_tbl, unsigned num_pkts)
>   {
> +	int ret;
> +	unsigned i;
> +
>   	if (num_pkts == 0)
>   		return 0;
>   	else if (num_pkts == 1)
>   		return odp_queue_enq(outq, event_tbl[0]) == 0 ? 1 : 0;
>   
> -	return odp_queue_enq_multi(outq, event_tbl, num_pkts);
> +	ret = odp_queue_enq_multi(outq, event_tbl, num_pkts);
> +	i = ret < 0 ? 0 : ret;
> +	for ( ; i < num_pkts; i++)
> +		odp_event_free(event_tbl[i]);
> +	return ret;
> +
>   }
>   
>   /*
> diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
> index 99f0f9b..a9ebfaa 100644
> --- a/test/performance/odp_scheduling.c
> +++ b/test/performance/odp_scheduling.c
> @@ -530,9 +530,13 @@ static int test_schedule_multi(const char *str, int thr,
>   		}
>   
>   		/* Assume we can enqueue all events */
> -		if (odp_queue_enq_multi(queue, ev, MULTI_BUFS_MAX) !=
> -		    MULTI_BUFS_MAX) {
> +		num = odp_queue_enq_multi(queue, ev, MULTI_BUFS_MAX);
> +		if (num != MULTI_BUFS_MAX) {
>   			LOG_ERR("  [%i] Queue enqueue failed.\n", thr);
> +			j = num < 0 ? 0 : num;
> +			for ( ; j < MULTI_BUFS_MAX; j++)
> +				odp_event_free(ev[j]);
> +
>   			return -1;
>   		}
>   	}
> diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c
> index 82ced5c..d603b27 100644
> --- a/test/validation/pktio/pktio.c
> +++ b/test/validation/pktio/pktio.c
> @@ -388,6 +388,9 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b,
>   		ret = odp_queue_enq_multi(pktio_a->outq, tx_ev, num_pkts);
>   		if (ret != num_pkts) {
>   			CU_FAIL("failed to enqueue test packets");
> +			i = ret < 0 ? 0 : ret;
> +			for ( ; i < num_pkts; i++)
> +				odp_packet_free(tx_pkt[i]);
>   			return;
>   		}
>   	}
> diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c
> index f686b71..96dc932 100644
> --- a/test/validation/queue/queue.c
> +++ b/test/validation/queue/queue.c
> @@ -88,6 +88,10 @@ static void queue_test_sunnydays(void)
>   	 */
>   	ret = odp_queue_enq_multi(queue_id, enev, MAX_BUFFER_QUEUE);
>   	CU_ASSERT(MAX_BUFFER_QUEUE == ret);
> +	i = ret < 0 ? 0 : ret;
> +	for ( ; i < MAX_BUFFER_QUEUE; i++)
> +		odp_event_free(enev[i]);
> +
>   	pev_tmp = deev;
>   	do {
>   		deq_ret  = odp_queue_deq_multi(queue_id, pev_tmp,
diff mbox

Patch

diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index f4d9d2d..c2e95fb 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -270,12 +270,20 @@  static int alloc_packets(odp_event_t *event_tbl, int num_pkts)
 static int send_packets(odp_queue_t outq,
 			odp_event_t *event_tbl, unsigned num_pkts)
 {
+	int ret;
+	unsigned i;
+
 	if (num_pkts == 0)
 		return 0;
 	else if (num_pkts == 1)
 		return odp_queue_enq(outq, event_tbl[0]) == 0 ? 1 : 0;
 
-	return odp_queue_enq_multi(outq, event_tbl, num_pkts);
+	ret = odp_queue_enq_multi(outq, event_tbl, num_pkts);
+	i = ret < 0 ? 0 : ret;
+	for ( ; i < num_pkts; i++)
+		odp_event_free(event_tbl[i]);
+	return ret;
+
 }
 
 /*
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index 99f0f9b..a9ebfaa 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -530,9 +530,13 @@  static int test_schedule_multi(const char *str, int thr,
 		}
 
 		/* Assume we can enqueue all events */
-		if (odp_queue_enq_multi(queue, ev, MULTI_BUFS_MAX) !=
-		    MULTI_BUFS_MAX) {
+		num = odp_queue_enq_multi(queue, ev, MULTI_BUFS_MAX);
+		if (num != MULTI_BUFS_MAX) {
 			LOG_ERR("  [%i] Queue enqueue failed.\n", thr);
+			j = num < 0 ? 0 : num;
+			for ( ; j < MULTI_BUFS_MAX; j++)
+				odp_event_free(ev[j]);
+
 			return -1;
 		}
 	}
diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c
index 82ced5c..d603b27 100644
--- a/test/validation/pktio/pktio.c
+++ b/test/validation/pktio/pktio.c
@@ -388,6 +388,9 @@  static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b,
 		ret = odp_queue_enq_multi(pktio_a->outq, tx_ev, num_pkts);
 		if (ret != num_pkts) {
 			CU_FAIL("failed to enqueue test packets");
+			i = ret < 0 ? 0 : ret;
+			for ( ; i < num_pkts; i++)
+				odp_packet_free(tx_pkt[i]);
 			return;
 		}
 	}
diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c
index f686b71..96dc932 100644
--- a/test/validation/queue/queue.c
+++ b/test/validation/queue/queue.c
@@ -88,6 +88,10 @@  static void queue_test_sunnydays(void)
 	 */
 	ret = odp_queue_enq_multi(queue_id, enev, MAX_BUFFER_QUEUE);
 	CU_ASSERT(MAX_BUFFER_QUEUE == ret);
+	i = ret < 0 ? 0 : ret;
+	for ( ; i < MAX_BUFFER_QUEUE; i++)
+		odp_event_free(enev[i]);
+
 	pev_tmp = deev;
 	do {
 		deq_ret  = odp_queue_deq_multi(queue_id, pev_tmp,