git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.21.0.0-26-g123d4b509

by git＠git-us.linaro.org

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 123d4b5092725f3fbc7178ff0cde4c7f8d53ffd3 (commit) from 31b17c87d784fc841d310b03462f0d02dac35eac (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 ---------------… [View More]-------------------------------------------------- commit 123d4b5092725f3fbc7178ff0cde4c7f8d53ffd3 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Mar 13 12:50:06 2019 +0200 ci: remove deleted configure option test-perf-proc Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.shippable.yml b/.shippable.yml index 0bf68f330..47d281845 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -5,13 +5,8 @@ compiler: - clang env: - - CONF="--disable-test-perf --disable-test-perf-proc" - - CONF="--disable-abi-compat --disable-test-perf --disable-test-perf-proc" - # - CONF="--enable-dpdk-zero-copy" - # - CROSS_ARCH="arm64" - # - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - # - CROSS_ARCH="powerpc" - # - CROSS_ARCH="i386" + - CONF="--disable-test-perf" + - CONF="--disable-abi-compat --disable-test-perf" build: ci: diff --git a/.travis.yml b/.travis.yml index e223c756b..bb84ab19e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ stages: # project: # name: "$TRAVIS_REPO_SLUG" # notification_email: xxxx -# build_command_prepend: "./bootstrap && ./configure --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example" +# build_command_prepend: "./bootstrap && ./configure --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-example" # build_command: "make" # branch_pattern: coverity_scan diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh index 9640b7114..0ab2f028b 100755 --- a/scripts/ci/coverage.sh +++ b/scripts/ci/coverage.sh @@ -9,7 +9,7 @@ cd "$(dirname "$0")"/../.. ./bootstrap ./configure \ CFLAGS="-O0 -coverage $CLFAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \ - --enable-debug=full --enable-helper-linux --enable-dpdk --disable-test-perf --disable-test-perf-proc + --enable-debug=full --enable-helper-linux --enable-dpdk --disable-test-perf export CCACHE_DISABLE=1 make -j $(nproc) ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 9 ++------- .travis.yml | 2 +- scripts/ci/coverage.sh | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) hooks/post-receive -- [View Less]

5 years, 12 months

[COMMIT] branch master updated. v1.21.0.0-25-g31b17c87d

by git＠git-us.linaro.org

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 31b17c87d784fc841d310b03462f0d02dac35eac (commit) from e7a14391d9375aab1f9f6ec8d16de9ff29f51956 (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 ---------------… [View More]

5 years, 12 months

[COMMIT] branch master updated. v1.21.0.0-24-ge7a14391d

by git＠git-us.linaro.org

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 e7a14391d9375aab1f9f6ec8d16de9ff29f51956 (commit) from 3e3f2536bd4246010a765dde30bc1b88f824dcab (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 ---------------… [View More]-------------------------------------------------- commit e7a14391d9375aab1f9f6ec8d16de9ff29f51956 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Mar 8 15:17:07 2019 +0200 linux-gen: shm: check proc_index value before usage Fixes build error ("array subscript is below array bounds") on Debian 8 (gcc 4.9.2). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reported-by: Risto Teittinen <risto.teittinen(a)nokia-bell-labs.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 94a14549a..14255eccc 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -1988,6 +1988,10 @@ int _odp_ishm_status(const char *title) /* display block table: 1 line per entry +1 extra line if mapped here */ for (i = 0; i < ISHM_MAX_NB_BLOCKS; i++) { + void *start_addr = NULL; + void *end_addr = NULL; + int entry_fd = -1; + if (ishm_tbl->block[i].len <= 0) continue; /* unused block */ @@ -2020,25 +2024,25 @@ int _odp_ishm_status(const char *title) lost_total += ishm_tbl->block[i].len - ishm_tbl->block[i].user_len; len_total += ishm_tbl->block[i].len; - ODP_PRINT("%2i %-*s %s%c 0x%-08lx-0x%08lx %-08ld %-08ld %-3lu %-3lu", + + if (proc_index >= 0) { + start_addr = ishm_proctable->entry[proc_index].start; + end_addr = (void *)(uintptr_t)((uintptr_t)start_addr + + ishm_tbl->block[i].len); + entry_fd = ishm_proctable->entry[proc_index].fd; + } + + ODP_PRINT("%2i %-*s %s%c 0x%-08lx-0x%08lx %-08ld %-08ld %-3lu %-3lu %-3d %s\n", i, max_name_len, ishm_tbl->block[i].name, - flags, huge, - ishm_proctable->entry[proc_index].start, - (uintptr_t)ishm_proctable->entry[proc_index].start + - ishm_tbl->block[i].len, + flags, huge, start_addr, end_addr, ishm_tbl->block[i].user_len, ishm_tbl->block[i].len - ishm_tbl->block[i].user_len, ishm_tbl->block[i].seq, - ishm_tbl->block[i].refcnt); - - if (proc_index < 0) - continue; - - ODP_PRINT(" %-3d", - ishm_proctable->entry[proc_index].fd); - - ODP_PRINT("%s\n", ishm_tbl->block[i].filename[0] ? - ishm_tbl->block[i].filename : "(none)"); + ishm_tbl->block[i].refcnt, + entry_fd, + ishm_tbl->block[i].filename[0] ? + ishm_tbl->block[i].filename : + "(none)"); } ODP_PRINT("TOTAL: %58s%-08ld %2s%-08ld\n", "", len_total, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_ishm.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) hooks/post-receive -- [View Less]

6 years

[COMMIT] branch master updated. v1.21.0.0-23-g3e3f2536b

by git＠git-us.linaro.org

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 3e3f2536bd4246010a765dde30bc1b88f824dcab (commit) via 6e4cbdfa5357b88d825ba75886aee2a33320ebff (commit) from a0dbb9e7203842587c19181ddb59f91ec718c0ee (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so … [View More]we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3e3f2536bd4246010a765dde30bc1b88f824dcab Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Mar 4 14:48:43 2019 +0200 configure: update mailing list address Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <billf(a)me.com> diff --git a/configure.ac b/configure.ac index be5ae7870..923d98dff 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ m4_define([odpapi_minor_version], [1]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) -AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp(a)lists.linaro.org]) +AC_INIT([OpenDataPlane],[odpapi_version],[odp(a)lists.opendataplane.org]) ODP_VERSION_API_GENERATION=odpapi_generation_version AC_SUBST(ODP_VERSION_API_GENERATION) commit 6e4cbdfa5357b88d825ba75886aee2a33320ebff Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Mar 4 14:43:10 2019 +0200 README: update mailing list address Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <billf(a)me.com> diff --git a/README b/README index f20800aab..2d63ef41a 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ All rights reserved. SPDX-License-Identifier: BSD-3-Clause OpenDataPlane (ODP) project web page: - http://www.opendataplane.org + https://www.opendataplane.org ODP project in GitHub: https://github.com/OpenDataPlane @@ -44,7 +44,7 @@ Licensing: file for details. Mailing list: - lng-odp(a)lists.linaro.org + odp(a)lists.opendataplane.org Contributing: Please read CONTRIBUTING file before submitting patches. ODP project follows ----------------------------------------------------------------------- Summary of changes: README | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- [View Less]

6 years

[COMMIT] branch master updated. v1.21.0.0-21-ga0dbb9e72

by git＠git-us.linaro.org

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 a0dbb9e7203842587c19181ddb59f91ec718c0ee (commit) via e7be5e889557dac322d5c0628eca54e169eb3bf6 (commit) via 49cd419fee75f61451fabd67b0c0031d03f5708e (commit) from d9fb340f78366750b7b519a1e838f73672428870 (commit) Those revisions listed above that are new to this … [View More]repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a0dbb9e7203842587c19181ddb59f91ec718c0ee Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Feb 27 15:21:08 2019 +0200 shippable: don't run tests on gh-pages branch Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index f72b28b44..e223c756b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -244,6 +244,8 @@ jobs: before_deploy: - pushd doc - mkdir gh-pages + # Prevent Shippable run on gh-pages branch + - printf "branches:\n except:\n - gh-pages\n" >> gh-pages/.shippable.yml - cp -r application-api-guide/output/html/* gh-pages/ - cp -r platform-api-guide/output/html/ gh-pages/platform-api-guide - cp -r helper-guide/output/html/ gh-pages/helper-guide commit e7be5e889557dac322d5c0628eca54e169eb3bf6 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Feb 27 09:42:42 2019 +0200 travis: build and deploy all guides to GitHub Pages Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index c6c100d13..f72b28b44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -201,13 +201,15 @@ jobs: -e CONF="--enable-user-guides --disable-abi-compat" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh - stage: "build only" - env: TEST=doxygen + env: TEST=documentation compiler: gcc addons: apt: packages: + - asciidoctor - libconfig-dev - libssl-dev + - mscgen - cmake - graphviz install: @@ -223,9 +225,13 @@ jobs: popd fi - export PATH=$HOME/doxygen-install/bin:$PATH + - gem install asciidoctor script: - ./bootstrap - - ./configure + - ./configure --enable-user-guides + - pushd doc + - make + - popd # doxygen does not trap on warnings, check for them here. - make doxygen-doc 2>&1 |tee doxygen.log - | @@ -235,10 +241,23 @@ jobs: else true fi + before_deploy: + - pushd doc + - mkdir gh-pages + - cp -r application-api-guide/output/html/* gh-pages/ + - cp -r platform-api-guide/output/html/ gh-pages/platform-api-guide + - cp -r helper-guide/output/html/ gh-pages/helper-guide + - mkdir gh-pages/implementers-guide + - cp implementers-guide/implementers-guide.html gh-pages/implementers-guide/index.html + - mkdir gh-pages/users-guide + - cp users-guide/users-guide.html gh-pages/users-guide/index.html + - mkdir gh-pages/process-guide + - cp process-guide/*.html gh-pages/process-guide/ + - popd deploy: provider: pages skip_cleanup: true - local_dir: doc/application-api-guide/output/html + local_dir: doc/gh-pages github_token: $GH_REPO_TOKEN on: branch: master commit 49cd419fee75f61451fabd67b0c0031d03f5708e Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Feb 26 13:37:14 2019 +0200 doc: fix issue tracking site url Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/doc/application-api-guide/odp.dox b/doc/application-api-guide/odp.dox index 33357bc9b..08b95de2b 100644 --- a/doc/application-api-guide/odp.dox +++ b/doc/application-api-guide/odp.dox @@ -38,7 +38,7 @@ * @section contact Contact Details * - The main web site is http://www.opendataplane.org/ * - The git repo is https://github.com/OpenDataPlane/odp.git - * - Bug tracking is https://bugs.linaro.org/describecomponents.cgi?product=OpenDataPlane%20-%20… + * - Bug tracking is https://github.com/OpenDataPlane/odp/issues * */ diff --git a/doc/helper-guide/odp.dox b/doc/helper-guide/odp.dox index 0a0f93754..11333e910 100644 --- a/doc/helper-guide/odp.dox +++ b/doc/helper-guide/odp.dox @@ -21,6 +21,6 @@ * @section contact Contact Details * - The main web site is http://www.opendataplane.org/ * - The git repo is https://github.com/OpenDataPlane/odp.git - * - Bug tracking is https://bugs.linaro.org/describecomponents.cgi?product=OpenDataPlane%20-%20… + * - Bug tracking is https://github.com/OpenDataPlane/odp/issues * */ ----------------------------------------------------------------------- Summary of changes: .travis.yml | 27 ++++++++++++++++++++++++--- doc/application-api-guide/odp.dox | 2 +- doc/helper-guide/odp.dox | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) hooks/post-receive -- [View Less]

6 years

[COMMIT] branch master updated. v1.21.0.0-18-gd9fb340f

by git＠git-us.linaro.org

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 d9fb340f78366750b7b519a1e838f73672428870 (commit) via 60d0a8cef06f7d5c2dcfceea69a6339613315654 (commit) from 7cc385173deacea5641f1e6df8200c7057446ff8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so … [View More]we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d9fb340f78366750b7b519a1e838f73672428870 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Feb 19 13:13:04 2019 +0200 test: check odp_shm_reserve() return value Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c index 75ea0a7a..563d3d64 100644 --- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c +++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c @@ -172,6 +172,11 @@ int main(int argc, char **argv) /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("_appl_global_data", sizeof(global_data_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + printf("Error: shared mem alloc failed.\n"); + exit(EXIT_FAILURE); + } + global = odp_shm_addr(shm); if (global == NULL) { printf("Error: shared mem alloc failed.\n"); diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c index 852ed308..4c36aca1 100644 --- a/test/performance/odp_cpu_bench.c +++ b/test/performance/odp_cpu_bench.c @@ -578,6 +578,11 @@ int main(int argc, char *argv[]) shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + LOG_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + gbl_args = odp_shm_addr(shm); if (gbl_args == NULL) { LOG_ERR("Error: shared mem alloc failed\n"); @@ -592,6 +597,11 @@ int main(int argc, char *argv[]) sizeof(lookup_entry_t) * gbl_args->appl.lookup_tbl_size, ODP_CACHE_LINE_SIZE, 0); + if (lookup_tbl_shm == ODP_SHM_INVALID) { + LOG_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + gbl_args->lookup_tbl = odp_shm_addr(lookup_tbl_shm); if (gbl_args->lookup_tbl == NULL) { LOG_ERR("Error: lookup table mem alloc failed\n"); diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 78e3920f..15a0cb0e 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -1484,6 +1484,12 @@ int main(int argc, char *argv[]) /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + LOG_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + gbl_args = odp_shm_addr(shm); if (gbl_args == NULL) { diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 2ed2c352..55e90566 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -1062,6 +1062,9 @@ int main(int argc, char **argv) shm = odp_shm_reserve("test_globals", sizeof(test_globals_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + LOG_ABORT("Shared memory reserve failed.\n"); + gbl_args = odp_shm_addr(shm); if (gbl_args == NULL) LOG_ABORT("Shared memory reserve failed.\n"); @@ -1076,6 +1079,8 @@ int main(int argc, char **argv) shm = odp_shm_reserve("test_globals.rx_stats", gbl_args->rx_stats_size, ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + LOG_ABORT("Shared memory reserve failed.\n"); gbl_args->rx_stats = odp_shm_addr(shm); @@ -1087,6 +1092,8 @@ int main(int argc, char **argv) shm = odp_shm_reserve("test_globals.tx_stats", gbl_args->tx_stats_size, ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + LOG_ABORT("Shared memory reserve failed.\n"); gbl_args->tx_stats = odp_shm_addr(shm); diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index c128580d..b7128c1f 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -2010,6 +2010,11 @@ static int scheduler_suite_init(void) shm = odp_shm_reserve(GLOBALS_SHM_NAME, sizeof(test_globals_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + printf("Shared memory reserve failed (globals).\n"); + return -1; + } + globals = odp_shm_addr(shm); if (!globals) { @@ -2027,6 +2032,12 @@ static int scheduler_suite_init(void) shm = odp_shm_reserve(SHM_THR_ARGS_NAME, sizeof(thread_args_t), ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + printf("Shared memory reserve failed (args).\n"); + return -1; + } + args = odp_shm_addr(shm); if (!args) { commit 60d0a8cef06f7d5c2dcfceea69a6339613315654 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Feb 19 13:05:12 2019 +0200 example: check odp_shm_reserve() return value Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index bd6af795..48292702 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -1142,6 +1142,12 @@ int main(int argc, char *argv[]) /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + args = odp_shm_addr(shm); if (args == NULL) { diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 1bbf7a00..d1189881 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1235,6 +1235,11 @@ main(int argc, char *argv[]) shm = odp_shm_reserve("shm_args", sizeof(global_data_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + global = odp_shm_addr(shm); if (NULL == global) { diff --git a/example/ipsec/odp_ipsec_fwd_db.c b/example/ipsec/odp_ipsec_fwd_db.c index da9abf94..5e84656a 100644 --- a/example/ipsec/odp_ipsec_fwd_db.c +++ b/example/ipsec/odp_ipsec_fwd_db.c @@ -30,6 +30,11 @@ void init_fwd_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + fwd_db = odp_shm_addr(shm); if (fwd_db == NULL) { diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c index 626380c6..0c6fdf51 100644 --- a/example/ipsec/odp_ipsec_sa_db.c +++ b/example/ipsec/odp_ipsec_sa_db.c @@ -33,6 +33,11 @@ void init_sa_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + sa_db = odp_shm_addr(shm); if (sa_db == NULL) { @@ -50,6 +55,12 @@ void init_tun_db(void) sizeof(tun_db_t), ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + tun_db = odp_shm_addr(shm); if (!tun_db) { diff --git a/example/ipsec/odp_ipsec_sp_db.c b/example/ipsec/odp_ipsec_sp_db.c index 265c9c7e..51690ddf 100644 --- a/example/ipsec/odp_ipsec_sp_db.c +++ b/example/ipsec/odp_ipsec_sp_db.c @@ -30,6 +30,11 @@ void init_sp_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + sp_db = odp_shm_addr(shm); if (sp_db == NULL) { diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index 7487dddf..c55dc484 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -48,6 +48,11 @@ void init_stream_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + stream_db = odp_shm_addr(shm); if (stream_db == NULL) { diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index ab0fa3c5..5b83e8b3 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -934,6 +934,11 @@ main(int argc, char *argv[]) shm = odp_shm_reserve("shm_args", sizeof(global_data_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + global = odp_shm_addr(shm); if (NULL == global) { diff --git a/example/ipsec_api/odp_ipsec_cache.c b/example/ipsec_api/odp_ipsec_cache.c index 62edb9bc..3a28410e 100644 --- a/example/ipsec_api/odp_ipsec_cache.c +++ b/example/ipsec_api/odp_ipsec_cache.c @@ -27,6 +27,11 @@ void init_ipsec_cache(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + ipsec_cache = odp_shm_addr(shm); if (ipsec_cache == NULL) { diff --git a/example/ipsec_offload/odp_ipsec_offload.c b/example/ipsec_offload/odp_ipsec_offload.c index 4d95b2e5..f6936b33 100644 --- a/example/ipsec_offload/odp_ipsec_offload.c +++ b/example/ipsec_offload/odp_ipsec_offload.c @@ -524,6 +524,10 @@ main(int argc, char *argv[]) /* Reserve memory for arguments from shared memory */ shm = odp_shm_reserve("shm_args", sizeof(global_data_t), ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) + EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + global = odp_shm_addr(shm); if (NULL == global) diff --git a/example/ipsec_offload/odp_ipsec_offload_cache.c b/example/ipsec_offload/odp_ipsec_offload_cache.c index 58271bfd..6f0e0939 100644 --- a/example/ipsec_offload/odp_ipsec_offload_cache.c +++ b/example/ipsec_offload/odp_ipsec_offload_cache.c @@ -33,6 +33,9 @@ void init_ipsec_cache(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + ipsec_cache = odp_shm_addr(shm); if (ipsec_cache == NULL) diff --git a/example/ipsec_offload/odp_ipsec_offload_fwd_db.c b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c index f707ab9a..a92a566f 100644 --- a/example/ipsec_offload/odp_ipsec_offload_fwd_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c @@ -61,6 +61,9 @@ void init_fwd_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + fwd_db = odp_shm_addr(shm); if (fwd_db == NULL) diff --git a/example/ipsec_offload/odp_ipsec_offload_sa_db.c b/example/ipsec_offload/odp_ipsec_offload_sa_db.c index a0fb3fbf..5c126483 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sa_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_sa_db.c @@ -31,6 +31,9 @@ void init_sa_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + sa_db = odp_shm_addr(shm); if (sa_db == NULL) @@ -46,6 +49,10 @@ void init_tun_db(void) sizeof(tun_db_t), ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) + EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + tun_db = odp_shm_addr(shm); if (!tun_db) diff --git a/example/ipsec_offload/odp_ipsec_offload_sp_db.c b/example/ipsec_offload/odp_ipsec_offload_sp_db.c index 1001d5f3..cfa8cb94 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sp_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_sp_db.c @@ -28,6 +28,9 @@ void init_sp_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + EXAMPLE_ABORT("Error: shared mem reserve failed.\n"); + sp_db = odp_shm_addr(shm); if (sp_db == NULL) diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index f7e7ba53..fab00e7e 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -174,6 +174,11 @@ int main(int argc, char **argv) /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("_appl_global_data", sizeof(global_data_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + printf("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + global = odp_shm_addr(shm); if (global == NULL) { printf("Error: shared mem alloc failed.\n"); diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 708c4df9..4bf26586 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -968,6 +968,11 @@ int main(int argc, char **argv) /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("_appl_global_data", sizeof(global_data_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + printf("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + global = odp_shm_addr(shm); if (global == NULL) { printf("Error: shared mem alloc failed.\n"); diff --git a/example/l3fwd/odp_l3fwd_db.c b/example/l3fwd/odp_l3fwd_db.c index f39b5430..a27801a5 100644 --- a/example/l3fwd/odp_l3fwd_db.c +++ b/example/l3fwd/odp_l3fwd_db.c @@ -179,7 +179,7 @@ static flow_table_t fwd_lookup_cache; static void create_fwd_hash_cache(void) { odp_shm_t hash_shm; - flow_bucket_t *bucket; + flow_bucket_t *bucket = NULL; flow_entry_t *flows; uint32_t bucket_count, flow_count, size; uint32_t i; @@ -191,8 +191,9 @@ static void create_fwd_hash_cache(void) size = sizeof(flow_bucket_t) * bucket_count + sizeof(flow_entry_t) * flow_count; hash_shm = odp_shm_reserve("flow_table", size, ODP_CACHE_LINE_SIZE, 0); + if (hash_shm != ODP_SHM_INVALID) + bucket = odp_shm_addr(hash_shm); - bucket = odp_shm_addr(hash_shm); if (!bucket) { /* Try the second time with small request */ flow_count /= 4; @@ -201,6 +202,11 @@ static void create_fwd_hash_cache(void) sizeof(flow_entry_t) * flow_count; hash_shm = odp_shm_reserve("flow_table", size, ODP_CACHE_LINE_SIZE, 0); + if (hash_shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + bucket = odp_shm_addr(hash_shm); if (!bucket) { EXAMPLE_ERR("Error: shared mem alloc failed.\n"); @@ -342,6 +348,11 @@ void init_fwd_db(void) ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + fwd_db = odp_shm_addr(shm); if (fwd_db == NULL) { diff --git a/example/l3fwd/odp_l3fwd_lpm.c b/example/l3fwd/odp_l3fwd_lpm.c index cb9d9df0..f8830339 100644 --- a/example/l3fwd/odp_l3fwd_lpm.c +++ b/example/l3fwd/odp_l3fwd_lpm.c @@ -154,6 +154,11 @@ void fib_tbl_init(void) size = FIB_NEXT_SIZE * FIB_SUB_COUNT; /*Reserve memory for Routing hash table*/ lpm_shm = odp_shm_reserve("fib_lpm_sub", size, ODP_CACHE_LINE_SIZE, 0); + if (lpm_shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + fe = odp_shm_addr(lpm_shm); if (!fe) { EXAMPLE_ERR("Error: shared mem alloc failed for lpm cache.\n"); diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index b1c4a79c..40038d57 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -382,6 +382,11 @@ int main(int argc, char *argv[]) /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("_appl_global_data", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + EXAMPLE_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + args = odp_shm_addr(shm); if (args == NULL) { EXAMPLE_ERR("Error: shared mem alloc failed.\n"); diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index a0162145..c922f7ef 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -908,6 +908,12 @@ int main(int argc, char **argv) /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + printf("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + gbl_args = odp_shm_addr(shm); if (gbl_args == NULL) { ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 6 ++++++ example/ipsec/odp_ipsec.c | 5 +++++ example/ipsec/odp_ipsec_fwd_db.c | 5 +++++ example/ipsec/odp_ipsec_sa_db.c | 11 +++++++++++ example/ipsec/odp_ipsec_sp_db.c | 5 +++++ example/ipsec/odp_ipsec_stream.c | 5 +++++ example/ipsec_api/odp_ipsec.c | 5 +++++ example/ipsec_api/odp_ipsec_cache.c | 5 +++++ example/ipsec_offload/odp_ipsec_offload.c | 4 ++++ example/ipsec_offload/odp_ipsec_offload_cache.c | 3 +++ example/ipsec_offload/odp_ipsec_offload_fwd_db.c | 3 +++ example/ipsec_offload/odp_ipsec_offload_sa_db.c | 7 +++++++ example/ipsec_offload/odp_ipsec_offload_sp_db.c | 3 +++ example/l2fwd_simple/odp_l2fwd_simple.c | 5 +++++ example/l3fwd/odp_l3fwd.c | 5 +++++ example/l3fwd/odp_l3fwd_db.c | 15 +++++++++++++-- example/l3fwd/odp_l3fwd_lpm.c | 5 +++++ example/packet/odp_pktio.c | 5 +++++ example/switch/odp_switch.c | 6 ++++++ platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c | 5 +++++ test/performance/odp_cpu_bench.c | 10 ++++++++++ test/performance/odp_l2fwd.c | 6 ++++++ test/performance/odp_pktio_perf.c | 7 +++++++ test/validation/api/scheduler/scheduler.c | 11 +++++++++++ 24 files changed, 145 insertions(+), 2 deletions(-) hooks/post-receive -- [View Less]

6 years

[COMMIT] branch master updated. v1.21.0.0-16-g7cc38517

by git＠git-us.linaro.org

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 7cc385173deacea5641f1e6df8200c7057446ff8 (commit) via a180f7b61bb998b15659638df5fb694e21d4ccbb (commit) via 0099796df834acfa432ceb27aa8c7b21ab34f050 (commit) from 5ccc27cf77c936460b265c973a531a04b7a74014 (commit) Those revisions listed above that are new to this … [View More]repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7cc385173deacea5641f1e6df8200c7057446ff8 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Feb 20 10:31:45 2019 +0200 doc: add missing example applications to Doxygen Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/doc/application-api-guide/examples.dox b/doc/application-api-guide/examples.dox index afafcc52..42f7982c 100644 --- a/doc/application-api-guide/examples.dox +++ b/doc/application-api-guide/examples.dox @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2018, Linaro Limited +/* Copyright (c) 2015-2019, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -6,30 +6,80 @@ /** * @example odp_classifier.c - * ODP classifier example application + * Classifier example application */ /** * @example odp_generator.c - * ODP loopback demo application + * Traffic generator and loopback demo application + */ + +/** + * @example odp_hello.c + * Minimal example application + */ + +/** + * @example odp_ipfragreass.c + * IPv4 lock-free fragmentation and reassembly example application + */ + + /** + * @example ipsec/odp_ipsec.c + * IPsec example application using crypto API + */ + +/** + * @example ipsec_api/odp_ipsec.c + * IPsec example application using IPsec API + */ + +/** + * @example ipsec_offload/odp_ipsec_offload.c + * IPsec offload example application */ /** * @example odp_l2fwd.c - * ODP l2fwd example application + * L2 forwarding example application + */ + +/** + * @example odp_l2fwd_simple.c + * Minimal L2 forwarding example application + */ + +/** + * @example odp_l3fwd.c + * L3 forwarding example application */ /** *@example odp_pktio.c - * ODP basic packet IO loopback test application + * Basic packet IO loopback test application + */ + +/** + * @example odp_switch.c + * Minimal learning Ethernet switch example application + */ + + /** + * @example odp_sysinfo.c + * System information example application + */ + +/** + * @example time_global_test.c + * Time example application */ /** * @example odp_timer_test.c - * ODP timer example application + * Timer example application */ /** - * @example odp_ipfragreass.c - * ODP IPv4 lock-free fragmentation and reassembly example application - */ + * @example odp_traffic_mgmt.c + * Traffic manager example application + */ commit a180f7b61bb998b15659638df5fb694e21d4ccbb Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Feb 20 09:10:04 2019 +0200 doc: fix ODP Doxygen logo The whole ODP logo wasn't drawn correctly in Doxygen html documentation. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/doc/images/ODP-Logo-HQ.svg b/doc/images/ODP-Logo-HQ.svg index bd83bcd9..7f33caff 100644 --- a/doc/images/ODP-Logo-HQ.svg +++ b/doc/images/ODP-Logo-HQ.svg @@ -9,12 +9,12 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Layer_1" data-name="Layer 1" - viewBox="0 0 190 49" + viewBox="0 0 200 50" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="ODP-Logo-HQ.svg" - width="190" - height="49"> + width="200" + height="50"> <metadata id="metadata71"> <rdf:RDF> @@ -36,21 +36,22 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2511" - inkscape:window-height="1416" + inkscape:window-width="1800" + inkscape:window-height="991" id="namedview69" showgrid="false" - inkscape:zoom="2.253318" - inkscape:cx="297.0423" - inkscape:cy="74.997335" - inkscape:window-x="1969" - inkscape:window-y="24" + inkscape:zoom="5.2958056" + inkscape:cx="108.40047" + inkscape:cy="24.5" + inkscape:window-x="0" + inkscape:window-y="31" inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" + inkscape:current-layer="g4462" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" /> + fit-margin-bottom="0" + inkscape:snap-page="false" /> <defs id="defs3"> <style @@ -60,150 +61,128 @@ id="title7">OpenDataPlane-branding_ODP Logo</title> <g id="g4462" - transform="matrix(0.32035335,0,0,0.32660788,-0.15849903,0.00353742)"> - <text - transform="translate(531.29,127.66)" - id="text9" - class="cls-1" - style="font-size:44.31000137px;font-family:'Squada One';fill:#808080">.org</text> + transform="matrix(0.26109597,0,0,0.26619358,1.0037914,4.7794569)"> <rect id="rect11" - transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-70.58,74.14)" + transform="rotate(-45)" ry="14.91" rx="14.91" height="114.8" width="114.8" - y="46.509998" - x="45.290001" + y="50.883595" + x="-53.179798" class="cls-2" style="fill:#333333" /> <path - transform="translate(-27.18,-28.91)" id="path13" - d="m 102.15,104 0,74.9 0.14,0 c 3.61,-0.15 8.18,-1.58 10.93,-4.34 l 60.1,-60.09 a 14.84,14.84 0 0 0 4.34,-9.92 l 0,-0.53 -75.51,0 z" + d="m 79.013941,73.671268 v 74.900002 h 0.14 c 3.61,-0.15 8.18,-1.58 10.93,-4.34 L 150.18395,84.141268 a 14.84,14.84 0 0 0 4.34,-9.92 v -0.53 H 79.013941 Z" class="cls-2" inkscape:connector-curvature="0" style="fill:#333333" /> <path - transform="translate(-27.18,-28.91)" style="fill:#00ffff" id="path15" - d="m 102.15,104 0,-75 0.14,0 c 3.61,0.15 8.18,1.58 10.93,4.34 l 60.1,60.09 a 15,15 0 0 1 4.34,10 l 0,0.58 -75.51,0 z" + d="M 79.013941,73.671268 V -1.3287319 h 0.14 c 3.61,0.15 8.18,1.58 10.93,4.34 L 150.18395,63.101268 a 15,15 0 0 1 4.34,10 v 0.58 H 79.013941 Z" inkscape:connector-curvature="0" /> <path - transform="translate(-27.18,-28.91)" style="fill:#00ffff" id="path17" - d="m 102.15,104 0,74.9 0.15,0 c -3.61,-0.15 -8,-1.58 -10.79,-4.34 l -60,-60.09" + d="m 79.013941,73.671268 v 74.900002 h 0.15 c -3.61,-0.15 -8,-1.58 -10.79,-4.34 L 8.3739406,84.141268" inkscape:connector-curvature="0" /> <path - transform="translate(-27.18,-28.91)" id="path19" - d="m 102.15,104 0,-75 0.15,0 c -3.61,0.15 -8,1.58 -10.79,4.34 l -60,60.09" + d="M 79.013941,73.671268 V -1.3287319 h 0.15 c -3.61,0.15 -8,1.58 -10.79,4.34 L 8.3739406,63.101268" class="cls-2" inkscape:connector-curvature="0" style="fill:#333333" /> <path - transform="translate(-27.18,-28.91)" id="path23" - d="M 102.23,49.19 48.4,103.54 102.75,157.37 156.58,103 Z m 0.38,78.91 -25.12,-24.88 24.88,-25.12 25.12,24.9 z" + d="m 79.093941,18.861268 -53.83,54.35 54.35,53.830002 53.830009,-54.370002 z m 0.38,78.91 -25.12,-24.88 24.88,-25.12 25.119999,24.9 z" class="cls-4" inkscape:connector-curvature="0" style="fill:#333333;stroke:#ffe817;stroke-width:4px;stroke-miterlimit:10" /> <rect id="rect25" - transform="matrix(0.70364278,-0.7105539,0.7105539,0.70364278,-70.07,74.46)" + transform="rotate(-45.28)" height="35.360001" width="35.360001" - y="85.419998" - x="84.809998" + y="89.899895" + x="-13.548523" class="cls-5" style="fill:none;stroke:#ffe817;stroke-width:4px;stroke-miterlimit:10" /> - <text - transform="translate(531.29,127.66)" - id="text27" - class="cls-1" - style="font-size:44.31000137px;font-family:'Squada One';fill:#808080">.org</text> <rect id="rect29" - transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-70.58,74.14)" + transform="rotate(-45)" ry="14.91" rx="14.91" height="114.8" width="114.8" - y="46.509998" - x="45.290001" + y="50.883595" + x="-53.179798" class="cls-2" style="fill:#333333" /> <path - transform="translate(-27.18,-28.91)" id="path31" - d="m 102.15,104 0,74.9 0.14,0 c 3.61,-0.15 8.18,-1.58 10.93,-4.34 l 60.1,-60.09 a 14.84,14.84 0 0 0 4.34,-9.92 l 0,-0.53 -75.51,0 z" + d="m 79.013941,73.671268 v 74.900002 h 0.14 c 3.61,-0.15 8.18,-1.58 10.93,-4.34 L 150.18395,84.141268 a 14.84,14.84 0 0 0 4.34,-9.92 v -0.53 H 79.013941 Z" class="cls-6" inkscape:connector-curvature="0" style="fill:#666666" /> <path - transform="translate(-27.18,-28.91)" id="path33" - d="m 102.15,104 0,-75 0.14,0 c 3.61,0.15 8.18,1.58 10.93,4.34 l 60.1,60.09 a 15,15 0 0 1 4.34,10 l 0,0.58 -75.51,0 z" + d="M 79.013941,73.671268 V -1.3287319 h 0.14 c 3.61,0.15 8.18,1.58 10.93,4.34 L 150.18395,63.101268 a 15,15 0 0 1 4.34,10 v 0.58 H 79.013941 Z" class="cls-7" inkscape:connector-curvature="0" style="fill:#1a1a1a" /> <path - transform="translate(-27.18,-28.91)" id="path35" - d="m 102.15,104 0,74.9 0.15,0 c -3.61,-0.15 -8,-1.58 -10.79,-4.34 l -60,-60.09" + d="m 79.013941,73.671268 v 74.900002 h 0.15 c -3.61,-0.15 -8,-1.58 -10.79,-4.34 L 8.3739406,84.141268" class="cls-7" inkscape:connector-curvature="0" style="fill:#1a1a1a" /> <path - transform="translate(-27.18,-28.91)" id="path37" - d="m 102.15,104 0,-75 0.15,0 c -3.61,0.15 -8,1.58 -10.79,4.34 l -60,60.09" + d="M 79.013941,73.671268 V -1.3287319 h 0.15 c -3.61,0.15 -8,1.58 -10.79,4.34 L 8.3739406,63.101268" class="cls-6" inkscape:connector-curvature="0" style="fill:#666666" /> <path - transform="translate(-27.18,-28.91)" style="fill:#000000;fill-opacity:0" id="path39" - d="m 235.1,86.13 0,30.75 q 0,10.07 -9.46,10.07 l -10.15,0 Q 206,127 206,116.89 l 0,-30.76 q 0,-10.07 9.46,-10.07 l 10.15,0 q 9.49,0 9.49,10.07 z m -10.68,32 0,-33.3" + d="m 207.92,57.219998 v 30.75 q 0,10.07 -9.46,10.07 h -10.15 q -9.49,0.05 -9.49,-10.06 v -30.76 q 0,-10.07 9.46,-10.07 h 10.15 q 9.49,0 9.49,10.07 z m -10.68,32 v -33.3" class="cls-8" inkscape:connector-curvature="0" /> <path - transform="translate(-27.18,-28.91)" id="path41" - d="m 260.67,127 -1.6,0" + d="m 233.49,98.089998 h -1.6" class="cls-8" inkscape:connector-curvature="0" style="fill:#009645" /> <path - transform="translate(-27.18,-28.91)" id="path65" - d="M 102.23,49.19 48.4,103.54 102.75,157.37 156.58,103 Z m 0.38,78.91 -25.12,-24.88 24.88,-25.12 25.12,24.9 z" + d="m 79.093941,18.861268 -53.83,54.35 54.35,53.830002 53.830009,-54.370002 z m 0.38,78.91 -25.12,-24.88 24.88,-25.12 25.119999,24.9 z" class="cls-9" inkscape:connector-curvature="0" style="fill:#666666;stroke:#ffe817;stroke-width:4px;stroke-miterlimit:10" /> <rect id="rect67" - transform="matrix(0.70364278,-0.7105539,0.7105539,0.70364278,-70.07,74.46)" + transform="rotate(-45.28)" height="35.360001" width="35.360001" - y="85.419998" - x="84.809998" + y="89.899895" + x="-13.548523" class="cls-5" style="fill:none;stroke:#ffe817;stroke-width:4px;stroke-miterlimit:10" /> <text - transform="scale(0.92486289,1.0812414)" - sodipodi:linespacing="125%" + transform="scale(0.92486285,1.0812414)" id="text4199" - y="81.79998" - x="174.92181" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:83.23766327px;line-height:125%;font-family:'Squada One';-inkscape-font-specification:'Squada One, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009645;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + y="91.752487" + x="174.00948" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:73.42362213px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009645;fill-opacity:1;stroke:none;stroke-width:1.03697407px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" xml:space="preserve"><tspan - y="81.79998" - x="174.92181" + y="91.752487" + x="174.00948" id="tspan4201" - sodipodi:role="line">OpenDataPlane</tspan></text> + sodipodi:role="line" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:73.42362213px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1.03697407px">OpenDataPlane</tspan></text> </g> </svg> commit 0099796df834acfa432ceb27aa8c7b21ab34f050 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Feb 19 14:42:06 2019 +0200 travis: deploy Doxygen documentation automatically to GitHub Pages After a successful master branch build ODP API documentation is automatically deployed to repo's GitHub Pages website (https://<user_name>.github.io/odp/). To enable this a personal GitHub access token has to be saved into GH_REPO_TOKEN environment variable in Travis repository settings. The token requires 'public_repo' scope. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index e4b9768e..c6c100d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2018, Linaro Limited +# Copyright (c) 2016-2019, Linaro Limited # All rights reserved. # SPDX-License-Identifier: BSD-3-Clause # @@ -235,6 +235,14 @@ jobs: else true fi + deploy: + provider: pages + skip_cleanup: true + local_dir: doc/application-api-guide/output/html + github_token: $GH_REPO_TOKEN + on: + branch: master + condition: "x$GH_REPO_TOKEN != x" - stage: "build only" env: ARCH=x86_64 install: ----------------------------------------------------------------------- Summary of changes: .travis.yml | 10 ++- doc/application-api-guide/examples.dox | 68 ++++++++++++++++--- doc/images/ODP-Logo-HQ.svg | 115 ++++++++++++++------------------- 3 files changed, 115 insertions(+), 78 deletions(-) hooks/post-receive -- [View Less]

6 years

[COMMIT] branch master updated. v1.21.0.0-13-g5ccc27cf

by git＠git-us.linaro.org

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 5ccc27cf77c936460b265c973a531a04b7a74014 (commit) from 63517b31c273570ead349cf92834a71d13d8470e (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 ---------------… [View More]-------------------------------------------------- commit 5ccc27cf77c936460b265c973a531a04b7a74014 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Feb 14 17:19:12 2019 +0200 linux-gen: shm: replace ftruncate() with fallocate() fallocate() reserves required memory at call time, so out of memory failures are easier to detect. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 875f9f9d..94a14549 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -256,6 +256,7 @@ static void procsync(void); static int hp_create_file(uint64_t len, const char *filename) { int fd; + int ret; void *addr; if (len <= 0) { @@ -273,10 +274,19 @@ static int hp_create_file(uint64_t len, const char *filename) /* remove file from file system */ unlink(filename); - if (ftruncate(fd, len) == -1) { - ODP_ERR("Could not truncate file: %s\n", strerror(errno)); - close(fd); - return -1; + ret = fallocate(fd, 0, 0, len); + if (ret == -1) { + if (errno == ENOTSUP) { + ODP_DBG("fallocate() not supported\n"); + ret = ftruncate(fd, len); + } + + if (ret == -1) { + ODP_ERR("memory allocation failed: fd=%d, err=%s.\n", + fd, strerror(errno)); + close(fd); + return -1; + } } /* commit huge page */ @@ -637,6 +647,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, * /mnt/huge */ int oflag = O_RDWR | O_CREAT | O_TRUNC; /* flags for open */ char dir[ISHM_FILENAME_MAXLEN]; + int ret; /* No ishm_block_t for the master single VA memory file */ if (single_va) { @@ -676,12 +687,20 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, return -1; } - if (ftruncate(fd, len) == -1) { - ODP_ERR("ftruncate failed: fd=%d, err=%s.\n", - fd, strerror(errno)); - close(fd); - unlink(filename); - return -1; + ret = fallocate(fd, 0, 0, len); + if (ret == -1) { + if (errno == ENOTSUP) { + ODP_DBG("fallocate() not supported\n"); + ret = ftruncate(fd, len); + } + + if (ret == -1) { + ODP_ERR("memory allocation failed: fd=%d, err=%s.\n", + fd, strerror(errno)); + close(fd); + unlink(filename); + return -1; + } } /* No export file is created since this is only for internal use.*/ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_ishm.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) hooks/post-receive -- [View Less]

6 years

[COMMIT] branch master updated. v1.21.0.0-12-g63517b31

by git＠git-us.linaro.org

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 63517b31c273570ead349cf92834a71d13d8470e (commit) from af88591a590faeadeff8a20d6e996c16fc272171 (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 ---------------… [View More]-------------------------------------------------- commit 63517b31c273570ead349cf92834a71d13d8470e Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Feb 12 13:53:42 2019 +0200 validation: timer: calculate number of timers per thread using capability Previously, the test could fail if 'num_workers * NTIMERS' was larger than the maximum number of timers. Also, added a check for timeout pool capability. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index aaffd92d..51caed7a 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -27,6 +27,9 @@ /* Number of timers per thread */ #define NTIMERS 2000 +/* Number of extra timers per thread */ +#define EXTRA_TIMERS 256 + #define NAME "timer_pool" #define RES (10 * ODP_TIME_MSEC_IN_NS / 3) #define MIN_TMO (10 * ODP_TIME_MSEC_IN_NS / 3) @@ -54,6 +57,8 @@ typedef struct { /* Sum of all allocated timers from all threads. Thread-local * caches may make this number lower than the capacity of the pool */ odp_atomic_u32_t timers_allocated; + /* Number of timers allocated per thread */ + uint32_t timers_per_thread; } global_shared_mem_t; static global_shared_mem_t *global_mem; @@ -642,27 +647,28 @@ static int worker_entrypoint(void *arg TEST_UNUSED) odp_timer_set_t timer_rc; odp_timer_pool_t tp = global_mem->tp; odp_pool_t tbp = global_mem->tbp; + uint32_t num_timers = global_mem->timers_per_thread; queue = odp_queue_create("timer_queue", NULL); if (queue == ODP_QUEUE_INVALID) CU_FAIL_FATAL("Queue create failed"); - tt = malloc(sizeof(struct test_timer) * NTIMERS); + tt = malloc(sizeof(struct test_timer) * num_timers); if (!tt) CU_FAIL_FATAL("malloc failed"); /* Prepare all timers */ - for (i = 0; i < NTIMERS; i++) { + for (i = 0; i < num_timers; i++) { tt[i].ev = odp_timeout_to_event(odp_timeout_alloc(tbp)); if (tt[i].ev == ODP_EVENT_INVALID) { LOG_DBG("Failed to allocate timeout (%" PRIu32 "/%d)\n", - i, NTIMERS); + i, num_timers); break; } tt[i].tim = odp_timer_alloc(tp, queue, &tt[i]); if (tt[i].tim == ODP_TIMER_INVALID) { LOG_DBG("Failed to allocate timer (%" PRIu32 "/%d)\n", - i, NTIMERS); + i, num_timers); odp_event_free(tt[i].ev); break; } @@ -837,10 +843,12 @@ static void timer_test_odp_timer_all(void) uint64_t resolution_ns; uint32_t timers_allocated; pthrd_arg thrdarg; + odp_pool_capability_t pool_capa; odp_timer_capability_t timer_capa; odp_pool_t tbp; odp_timer_pool_t tp; uint32_t num_timers; + int timers_per_thread; /* Reserve at least one core for running other processes so the timer * test hopefully can run undisturbed and thus get better timing @@ -860,10 +868,18 @@ static void timer_test_odp_timer_all(void) if (timer_capa.max_timers && timer_capa.max_timers < num_timers) num_timers = timer_capa.max_timers; + CU_ASSERT_FATAL(!odp_pool_capability(&pool_capa)); + if (pool_capa.tmo.max_num && num_timers > pool_capa.tmo.max_num) + num_timers = pool_capa.tmo.max_num; + /* Create timeout pools */ odp_pool_param_init(&params); params.type = ODP_POOL_TIMEOUT; - params.tmo.num = num_timers + num_workers; + params.tmo.num = num_timers; + + timers_per_thread = (num_timers / num_workers) - EXTRA_TIMERS; + global_mem->timers_per_thread = timers_per_thread > 1 ? + timers_per_thread : 1; global_mem->tbp = odp_pool_create("tmo_pool", &params); if (global_mem->tbp == ODP_POOL_INVALID) ----------------------------------------------------------------------- Summary of changes: test/validation/api/timer/timer.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) hooks/post-receive -- [View Less]

6 years, 1 month

[COMMIT] branch master updated. v1.21.0.0-11-gaf88591a

by git＠git-us.linaro.org

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 af88591a590faeadeff8a20d6e996c16fc272171 (commit) via 9ce998af3ae376542a6b52be71d196a50fa032ba (commit) via 695362d8a9aa83eb5cbd7ab1f72d3a3c670fb177 (commit) via 486e4d5231eb84618ccf9ed2bf3ba1e9e2531bba (commit) via 4a9ac7a31a3289222bbba19bc8ecb73561ee9fd7 (… [View More]commit) via 059af8bd22a1e7d9a9dcc31846b06c55b5759df6 (commit) from 7d91ea174cb2a25fa85e2d39fc8528841c4956fe (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 af88591a590faeadeff8a20d6e996c16fc272171 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Feb 7 14:04:59 2019 +0200 api: increment version to v1.21.1 Increment minor version number to reflect backward compatible API changes. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/configure.ac b/configure.ac index f6eeeb7e..be5ae787 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.5]) ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [21]) -m4_define([odpapi_minor_version], [0]) +m4_define([odpapi_minor_version], [1]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) commit 9ce998af3ae376542a6b52be71d196a50fa032ba Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Feb 7 12:33:52 2019 +0200 validation: sched: highlight queue vs sched capa Remove unused queue capa. Rename variables to highlight which capa is used. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 50238ffe..c128580d 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -149,17 +149,17 @@ static void release_context(odp_schedule_sync_t sync) static void scheduler_test_capa(void) { - odp_schedule_capability_t capa; + odp_schedule_capability_t sched_capa; odp_queue_capability_t queue_capa; - memset(&capa, 0, sizeof(odp_schedule_capability_t)); - CU_ASSERT_FATAL(odp_schedule_capability(&capa) == 0); + memset(&sched_capa, 0, sizeof(odp_schedule_capability_t)); + CU_ASSERT_FATAL(odp_schedule_capability(&sched_capa) == 0); CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0); - CU_ASSERT(capa.max_groups != 0); - CU_ASSERT(capa.max_prios != 0); - CU_ASSERT(capa.max_queues != 0); - CU_ASSERT(queue_capa.max_queues >= capa.max_queues); + CU_ASSERT(sched_capa.max_groups != 0); + CU_ASSERT(sched_capa.max_prios != 0); + CU_ASSERT(sched_capa.max_queues != 0); + CU_ASSERT(queue_capa.max_queues >= sched_capa.max_queues); } static void scheduler_test_wait_time(void) @@ -422,7 +422,6 @@ static void scheduler_test_wait(void) static void scheduler_test_queue_size(void) { - odp_queue_capability_t queue_capa; odp_schedule_config_t default_config; odp_pool_t pool; odp_pool_param_t pool_param; @@ -436,8 +435,10 @@ static void scheduler_test_queue_size(void) ODP_SCHED_SYNC_ATOMIC, ODP_SCHED_SYNC_ORDERED}; - CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0); queue_size = DEFAULT_NUM_EV; + + /* Scheduler has been already configured. Use default config as max + * queue size. */ odp_schedule_config_init(&default_config); if (default_config.queue_size && queue_size > default_config.queue_size) @@ -1779,7 +1780,7 @@ static void scheduler_test_ordered_lock(void) static int create_queues(test_globals_t *globals) { int i, j, prios, rc; - odp_queue_capability_t capa; + odp_queue_capability_t queue_capa; odp_schedule_capability_t sched_capa; odp_schedule_config_t default_config; odp_pool_t queue_ctx_pool; @@ -1793,7 +1794,7 @@ static int create_queues(test_globals_t *globals) int queues_per_prio; int sched_types; - if (odp_queue_capability(&capa) < 0) { + if (odp_queue_capability(&queue_capa) < 0) { printf("Queue capability query failed\n"); return -1; } @@ -1826,8 +1827,9 @@ static int create_queues(test_globals_t *globals) num_sched = (prios * queues_per_prio * sched_types) + CHAOS_NUM_QUEUES; num_plain = (prios * queues_per_prio); while ((num_sched > default_config.num_queues || - num_plain > capa.plain.max_num || - num_sched + num_plain > capa.max_queues) && queues_per_prio) { + num_plain > queue_capa.plain.max_num || + num_sched + num_plain > queue_capa.max_queues) && + queues_per_prio) { queues_per_prio--; num_sched = (prios * queues_per_prio * sched_types) + CHAOS_NUM_QUEUES; commit 695362d8a9aa83eb5cbd7ab1f72d3a3c670fb177 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Feb 7 10:31:24 2019 +0200 validation: sched: order ignore param test Added simple, single threaded test to check that events from an ordered queue can be forwarded to a plain queue which ignores ordering (created with ODP_QUEUE_ORDER_IGNORE). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index bdcd7b2d..50238ffe 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -23,7 +23,7 @@ #define NUM_GROUPS 2 #define MAX_QUEUES (64 * 1024) -#define TEST_QUEUE_SIZE_NUM_EV 50 +#define DEFAULT_NUM_EV 50 #define MAX_FLOWS 16 #define FLOW_TEST_NUM_EV (10 * MAX_FLOWS) @@ -437,7 +437,7 @@ static void scheduler_test_queue_size(void) ODP_SCHED_SYNC_ORDERED}; CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0); - queue_size = TEST_QUEUE_SIZE_NUM_EV; + queue_size = DEFAULT_NUM_EV; odp_schedule_config_init(&default_config); if (default_config.queue_size && queue_size > default_config.queue_size) @@ -446,7 +446,7 @@ static void scheduler_test_queue_size(void) odp_pool_param_init(&pool_param); pool_param.buf.size = 100; pool_param.buf.align = 0; - pool_param.buf.num = TEST_QUEUE_SIZE_NUM_EV; + pool_param.buf.num = DEFAULT_NUM_EV; pool_param.type = ODP_POOL_BUFFER; pool = odp_pool_create("test_queue_size", &pool_param); @@ -489,7 +489,7 @@ static void scheduler_test_queue_size(void) } num = 0; - for (j = 0; j < 100 * TEST_QUEUE_SIZE_NUM_EV; j++) { + for (j = 0; j < 100 * DEFAULT_NUM_EV; j++) { ev = odp_schedule(&from, ODP_SCHED_NO_WAIT); if (ev == ODP_EVENT_INVALID) @@ -507,6 +507,120 @@ static void scheduler_test_queue_size(void) CU_ASSERT_FATAL(odp_pool_destroy(pool) == 0); } +static void scheduler_test_order_ignore(void) +{ + odp_queue_capability_t queue_capa; + odp_schedule_config_t default_config; + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_queue_param_t queue_param; + odp_queue_t ordered, plain, from; + odp_event_t ev; + odp_buffer_t buf; + uint32_t j, queue_size, num; + int ret; + + odp_schedule_config_init(&default_config); + CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0); + + queue_size = DEFAULT_NUM_EV; + if (default_config.queue_size && + queue_size > default_config.queue_size) + queue_size = default_config.queue_size; + + if (queue_capa.plain.max_size && + queue_size > queue_capa.plain.max_size) + queue_size = queue_capa.plain.max_size; + + odp_pool_param_init(&pool_param); + pool_param.buf.size = 100; + pool_param.buf.align = 0; + pool_param.buf.num = DEFAULT_NUM_EV; + pool_param.type = ODP_POOL_BUFFER; + + pool = odp_pool_create("test_order_ignore", &pool_param); + + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + /* Ensure that scheduler is empty */ + for (j = 0; j < 10;) { + ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT); + CU_ASSERT(ev == ODP_EVENT_INVALID); + + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + else + j++; + } + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.prio = odp_schedule_default_prio(); + queue_param.sched.sync = ODP_SCHED_SYNC_ORDERED; + queue_param.sched.group = ODP_SCHED_GROUP_ALL; + + ordered = odp_queue_create("ordered", &queue_param); + CU_ASSERT_FATAL(ordered != ODP_QUEUE_INVALID); + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_PLAIN; + queue_param.order = ODP_QUEUE_ORDER_IGNORE; + + plain = odp_queue_create("plain", &queue_param); + CU_ASSERT_FATAL(plain != ODP_QUEUE_INVALID); + + num = 0; + for (j = 0; j < queue_size; j++) { + buf = odp_buffer_alloc(pool); + CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); + + ev = odp_buffer_to_event(buf); + ret = odp_queue_enq(ordered, ev); + + if (ret) + odp_event_free(ev); + else + num++; + } + + CU_ASSERT(num == queue_size); + + num = 0; + for (j = 0; j < 100 * DEFAULT_NUM_EV; j++) { + ev = odp_schedule(&from, ODP_SCHED_NO_WAIT); + + if (ev == ODP_EVENT_INVALID) + continue; + + CU_ASSERT(from == ordered); + ret = odp_queue_enq(plain, ev); + + if (ret) + odp_event_free(ev); + else + num++; + } + + CU_ASSERT(num == queue_size); + + num = 0; + for (j = 0; j < 100 * DEFAULT_NUM_EV; j++) { + ev = odp_queue_deq(plain); + + if (ev == ODP_EVENT_INVALID) + continue; + + odp_event_free(ev); + num++; + } + + CU_ASSERT(num == queue_size); + + CU_ASSERT_FATAL(odp_queue_destroy(ordered) == 0); + CU_ASSERT_FATAL(odp_queue_destroy(plain) == 0); + CU_ASSERT_FATAL(odp_pool_destroy(pool) == 0); +} + static void scheduler_test_groups(void) { odp_pool_t p; @@ -2136,6 +2250,7 @@ odp_testinfo_t scheduler_suite[] = { ODP_TEST_INFO(scheduler_test_queue_destroy), ODP_TEST_INFO(scheduler_test_wait), ODP_TEST_INFO(scheduler_test_queue_size), + ODP_TEST_INFO(scheduler_test_order_ignore), ODP_TEST_INFO(scheduler_test_groups), ODP_TEST_INFO(scheduler_test_pause_resume), ODP_TEST_INFO(scheduler_test_ordered_lock), commit 486e4d5231eb84618ccf9ed2bf3ba1e9e2531bba Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Feb 7 12:18:59 2019 +0200 linux-gen: sched: implement QUEUE_ORDER_IGNORE option in scalable Scalable scheduler implementation of QUEUE_ORDER_IGNORE option. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 88abe8c7..b4e62b08 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -632,7 +632,8 @@ static int _queue_enq_multi(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr[], queue = qentry_from_int(handle); ts = sched_ts; - if (ts && odp_unlikely(ts->out_of_order)) { + if (ts && odp_unlikely(ts->out_of_order) && + (queue->s.param.order == ODP_QUEUE_ORDER_KEEP)) { actual = rctx_save(queue, buf_hdr, num); return actual; } @@ -888,6 +889,7 @@ static void queue_param_init(odp_queue_param_t *params) params->sched.prio = odp_schedule_default_prio(); params->sched.sync = ODP_SCHED_SYNC_PARALLEL; params->sched.group = ODP_SCHED_GROUP_ALL; + params->order = ODP_QUEUE_ORDER_KEEP; } static int queue_info(odp_queue_t handle, odp_queue_info_t *info) diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 4e9dd771..326c49e3 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -2064,8 +2064,9 @@ static int ord_enq_multi(odp_queue_t handle, void *buf_hdr[], int num, int actual; ts = sched_ts; - if (ts && odp_unlikely(ts->out_of_order)) { - queue = qentry_from_int(handle); + queue = qentry_from_int(handle); + if (ts && odp_unlikely(ts->out_of_order) && + (queue->s.param.order == ODP_QUEUE_ORDER_KEEP)) { actual = rctx_save(queue, (odp_buffer_hdr_t **)buf_hdr, num); *ret = actual; return 1; commit 4a9ac7a31a3289222bbba19bc8ecb73561ee9fd7 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Feb 7 09:31:50 2019 +0200 linux-gen: sched: implement QUEUE_ORDER_IGNORE option If destination queue does not require order maintenance, fall back from ordered enqueue to normal enqueue operation. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 37a2fad1..74ed1faa 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -615,6 +615,7 @@ static void queue_param_init(odp_queue_param_t *params) params->enq_mode = ODP_QUEUE_OP_MT; params->deq_mode = ODP_QUEUE_OP_MT; params->nonblocking = ODP_BLOCKING; + params->order = ODP_QUEUE_ORDER_KEEP; params->sched.prio = odp_schedule_default_prio(); params->sched.sync = ODP_SCHED_SYNC_PARALLEL; params->sched.group = ODP_SCHED_GROUP_ALL; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 6176c951..d20fd735 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -846,9 +846,13 @@ static int schedule_ord_enq_multi(odp_queue_t dst_queue, void *buf_hdr[], if (sched_local.ordered.in_order) return 0; + dst_qentry = qentry_from_handle(dst_queue); + + if (dst_qentry->s.param.order == ODP_QUEUE_ORDER_IGNORE) + return 0; + src_queue = sched_local.ordered.src_queue; stash_num = sched_local.ordered.stash_num; - dst_qentry = qentry_from_handle(dst_queue); if (ordered_own_turn(src_queue)) { /* Own turn, so can do enqueue directly. */ commit 059af8bd22a1e7d9a9dcc31846b06c55b5759df6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Feb 6 16:40:00 2019 +0200 api: queue: add order maintenance parameter Added a parameter to control if a destination queue does not require event re-ordering. By default, event order is maintained for all destination queues as before. Application may use ODP_QUEUE_ORDER_IGNORE for those queues that are used under ordered queue context, but do not require re-ordering and/or do need to avoid extra re-ordering delays. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/queue_types.h b/include/odp/api/spec/queue_types.h index c8f31046..3ed9246d 100644 --- a/include/odp/api/spec/queue_types.h +++ b/include/odp/api/spec/queue_types.h @@ -122,6 +122,37 @@ typedef enum odp_nonblocking_t { } odp_nonblocking_t; +/** + * Original event order maintenance options + * + * Options to keep or ignore the original event order of a source queue. This + * option is relevant for (plain or parallel scheduled) queues that are + * destinations for events enqueued while holding an ordered queue + * synchronization context. By default, an ordered context maintains original + * event order regardless of the destination queue type. Event re-ordering may + * cause extra synchronization effort for implementation and a long delay before + * application can receive a re-ordered event from the destination queue. This + * is wasteful and in some cases the extra delay is not acceptable for those + * destination queues that do not need to maintain the original event order. + * Application can use ODP_QUEUE_ORDER_IGNORE option to prevent implementation + * from performing unnecessary event re-ordering and negative side-effects of + * that. + */ +typedef enum odp_queue_order_t { + /** Keep original event order. Events enqueued into this queue while + * holding an ordered queue synchronization context maintain the + * original event order of the source queue. + */ + ODP_QUEUE_ORDER_KEEP = 0, + + /** Ignore original event order. Events enqueued into this queue do not + * need to maintain the original event order of the source queue. + * Implementation must avoid significant event re-ordering delays. + */ + ODP_QUEUE_ORDER_IGNORE + +} odp_queue_order_t; + /** * Queue capabilities */ @@ -262,6 +293,12 @@ typedef struct odp_queue_param_t { * ODP_QUEUE_TYPE_SCHED. */ odp_schedule_param_t sched; + /** Original event order maintenance + * + * Keep or ignore the original event order of a source queue. + * The default value is ODP_QUEUE_ORDER_KEEP. */ + odp_queue_order_t order; + /** Non-blocking level * * Queue implementation must guarantee at least this level of block diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index 2acec0db..c5325901 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -77,7 +77,10 @@ extern "C" { * The atomic queue synchronization context is dedicated to the thread until it * requests another event from the scheduler, which implicitly releases the * context. User may allow the scheduler to release the context earlier than - * that by calling odp_schedule_release_atomic(). + * that by calling odp_schedule_release_atomic(). However, this call is just + * a hint to the implementation and the context may be held until the next + * schedule call. + * * When scheduler is enabled as flow-aware, the event flow id value affects * scheduling of the event and synchronization is maintained per flow within * each queue. @@ -97,7 +100,9 @@ extern "C" { * queue synchronization context. A thread holds the context until it * requests another event from the scheduler, which implicitly releases the * context. User may allow the scheduler to release the context earlier than - * that by calling odp_schedule_release_ordered(). + * that by calling odp_schedule_release_ordered(). However, this call is just + * a hint to the implementation and the context may be held until the next + * schedule call. * * Events from the same (source) queue appear in their original order * when dequeued from a destination queue. The destination queue can have any @@ -107,6 +112,11 @@ extern "C" { * (e.g. freed or stored) within the context are considered missing from * reordering and are skipped at this time (but can be ordered again within * another context). + * + * Unnecessary event re-ordering may be avoided for those destination queues + * that do not need to maintain the original event order by setting 'order' + * queue parameter to ODP_QUEUE_ORDER_IGNORE. + * * When scheduler is enabled as flow-aware, the event flow id value affects * scheduling of the event and synchronization is maintained per flow within * each queue. ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- include/odp/api/spec/queue_types.h | 37 ++++++ include/odp/api/spec/schedule_types.h | 14 ++- platform/linux-generic/odp_queue_basic.c | 1 + platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_schedule_basic.c | 6 +- platform/linux-generic/odp_schedule_scalable.c | 5 +- test/validation/api/scheduler/scheduler.c | 151 ++++++++++++++++++++++--- 8 files changed, 196 insertions(+), 24 deletions(-) hooks/post-receive -- [View Less]

6 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
121
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp