This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 197710ffc229f3db775a97c27e09c2dc063497c4 (commit) via b7d403b9f8b8f666259dccf9d994ef8a28d9facb (commit) from 2c80ef58dba783bfbf11060cab273e57ba6d0e62 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 197710ffc229f3db775a97c27e09c2dc063497c4 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Tue Jul 19 17:20:58 2016 +0300
test: odp_crypto add termination path
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Mike Holmes mike.holmes@linaro.org
diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 404984d..b7818ea 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -545,9 +545,11 @@ run_measure_one(crypto_args_t *cargs, * every time. * Note we leaked one packet here. */ - pkt = odp_packet_alloc(pkt_pool, - payload_length); - if (pkt == ODP_PACKET_INVALID) { + odp_packet_t newpkt; + + newpkt = odp_packet_alloc(pkt_pool, + payload_length); + if (newpkt == ODP_PACKET_INVALID) { app_err("failed to allocate buffer\n"); return -1; } else { @@ -555,8 +557,8 @@ run_measure_one(crypto_args_t *cargs,
memset(mem, 1, payload_length); } - params.pkt = pkt; - params.out_pkt = cargs->in_place ? pkt : + params.pkt = newpkt; + params.out_pkt = cargs->in_place ? newpkt : ODP_PACKET_INVALID; }
@@ -650,6 +652,8 @@ run_measure_one(crypto_args_t *cargs, cargs->iteration_count; }
+ odp_packet_free(pkt); + return rc; }
@@ -821,6 +825,21 @@ int main(int argc, char *argv[]) } }
+ if (odp_pool_destroy(pool)) { + app_err("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + app_err("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + app_err("Error: term global\n"); + exit(EXIT_FAILURE); + } + return 0; }
commit b7d403b9f8b8f666259dccf9d994ef8a28d9facb Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Tue Jul 19 17:42:42 2016 +0300
example: odp_switch add termination path
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Mike Holmes mike.holmes@linaro.org
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index c48a202..4b944fe 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -376,7 +376,7 @@ static int print_speed_stats(int num_workers, stats_t (*thr_stats)[MAX_PKTIOS],
} while (loop_forever || (elapsed < duration));
- return rx_pkts_tot > 100 ? 0 : -1; + return rx_pkts_tot >= 100 ? 0 : -1; }
/** @@ -1033,7 +1033,22 @@ int main(int argc, char **argv)
free(gbl_args->appl.if_names); free(gbl_args->appl.if_str); - printf("Exit\n\n");
+ if (odp_pool_destroy(gbl_args->pool)) { + printf("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + printf("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + printf("Error: term global\n"); + exit(EXIT_FAILURE); + } + + printf("Exit: %d\n\n", ret); return ret; } diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh index 3f8f9db..d9aa8bd 100755 --- a/example/switch/switch_run.sh +++ b/example/switch/switch_run.sh @@ -19,15 +19,10 @@ do RX_PORTS="${RX_PORTS},pcap:out=pcapout${i}.pcap" done
-./odp_switch -i pcap:in=${PCAP_IN}${RX_PORTS} & - -sleep 1 -kill $! -wait $! +./odp_switch -i pcap:in=${PCAP_IN}${RX_PORTS} -t 1 STATUS=$? - -if [ "$STATUS" -ne 143 ]; then - echo "Error: status was: $STATUS, expected 143" +if [ "$STATUS" -ne 0 ]; then + echo "Error: status was: $STATUS, expected 0" RETVAL=1 fi
-----------------------------------------------------------------------
Summary of changes: example/switch/odp_switch.c | 19 +++++++++++++++++-- example/switch/switch_run.sh | 11 +++-------- test/performance/odp_crypto.c | 29 ++++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 15 deletions(-)
hooks/post-receive