git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch master updated. v1.15.0.0-98-g4537d096

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 4537d096721a753086592ed5a989beab5647bcfa (commit) from 93cbd8caf4ab5ccf22c092d42df4028969ed8a7b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-97-g93cbd8ca

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 93cbd8caf4ab5ccf22c092d42df4028969ed8a7b (commit) via 2050915d34995f4be695a88dd99e9275f346733b (commit) via ded0918391865956e3b00df3c43e4311a7285d4b (commit) from a2040db93b114fb9e1da9aeca1d0a1ea91699448 (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 93cbd8caf4ab5ccf22c092d42df4028969ed8a7b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Aug 2 16:48:44 2017 +0300 travis: make distcheck work with custom cunit distcheck uses it's own arguments to validate distribution and does not inherrit them from top level configure. Provide c/ld flags directly to make it happy compile and run tests. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index b006af3e..6da2a858 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,7 +236,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck + - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck CFLAGS="-I$HOME/cunit-install/$CROSS_ARCH/include" LDFLAGS="-L$HOME/cunit-install/$CROSS_ARCH/lib" - stage: test env: TEST=doxygen compiler: gcc commit 2050915d34995f4be695a88dd99e9275f346733b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Aug 1 17:48:36 2017 +0300 tavis: cache cunit Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 64e01634..b006af3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,7 @@ cache: - directories: - dpdk - netmap + - $HOME/cunit-install env: - CONF="" @@ -88,23 +89,26 @@ before_install: fi - if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi - ccache -s - # Install cunit for the validation tests because distro version is too old and fails C99 compile - sudo apt-get remove libcunit1-dev libcunit1 - - export CUNIT_VERSION=2.1-3 - - curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit… - - tar -jxf *.bz2 - - pushd CUnit* - - libtoolize --force --copy - - aclocal - - autoheader - - automake --add-missing --include-deps --copy - - autoconf - - ./configure --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test $CROSS || cat config.log - - make - - sudo make install - - popd - - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" + - export LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" + - | + if [ ! -f "$HOME/cunit-install/$CROSS_ARCH/lib/libcunit.a" ]; then + export CUNIT_VERSION=2.1-3 + curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit… + tar -jxf *.bz2 + pushd CUnit* + libtoolize --force --copy + aclocal + autoheader + automake --add-missing --include-deps --copy + autoconf + ./configure --prefix=$HOME/cunit-install/$CROSS_ARCH --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test $CROSS || cat config.log + make + sudo make install + popd + fi + - find $HOME/cunit-install install: - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages @@ -146,10 +150,10 @@ install: script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap $CONF + - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH $CONF - make -j $(nproc) - mkdir /dev/shm/odp - - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check + - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" ODP_SHM_DIR=/dev/shm/odp make check - make install - echo "Checking linking and run from install..." @@ -171,7 +175,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=aarch64-linux-gnu\"" @@ -179,8 +183,8 @@ jobs: install: true script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install $CROSS - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - ./configure --prefix=$HOME/odp/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: arm-linux-gnueabihf-gcc @@ -189,7 +193,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=arm-linux-gnueabihf\"" @@ -198,7 +202,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: powerpc-linux-gnu-gcc @@ -207,7 +211,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test compiler: "\"clang-3.8 --target=powerpc-linux-gnu\"" @@ -216,23 +220,23 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS - --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH - make -j $(nproc) - stage: test env: TEST=coverage compiler: gcc script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" - - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check + - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" + - sudo LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test env: TEST=distcheck compiler: gcc script: - ./bootstrap - - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example - - sudo PATH="$PATH" LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck + - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-cunit-path=$HOME/cunit-install/$CROSS_ARCH + - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck - stage: test env: TEST=doxygen compiler: gcc commit ded0918391865956e3b00df3c43e4311a7285d4b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Aug 1 17:41:31 2017 +0300 travis: cache netmap build Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 26dd2b38..64e01634 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ cache: - pip - directories: - dpdk + - netmap env: - CONF="" @@ -133,12 +134,15 @@ install: fi # Netmap pktio - - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git - - pushd netmap/LINUX - - ./configure - - make - - sudo insmod ./netmap.ko - - popd + - | + if [ ! -f "netmap/LINUX/netmap.ko" ]; then + git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git + pushd netmap/LINUX + ./configure + make + sudo insmod ./netmap.ko + popd + fi script: - ./bootstrap ----------------------------------------------------------------------- Summary of changes: .travis.yml | 76 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 34 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-525-g999042e5

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, api-next has been updated via 999042e51837a7ed8c7fb616f75707349515fc3d (commit) from aaceddaf56175ee207fcbf9c241a7839bdea091b (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 999042e51837a7ed8c7fb616f75707349515fc3d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 31 23:01:04 2017 +0300 linux-gen: timer: set sigev_value in timer_res_init Even if signal is never to be delivered, it is still required to set sigev_value in sigevent structure. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 9fc0675d..fdb48902 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -844,6 +844,7 @@ static int timer_res_init(void) sigev.sigev_notify = SIGEV_THREAD_ID; sigev._sigev_un._tid = (pid_t)syscall(SYS_gettid); + sigev.sigev_value.sival_ptr = NULL; sigev.sigev_signo = SIGUSR1; /* Create timer */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_timer.c | 1 + 1 file changed, 1 insertion(+) hooks/post-receive --

8 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-94-ga2040db9

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 a2040db93b114fb9e1da9aeca1d0a1ea91699448 (commit) from a1786671550c5f83a6c9e7cecd9da4cead7b4cc9 (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 a2040db93b114fb9e1da9aeca1d0a1ea91699448 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 31 10:09:42 2017 +0300 linux-gen: crypto: check packet length during operation Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 68fc5658..ab42132a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -242,6 +242,8 @@ int internal_encrypt(EVP_CIPHER_CTX *ctx, odp_crypto_op_param_t *param) int cipher_len; int ret; + ODP_ASSERT(in_pos + in_len <= odp_packet_len(pkt)); + while (in_len > 0) { uint32_t seglen = 0; /* GCC */ uint8_t *insegaddr = odp_packet_offset(pkt, in_pos, @@ -297,6 +299,8 @@ int internal_decrypt(EVP_CIPHER_CTX *ctx, odp_crypto_op_param_t *param) int cipher_len; int ret; + ODP_ASSERT(in_pos + in_len <= odp_packet_len(pkt)); + while (in_len > 0) { uint32_t seglen = 0; /* GCC */ uint8_t *insegaddr = odp_packet_offset(pkt, in_pos, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_crypto.c | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive --

8 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-93-ga1786671

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 a1786671550c5f83a6c9e7cecd9da4cead7b4cc9 (commit) via cd0cd7af17c1c042288141b7968ccf5385398493 (commit) via c177532c1033b0dfa918774670bb61ad13f56730 (commit) via f319f7fe8524a2606b32979c365855b83fb4571e (commit) via 2e474c1a2af0bc4ef28706deee59000c5c6f34f4 (commit) via acb029364daa3299ea416f1fd2e8feb60e99d0fd (commit) via d4fe8e46c05d9b590c762502489386421ee025b1 (commit) via 8745330b32579ab66354f9d2043154f8ef326290 (commit) via e0738b61c3257145c50d4751bcf4e20b5fc5f0ec (commit) via a4afaf9198ac0621b4c8e5ade82cb4f98aeb61cd (commit) from bb0ca193f8c28036fdf8b3d6c8aa5d4f11980e6c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/packet_flag_inlines.h | 3 +- .../include/odp/api/plat/packet_inlines.h | 74 +-- .../include/odp/api/plat/packet_inlines_api.h | 16 - .../include/odp/api/plat/packet_types.h | 12 + .../linux-generic/include/odp_packet_internal.h | 98 +++- platform/linux-generic/odp_packet.c | 620 +++++++++++++++------ platform/linux-generic/pktio/ipc.c | 7 +- 7 files changed, 599 insertions(+), 231 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-524-gaaceddaf

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, api-next has been updated via aaceddaf56175ee207fcbf9c241a7839bdea091b (commit) via a1786671550c5f83a6c9e7cecd9da4cead7b4cc9 (commit) via cd0cd7af17c1c042288141b7968ccf5385398493 (commit) via c177532c1033b0dfa918774670bb61ad13f56730 (commit) via f319f7fe8524a2606b32979c365855b83fb4571e (commit) via 2e474c1a2af0bc4ef28706deee59000c5c6f34f4 (commit) via acb029364daa3299ea416f1fd2e8feb60e99d0fd (commit) via d4fe8e46c05d9b590c762502489386421ee025b1 (commit) via 8745330b32579ab66354f9d2043154f8ef326290 (commit) via e0738b61c3257145c50d4751bcf4e20b5fc5f0ec (commit) via a4afaf9198ac0621b4c8e5ade82cb4f98aeb61cd (commit) from 30ed14c05ac17406c2f7890b34c4ac580b5e7a45 (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 aaceddaf56175ee207fcbf9c241a7839bdea091b Merge: 30ed14c0 a1786671 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Aug 2 17:53:48 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc platform/linux-generic/include/odp_packet_internal.h index e028bc28,d923ee23..91fba1ea --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@@ -214,7 -267,10 +272,11 @@@ static inline void packet_init(odp_pack CONFIG_PACKET_TAILROOM; pkt_hdr->input = ODP_PKTIO_INVALID; + pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; + + /* By default packet has no references */ + pkt_hdr->unshared_len = len; + pkt_hdr->ref_hdr = NULL; } static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/packet_flag_inlines.h | 3 +- .../include/odp/api/plat/packet_inlines.h | 74 +-- .../include/odp/api/plat/packet_inlines_api.h | 16 - .../include/odp/api/plat/packet_types.h | 12 + .../linux-generic/include/odp_packet_internal.h | 98 +++- platform/linux-generic/odp_packet.c | 620 +++++++++++++++------ platform/linux-generic/pktio/ipc.c | 7 +- 7 files changed, 599 insertions(+), 231 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-83-gbb0ca193

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 bb0ca193f8c28036fdf8b3d6c8aa5d4f11980e6c (commit) from 10ef82e6d4db8c02dd5caa2e97172688e829b90c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-513-g30ed14c0

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, api-next has been updated via 30ed14c05ac17406c2f7890b34c4ac580b5e7a45 (commit) via bb0ca193f8c28036fdf8b3d6c8aa5d4f11980e6c (commit) via 10ef82e6d4db8c02dd5caa2e97172688e829b90c (commit) from c16f1363303cd5fc11324acbc4dfebe0a9680a41 (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 30ed14c05ac17406c2f7890b34c4ac580b5e7a45 Merge: c16f1363 bb0ca193 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Aug 1 17:35:54 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .travis.yml | 5 ++--- test/Makefile.inc | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 6 months

[COMMIT] branch master updated. v1.15.0.0-82-g10ef82e6

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 10ef82e6d4db8c02dd5caa2e97172688e829b90c (commit) from 79336f5eaee25168a5e4ad7fc0aee07395d4ca1f (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 10ef82e6d4db8c02dd5caa2e97172688e829b90c Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Jul 31 18:53:22 2017 +0300 test: fix cunit include path If CUnit is placed in non standard directory and path to it specified with configure option following error occurs: fatal error: CUnit/Basic.h: No such file or directory Patch corrects CFLAGS to make compilation pass. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/test/Makefile.inc b/test/Makefile.inc index bf31b374..0fbc3c42 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -16,6 +16,7 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS += $(CUNIT_CPPFLAGS) AM_CXXFLAGS = $(INCFLAGS) AM_LDFLAGS += -L$(LIB) ----------------------------------------------------------------------- Summary of changes: test/Makefile.inc | 1 + 1 file changed, 1 insertion(+) hooks/post-receive --

8 years, 6 months

[COMMIT] branch api-next updated. v1.15.0.0-510-gc16f1363

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, api-next has been updated via c16f1363303cd5fc11324acbc4dfebe0a9680a41 (commit) via fbdc9ca1e38e6c97014e68bf7b83e59096a170b7 (commit) via 2e08ac6e40551704c43233b40a9227a19fd4623b (commit) via 5386c44d204f0b42f2773cf87126ff8981bf3270 (commit) from 56dbc8702500f7d7e518fcea4f3b1ff853722004 (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 c16f1363303cd5fc11324acbc4dfebe0a9680a41 Author: Kevin Wang <kevin.wang(a)arm.com> Date: Thu Jul 20 11:43:26 2017 +0800 doc: userguide: add odp_timer_capability() section to user guide Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide-timer.adoc b/doc/users-guide/users-guide-timer.adoc index 9cd30de1..4a8bad74 100644 --- a/doc/users-guide/users-guide-timer.adoc +++ b/doc/users-guide/users-guide-timer.adoc @@ -6,7 +6,8 @@ timing features found in various platforms that support ODP implementations. Timers are drawn from specialized pools called _timer pools_ that have their own abstract type (`odp_timer_pool_t`). Each timer pool is a logically independent time source with its own _resolution_ measured in nanoseconds (ns) -and a maximum number of timers that it can support. Applications can have many +and a maximum number of timers that it can support. The max _resolution_ is +able to be obtained from `odp_timer_capability()`. Applications can have many timers active at the same time and can set them to use either relative or absolute time. Associated with each timer is a queue that is to receive events when this timer expires. This queue is created by a separate commit fbdc9ca1e38e6c97014e68bf7b83e59096a170b7 Author: Kevin Wang <kevin.wang(a)arm.com> Date: Thu Jul 20 11:43:25 2017 +0800 validation/example: call odp_timer_capability() before creating timer pool Use odp_timer_capability() to determine the max timer resolution Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 9336cec1..02282e81 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -32,6 +32,7 @@ #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ #define APPL_MODE_RCV 2 /**< receive mode */ +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) /** print appl mode */ #define PRINT_APPL_MODE(x) printf("%s(%i)\n", #x, (x)) @@ -813,6 +814,7 @@ int main(int argc, char *argv[]) interface_t *ifs; odp_instance_t instance; odph_odpthread_params_t thr_params; + odp_timer_capability_t timer_capa; /* Init ODP before calling anything else */ if (odp_init_global(&instance, NULL, NULL)) { @@ -898,7 +900,12 @@ int main(int argc, char *argv[]) odp_pool_print(pool); /* Create timer pool */ - tparams.res_ns = 1 * ODP_TIME_MSEC_IN_NS; + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) { + EXAMPLE_ERR("Error: get timer capacity failed.\n"); + exit(EXIT_FAILURE); + } + tparams.res_ns = MAX(1 * ODP_TIME_MSEC_IN_NS, + timer_capa.highest_res_ns); tparams.min_tmo = 0; tparams.max_tmo = 10000 * ODP_TIME_SEC_IN_NS; tparams.num_timers = num_workers; /* One timer per worker */ diff --git a/example/timer/odp_timer_simple.c b/example/timer/odp_timer_simple.c index 70804bb7..6c76f2a2 100644 --- a/example/timer/odp_timer_simple.c +++ b/example/timer/odp_timer_simple.c @@ -18,6 +18,8 @@ /* ODP main header */ #include <odp_api.h> +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) + int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) { odp_instance_t instance; @@ -35,6 +37,7 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) uint64_t tick; odp_timeout_t tmo; int ret = 0; + odp_timer_capability_t timer_capa; /* * Init ODP app @@ -61,7 +64,12 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) /* * Create pool of timeouts */ - tparams.res_ns = 10 * ODP_TIME_MSEC_IN_NS; + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) { + ret += 1; + goto err_tp; + } + tparams.res_ns = MAX(10 * ODP_TIME_MSEC_IN_NS, + timer_capa.highest_res_ns); tparams.min_tmo = 10 * ODP_TIME_MSEC_IN_NS; tparams.max_tmo = 1 * ODP_TIME_SEC_IN_NS; tparams.num_timers = 1; /* One timer per worker */ diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index 2196b8c1..486227d1 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -23,7 +23,7 @@ #define MAX_WORKERS 32 /**< Max worker threads */ #define NUM_TMOS 10000 /**< Number of timers */ #define WAIT_NUM 10 /**< Max tries to rx last tmo per worker */ - +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) /** Test arguments */ typedef struct { @@ -259,6 +259,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) { int opt; int long_index; + odp_timer_capability_t timer_capa; static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, @@ -277,8 +278,12 @@ static void parse_args(int argc, char *argv[], test_args_t *args) odph_parse_options(argc, argv, shortopts, longopts); /* defaults */ + odp_timer_capability(ODP_CLOCK_CPU, &timer_capa); + args->cpu_count = 0; /* all CPU's */ - args->resolution_us = 10000; + args->resolution_us = MAX(10000, + timer_capa.highest_res_ns / + ODP_TIME_USEC_IN_NS); args->min_us = 0; args->max_us = 10000000; args->period_us = 1000000; diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index 88135160..6c177d4c 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -20,6 +20,8 @@ #include "test_debug.h" #include "timer.h" +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) + /** @private Timeout range in milliseconds (ms) */ #define RANGE_MS 2000 @@ -149,6 +151,7 @@ void timer_test_odp_timer_cancel(void) odp_timeout_t tmo; odp_timer_set_t rc; uint64_t tick; + odp_timer_capability_t timer_capa; odp_pool_param_init(&params); params.type = ODP_POOL_TIMEOUT; @@ -159,7 +162,11 @@ void timer_test_odp_timer_cancel(void) if (pool == ODP_POOL_INVALID) CU_FAIL_FATAL("Timeout pool create failed"); - tparam.res_ns = 100 * ODP_TIME_MSEC_IN_NS; + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) + CU_FAIL_FATAL("Get timer capability failed") + + tparam.res_ns = MAX(100 * ODP_TIME_MSEC_IN_NS, + timer_capa.highest_res_ns); tparam.min_tmo = 1 * ODP_TIME_SEC_IN_NS; tparam.max_tmo = 10 * ODP_TIME_SEC_IN_NS; tparam.num_timers = 1; @@ -506,6 +513,7 @@ void timer_test_odp_timer_all(void) uint64_t ns; uint64_t t2; pthrd_arg thrdarg; + odp_timer_capability_t timer_capa; /* Reserve at least one core for running other processes so the timer * test hopefully can run undisturbed and thus get better timing @@ -531,12 +539,15 @@ void timer_test_odp_timer_all(void) #define NAME "timer_pool" #define RES (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MIN (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MAX (1000000 * ODP_TIME_MSEC_IN_NS) +#define MIN_TMO (10 * ODP_TIME_MSEC_IN_NS / 3) +#define MAX_TMO (1000000 * ODP_TIME_MSEC_IN_NS) /* Create a timer pool */ - tparam.res_ns = RES; - tparam.min_tmo = MIN; - tparam.max_tmo = MAX; + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) + CU_FAIL("Error: get timer capacity failed.\n"); + + tparam.res_ns = MAX(RES, timer_capa.highest_res_ns); + tparam.min_tmo = MIN_TMO; + tparam.max_tmo = MAX_TMO; tparam.num_timers = num_workers * NTIMERS; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -550,9 +561,10 @@ void timer_test_odp_timer_all(void) if (odp_timer_pool_info(tp, &tpinfo) != 0) CU_FAIL("odp_timer_pool_info"); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); - CU_ASSERT(tpinfo.param.res_ns == RES); - CU_ASSERT(tpinfo.param.min_tmo == MIN); - CU_ASSERT(tpinfo.param.max_tmo == MAX); + CU_ASSERT(tpinfo.param.res_ns == MAX(RES, + timer_capa.highest_res_ns)); + CU_ASSERT(tpinfo.param.min_tmo == MIN_TMO); + CU_ASSERT(tpinfo.param.max_tmo == MAX_TMO); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); LOG_DBG("Timer pool handle: %" PRIu64 "\n", odp_timer_pool_to_u64(tp)); commit 2e08ac6e40551704c43233b40a9227a19fd4623b Author: Kevin Wang <kevin.wang(a)arm.com> Date: Thu Jul 20 11:43:24 2017 +0800 linux-generic: timer: implement odp_timer_capability() Implement a new internal function timer_res_init() to detect the max timer resolution without overrun at the ODP init stage. It will check timer resolution from 1ms to 100us, 10us...1ns until the timer is overrun. Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index bf7f1acd..9fc0675d 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -73,6 +73,9 @@ static _odp_atomic_flag_t locks[NUM_LOCKS]; /* Multiple locks per cache line! */ #define IDX2LOCK(idx) (&locks[(idx) % NUM_LOCKS]) #endif +/* Max timer resolution in nanoseconds */ +static uint64_t highest_res_ns; + /****************************************************************************** * Translation between timeout buffer and timeout header *****************************************************************************/ @@ -192,6 +195,8 @@ typedef struct odp_timer_pool_s { #define MAX_TIMER_POOLS 255 /* Leave one for ODP_TIMER_INVALID */ #define INDEX_BITS 24 +#define TIMER_RES_TEST_LOOP_COUNT 10 +#define TIMER_RES_ROUNDUP_FACTOR 10 static odp_atomic_u32_t num_timer_pools; static odp_timer_pool *timer_pool[MAX_TIMER_POOLS]; @@ -820,6 +825,83 @@ static void *timer_thread(void *arg) return NULL; } +/* Get the max timer resolution without overrun and fill in timer_res variable. + * + * Set timer's interval with candidate resolutions to get the max resolution + * that the timer would not be overrun. + * The candidate resolution value is from 1ms to 100us, 10us...1ns etc. + */ +static int timer_res_init(void) +{ + struct sigevent sigev; + timer_t timerid; + uint64_t res, sec, nsec; + struct itimerspec ispec; + sigset_t sigset; + siginfo_t si; + int loop_cnt; + struct timespec tmo; + + sigev.sigev_notify = SIGEV_THREAD_ID; + sigev._sigev_un._tid = (pid_t)syscall(SYS_gettid); + sigev.sigev_signo = SIGUSR1; + + /* Create timer */ + if (timer_create(CLOCK_MONOTONIC, &sigev, &timerid)) + ODP_ABORT("timer_create() returned error %s\n", + strerror(errno)); + + /* Timer resolution start from 1ms */ + res = ODP_TIME_MSEC_IN_NS; + /* Set initial value of timer_res */ + highest_res_ns = res; + sigemptyset(&sigset); + /* Add SIGUSR1 to sigset */ + sigaddset(&sigset, SIGUSR1); + sigprocmask(SIG_BLOCK, &sigset, NULL); + + while (res > 0) { + /* Loop for 10 times to test the result */ + loop_cnt = TIMER_RES_TEST_LOOP_COUNT; + sec = res / ODP_TIME_SEC_IN_NS; + nsec = res - sec * ODP_TIME_SEC_IN_NS; + + memset(&ispec, 0, sizeof(ispec)); + ispec.it_interval.tv_sec = (time_t)sec; + ispec.it_interval.tv_nsec = (long)nsec; + ispec.it_value.tv_sec = (time_t)sec; + ispec.it_value.tv_nsec = (long)nsec; + + if (timer_settime(timerid, 0, &ispec, NULL)) + ODP_ABORT("timer_settime() returned error %s\n", + strerror(errno)); + /* Set signal wait timeout to 10*res */ + tmo.tv_sec = 0; + tmo.tv_nsec = res * 10; + while (loop_cnt--) { + if (sigtimedwait(&sigset, &si, &tmo) > 0) { + if (timer_getoverrun(timerid)) + /* overrun at this resolution */ + /* goto the end */ + goto timer_res_init_done; + } + } + /* Set timer_res */ + highest_res_ns = res; + /* Test the next timer resolution candidate */ + res /= 10; + } + +timer_res_init_done: + highest_res_ns *= TIMER_RES_ROUNDUP_FACTOR; + if (timer_delete(timerid) != 0) + ODP_ABORT("timer_delete() returned error %s\n", + strerror(errno)); + sigemptyset(&sigset); + sigprocmask(SIG_BLOCK, &sigset, NULL); + return 0; +} + static void itimer_init(odp_timer_pool *tp) { struct sigevent sigev; @@ -877,6 +959,20 @@ static void itimer_fini(odp_timer_pool *tp) * Some parameter checks and error messages * No modificatios of internal state *****************************************************************************/ +int odp_timer_capability(odp_timer_clk_src_t clk_src, + odp_timer_capability_t *capa) +{ + int ret = 0; + + if (clk_src == ODP_CLOCK_CPU) { + capa->highest_res_ns = highest_res_ns; + } else { + ODP_ERR("ODP timer system doesn't support external clock source currently\n"); + ret = -1; + } + return ret; +} + odp_timer_pool_t odp_timer_pool_create(const char *name, const odp_timer_pool_param_t *param) @@ -1093,8 +1189,10 @@ int odp_timer_init_global(const odp_init_t *params) time_per_ratelimit_period = odp_time_global_from_ns(CONFIG_TIMER_RUN_RATELIMIT_NS); - if (!inline_timers) + if (!inline_timers) { + timer_res_init(); block_sigalarm(); + } return 0; } commit 5386c44d204f0b42f2773cf87126ff8981bf3270 Author: Kevin Wang <kevin.wang(a)arm.com> Date: Thu Jul 20 11:43:23 2017 +0800 api: timer: add odp_timer_capability() api Currently, user needs to decide the timer resolution before creating a timer pool. But sometimes it will cause timer overrun as the system can't support such high resolution. So a new API is required to expose the timer capability to the user. Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 75f9db98..b76f5654 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -108,6 +108,33 @@ typedef struct { } odp_timer_pool_param_t; /** + * Timer capability + */ +typedef struct { + /** Highest timer resolution in nanoseconds. + * + * This defines the highest resolution supported by a timer. + * It's the minimum valid value for 'res_ns' timer pool + * parameter. + */ + uint64_t highest_res_ns; +} odp_timer_capability_t; + +/** + * Query timer capabilities + * + * Outputs timer capabilities on success. + * + * @param clk_src Clock source for timers + * @param[out] capa Pointer to capability structure for output + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_timer_capability(odp_timer_clk_src_t clk_src, + odp_timer_capability_t *capa); + +/** * Create a timer pool * * The use of pool name is optional. Unique names are not required. ----------------------------------------------------------------------- Summary of changes: doc/users-guide/users-guide-timer.adoc | 3 +- example/generator/odp_generator.c | 9 ++- example/timer/odp_timer_simple.c | 10 ++- example/timer/odp_timer_test.c | 9 ++- include/odp/api/spec/timer.h | 27 +++++++ platform/linux-generic/odp_timer.c | 100 +++++++++++++++++++++++++- test/common_plat/validation/api/timer/timer.c | 30 +++++--- 7 files changed, 173 insertions(+), 15 deletions(-) hooks/post-receive --

8 years, 6 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp