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 21ddf9b672ed6dd4254d4df1b1a414cb73306833 (commit) via dd4fce83fe3168e7cc1ca9ae8ecbea0da2665de2 (commit) from 020c91ca5367e971cbfc493c5b92f65ec72a43e7 (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 21ddf9b672ed6dd4254d4df1b1a414cb73306833 Author: Christophe Milard christophe.milard@linaro.org Date: Fri Nov 25 18:14:36 2016 +0100
performance: odp_pktio_perf: adding missing term functions
Both term function were missing for the ODP main process. Added here.
Signed-off-by: Christophe Milard christophe.milard@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index 483f067..6db02e0 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -1077,5 +1077,8 @@ int main(int argc, char **argv) test_term(); }
+ odp_term_local(); + odp_term_global(instance); + return ret; }
commit dd4fce83fe3168e7cc1ca9ae8ecbea0da2665de2 Author: Christophe Milard christophe.milard@linaro.org Date: Fri Nov 25 18:14:35 2016 +0100
linux-gen: packet_io: handling term_global while in CLOSE_PENDING
If odp_pktio_term_global() is called while a pktio in in state PKTIO_STATE_CLOSE_PENDING, a new close() is attempted on a already closed pktio, resulting as an abort. This patch fixes this.
Signed-off-by: Christophe Milard christophe.milard@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 0b9939b..3524ff8 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1054,7 +1054,7 @@ void odp_pktio_print(odp_pktio_t hdl)
int odp_pktio_term_global(void) { - int ret; + int ret = 0; int i; int pktio_if;
@@ -1073,7 +1073,9 @@ int odp_pktio_term_global(void) ODP_ABORT("unable to stop pktio %s\n", pktio_entry->s.name); } - ret = _pktio_close(pktio_entry); + + if (pktio_entry->s.state != PKTIO_STATE_CLOSE_PENDING) + ret = _pktio_close(pktio_entry); if (ret) ODP_ABORT("unable to close pktio %s\n", pktio_entry->s.name);
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/odp_packet_io.c | 6 ++++-- test/common_plat/performance/odp_pktio_perf.c | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive