git-lng-odp April 2017

git-lng-odp@lists.linaro.org

1 participants
35 discussions

[COMMIT] branch master updated. v1.14.0.0-39-g8ddca7c5

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 8ddca7c5d2d1f6b4311501e3ce6eef6d22e40591 (commit) from 5622f689653013b317842386a1aed81dd81fe749 (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 8ddca7c5d2d1f6b4311501e3ce6eef6d22e40591 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Apr 20 03:00:05 2017 +0300 test: tm: use script instead of binary when calling traffic manager test Since 51e3b8776b78180741fa57a621f9d13b9ae8bbfb tm test received wrapper script checking if it is run under Travis CI. However linux-generic testsuite was not updated to call script instead of binary, resulting in test failures. 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/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index 0522550a..38516a43 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -30,7 +30,7 @@ TESTS = validation/api/pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/thread/thread_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/time/time_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr.sh \ $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) \ ring/ring_main$(EXEEXT) ----------------------------------------------------------------------- Summary of changes: test/linux-generic/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.14.0.0-313-gcba5ed06

by git＠git-us.linaro.org

8 years, 2 months

[COMMIT] branch master updated. v1.14.0.0-38-g5622f689

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 5622f689653013b317842386a1aed81dd81fe749 (commit) via 2e8f024440a1e770068b1e9a9d50770ab166e40d (commit) via 51e3b8776b78180741fa57a621f9d13b9ae8bbfb (commit) from d20f3a639d236066cbd76514df5c4faaa0ae17e9 (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 5622f689653013b317842386a1aed81dd81fe749 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Apr 11 14:25:56 2017 +0300 example: generator: flush output messages Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(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 63e3f2b5..ede1cdf2 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -464,6 +464,7 @@ static int create_pktio(const char *dev, odp_pool_t pool, " default pktio%02" PRIu64 "\n", odp_pktio_to_u64(itf->pktio), dev, odp_pktio_to_u64(itf->pktio)); + fflush(NULL); return 0; } @@ -773,6 +774,7 @@ static void print_global_stats(int num_workers) pkts_snd, odp_atomic_load_u64(&counters.tx_drops), pps_snd, maximum_pps_snd, pkts_rcv, pps_rcv, maximum_pps_rcv); + fflush(NULL); } } @@ -855,6 +857,7 @@ int main(int argc, char *argv[]) printf("num worker threads: %i\n", num_workers); printf("first CPU: %i\n", odp_cpumask_first(&cpumask)); printf("cpu mask: %s\n", cpumaskstr); + fflush(NULL); /* ping mode need two workers */ if (args->appl.mode == APPL_MODE_PING) { commit 2e8f024440a1e770068b1e9a9d50770ab166e40d Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Apr 11 14:25:55 2017 +0300 example: generator: fix stop criteria - number of packets sent Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(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 95fb5432..63e3f2b5 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -513,8 +513,8 @@ static int gen_send_thread(void *arg) for (;;) { if (args->appl.number != -1 && - odp_atomic_fetch_add_u64(&counters.cnt, 1) >= - (unsigned int)args->appl.number) + odp_atomic_fetch_add_u64(&counters.cnt, pkt_array_size) >= + (unsigned int)args->appl.number) break; if (args->appl.mode == APPL_MODE_UDP) { commit 51e3b8776b78180741fa57a621f9d13b9ae8bbfb Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Mar 31 23:39:39 2017 +0300 test: tm: skip tm result under travis run tm test fails time to time in Travis environment. Because of we can not control that machine we can not do things like taskset and core isolation there. So simple run test and ignore it's result. Threat only segfault as actual error. Linaro CI will still do full test. https://bugs.linaro.org/show_bug.cgi?id=2881 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/test/common_plat/validation/api/traffic_mngr/Makefile.am b/test/common_plat/validation/api/traffic_mngr/Makefile.am index 35e689a0..a012c1b3 100644 --- a/test/common_plat/validation/api/traffic_mngr/Makefile.am +++ b/test/common_plat/validation/api/traffic_mngr/Makefile.am @@ -1,10 +1,18 @@ include ../Makefile.inc +TESTS_ENVIRONMENT += TEST_DIR=${builddir} + +TESTSCRIPTS = traffic_mngr.sh +TEST_EXTENSIONS = .sh + +TESTS = $(TESTSCRIPTS) + noinst_LTLIBRARIES = libtesttraffic_mngr.la libtesttraffic_mngr_la_SOURCES = traffic_mngr.c -test_PROGRAMS = traffic_mngr_main$(EXEEXT) +bin_PROGRAMS = traffic_mngr_main$(EXEEXT) dist_traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr_main_LDADD = libtesttraffic_mngr.la -lm $(LIBCUNIT_COMMON) $(LIBODP) -EXTRA_DIST = traffic_mngr.h +EXTRA_DIST = traffic_mngr.h $(TESTSCRIPTS) +dist_check_SCRIPTS = $(TESTSCRIPTS) diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh new file mode 100755 index 00000000..a7d54162 --- /dev/null +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Copyright (c) 2017, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# directory where test binaries have been built +TEST_DIR="${TEST_DIR:-$(dirname $0)}" + +# exit codes expected by automake for skipped tests +TEST_SKIPPED=77 + +${TEST_DIR}/traffic_mngr_main${EXEEXT} +ret=$? + +SIGSEGV=139 + +if [ "${TRAVIS}" = "true" ] && [ $ret -ne 0 ] && [ $ret -ne ${SIGSEGV} ]; then + echo "SKIP: skip due to not isolated environment" + exit ${TEST_SKIPPED} +fi + +exit $ret ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 7 ++++-- .../validation/api/traffic_mngr/Makefile.am | 12 +++++++++-- .../validation/api/traffic_mngr/traffic_mngr.sh | 25 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100755 test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.14.0.0-312-gc4c5fbb7

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 c4c5fbb7ab395443d53efed0741136d92ef13d7a (commit) via d4419b080f46aa347637f04445f856e2badaabfa (commit) via 58a963ccab214829a7526498b2b63349d4f5caef (commit) via d20f3a639d236066cbd76514df5c4faaa0ae17e9 (commit) via 8eba3e76f32bb2d17b88ba13f633606fef61efe8 (commit) via 39be9572056ee715468214ad6d2d5c01054456d7 (commit) via 3e5a07edf190614e739c8dba76cf165330e1b035 (commit) via 8c0df898b6f90564037fba43b1e9e6224e4ee740 (commit) via 077b6c427cac9687349a56ebf5602bb953348440 (commit) via 66869dae3b8cce7ed020d6922bd68ed30542f753 (commit) via c9417b862f7df0213b5135f0aa364761cb23cec6 (commit) via 0955fbb395dc1651a8bcd473beae2154d39f4a69 (commit) via ce61337e6a7e955913fa64412c75d2066e0f121c (commit) from 6ce267197a66180042916368a469ed9dcc33eaa7 (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 c4c5fbb7ab395443d53efed0741136d92ef13d7a Author: Kevin Wang <kevin.wang(a)arm.com> Date: Fri Apr 14 10:57:21 2017 +0800 validation: scheduler: release context according to scheduler sync type For different scheduler sync type, need to call different release function. Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c index f46d3910..4f99435c 100644 --- a/test/common_plat/validation/api/scheduler/scheduler.c +++ b/test/common_plat/validation/api/scheduler/scheduler.c @@ -129,6 +129,14 @@ static int exit_schedule_loop(void) return ret; } +static void release_context(odp_schedule_sync_t sync) +{ + if (sync == ODP_SCHED_SYNC_ATOMIC) + odp_schedule_release_atomic(); + else if (sync == ODP_SCHED_SYNC_ORDERED) + odp_schedule_release_ordered(); +} + void scheduler_test_wait_time(void) { int i; @@ -251,8 +259,7 @@ void scheduler_test_queue_destroy(void) CU_ASSERT_FATAL(u32[0] == MAGIC); odp_buffer_free(buf); - odp_schedule_release_ordered(); - + release_context(qp.sched.sync); CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); } @@ -820,12 +827,7 @@ static int schedule_common_(void *arg) } } - if (sync == ODP_SCHED_SYNC_ATOMIC) - odp_schedule_release_atomic(); - - if (sync == ODP_SCHED_SYNC_ORDERED) - odp_schedule_release_ordered(); - + release_context(sync); odp_ticketlock_lock(&globals->lock); globals->buf_count -= num; commit d4419b080f46aa347637f04445f856e2badaabfa Author: Kevin Wang <kevin.wang(a)arm.com> Date: Tue Apr 11 10:38:06 2017 +0800 validation: scheduler: modify the queue size for atomic queue Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c index 952561cd..f46d3910 100644 --- a/test/common_plat/validation/api/scheduler/scheduler.c +++ b/test/common_plat/validation/api/scheduler/scheduler.c @@ -1388,6 +1388,7 @@ static int create_queues(void) snprintf(name, sizeof(name), "sched_%d_%d_a", i, j); p.sched.sync = ODP_SCHED_SYNC_ATOMIC; + p.size = BUFS_PER_QUEUE_EXCL; q = odp_queue_create(name, &p); if (q == ODP_QUEUE_INVALID) { @@ -1423,6 +1424,7 @@ static int create_queues(void) snprintf(name, sizeof(name), "sched_%d_%d_o", i, j); p.sched.sync = ODP_SCHED_SYNC_ORDERED; p.sched.lock_count = capa.max_ordered_locks; + p.size = 0; q = odp_queue_create(name, &p); if (q == ODP_QUEUE_INVALID) { commit 58a963ccab214829a7526498b2b63349d4f5caef Merge: 6ce26719 d20f3a63 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Apr 19 19:24:23 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_internal.h index 05c8a422,e1267cff..acfc3012 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@@ -20,12 -20,10 +20,11 @@@ extern "C" #include <odp/api/init.h> #include <odp/api/cpumask.h> #include <odp/api/thread.h> + #include <odp_errno_define.h> #include <stdio.h> #include <sys/types.h> +#include <libconfig.h> - extern __thread int __odp_errno; - #define MAX_CPU_NUMBER 128 typedef struct { ----------------------------------------------------------------------- Summary of changes: configure.ac | 30 ++++++++-------- include/odp/arch/default/api/abi/packet.h | 7 ++-- platform/linux-generic/Makefile.am | 1 + platform/linux-generic/include/odp/api/debug.h | 41 ++++++++++++++++------ .../include/odp/api/plat/packet_inlines.h | 21 +++++++++-- .../include/odp/api/plat/packet_types.h | 10 ++++++ .../include/{odp/api/cpu.h => odp_errno_define.h} | 12 +++---- platform/linux-generic/include/odp_internal.h | 3 +- platform/linux-generic/odp_packet.c | 12 ++++--- platform/linux-generic/pktio/loop.c | 2 +- .../common_plat/miscellaneous/odp_api_from_cpp.cpp | 3 +- test/common_plat/performance/odp_scheduling.c | 12 +++++-- test/common_plat/validation/api/packet/packet.c | 23 +++++++----- .../validation/api/scheduler/scheduler.c | 20 ++++++----- 14 files changed, 132 insertions(+), 65 deletions(-) copy platform/linux-generic/include/{odp/api/cpu.h => odp_errno_define.h} (52%) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.14.0.0-35-gd20f3a63

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 d20f3a639d236066cbd76514df5c4faaa0ae17e9 (commit) from 8eba3e76f32bb2d17b88ba13f633606fef61efe8 (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 d20f3a639d236066cbd76514df5c4faaa0ae17e9 Author: Brian Brooks <brian.brooks(a)arm.com> Date: Tue Apr 4 13:47:59 2017 -0500 test: odp_scheduling: handle dequeueing from a concurrent queue Signed-off-by: Ola Liljedahl <ola.liljedahl(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Kevin Wang <kevin.wang(a)arm.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index c74a0713..38e76257 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -273,7 +273,7 @@ static int test_plain_queue(int thr, test_globals_t *globals) test_message_t *t_msg; odp_queue_t queue; uint64_t c1, c2, cycles; - int i; + int i, j; /* Alloc test message */ buf = odp_buffer_alloc(globals->pool); @@ -307,7 +307,15 @@ static int test_plain_queue(int thr, test_globals_t *globals) return -1; } - ev = odp_queue_deq(queue); + /* When enqueue and dequeue are decoupled (e.g. not using a + * common lock), an enqueued event may not be immediately + * visible to dequeue. So we just try again for a while. */ + for (j = 0; j < 100; j++) { + ev = odp_queue_deq(queue); + if (ev != ODP_EVENT_INVALID) + break; + odp_cpu_pause(); + } buf = odp_buffer_from_event(ev); ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/odp_scheduling.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.14.0.0-34-g8eba3e76

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 8eba3e76f32bb2d17b88ba13f633606fef61efe8 (commit) from 39be9572056ee715468214ad6d2d5c01054456d7 (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 8eba3e76f32bb2d17b88ba13f633606fef61efe8 Author: Kevin Wang <kevin.wang(a)arm.com> Date: Mon Apr 10 13:43:05 2017 +0800 linux-gen: pktio: miss an unlock operation before exit if error happens Just set the return value, and remove the return() function at the failure branch. https://bugs.linaro.org/show_bug.cgi?id=2933 Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Ola Liljedahl <ola.liljedahl(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 70962839..61e98ad8 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -176,7 +176,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pktio_entry->s.stats.out_octets += bytes; } else { ODP_DBG("queue enqueue failed %i\n", ret); - return -1; + ret = -1; } odp_ticketlock_unlock(&pktio_entry->s.txl); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.14.0.0-33-g39be9572

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 39be9572056ee715468214ad6d2d5c01054456d7 (commit) from 3e5a07edf190614e739c8dba76cf165330e1b035 (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 39be9572056ee715468214ad6d2d5c01054456d7 Author: Brian Brooks <brian.brooks(a)arm.com> Date: Wed Apr 12 13:30:04 2017 -0500 configure.ac: fix native Clang build on ARMv8 The build is broken when using clang on ARM. -mcx16 is being passed to clang when building natively on ARM. This combined with -Werror causes the breakage. Fix it by skipping anything related to -mcx16 when not building for x86-based architectures. See [1] for details. Signed-off-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 9320f360..d364b8dd 100644 --- a/configure.ac +++ b/configure.ac @@ -303,20 +303,22 @@ ODP_CFLAGS="$ODP_CFLAGS -std=c99" # Extra flags for example to suppress certain warning types ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" -######################################################################### -# Check if compiler supports cmpxchng16 -########################################################################## -if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then - my_save_cflags="$CFLAGS" - - CFLAGS=-mcx16 - AC_MSG_CHECKING([whether CC supports -mcx16]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes])] - [ODP_CFLAGS="$ODP_CFLAGS $CFLAGS"], - [AC_MSG_RESULT([no])] - ) - CFLAGS="$my_save_cflags" +########################################################################## +# Check if compiler supports cmpxchng16 on x86-based architectures +########################################################################## +if "${host}" == i?86* -o "${host}" == x86*; then + if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then + my_save_cflags="$CFLAGS" + + CFLAGS=-mcx16 + AC_MSG_CHECKING([whether CC supports -mcx16]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AC_MSG_RESULT([yes])] + [ODP_CFLAGS="$ODP_CFLAGS $CFLAGS"], + [AC_MSG_RESULT([no])] + ) + CFLAGS="$my_save_cflags" + fi fi ########################################################################## ----------------------------------------------------------------------- Summary of changes: configure.ac | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.14.0.0-299-g6ce26719

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 6ce267197a66180042916368a469ed9dcc33eaa7 (commit) from d025907602c5cae0f46b8b5219bf392bdba8dc21 (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 6ce267197a66180042916368a469ed9dcc33eaa7 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Apr 19 10:56:21 2017 +0300 Revert "api: ipsec: factor out definitions for feature support levels" This reverts commit d025907602c5 ("api: ipsec: factor out definitions for feature support levels") Petri rejected this patch and plan write some common solution Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h deleted file mode 100644 index 7ee2ae04..00000000 --- a/include/odp/api/spec/feature.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP feature API - */ - -#ifndef ODP_API_FEATURE_H_ -#define ODP_API_FEATURE_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @defgroup odp_feature ODP feature - * Common API - * @{ - */ - -/** - * ODP feature support - */ -typedef enum odp_feature_t { - /** - * Feature is not supported - */ - ODP_FEATURE_UNSUPPORTED, - /** - * Feature is supported - */ - ODP_FEATURE_SUPPORTED, - /** - * Feature is supported and preferred - */ - ODP_FEATURE_PREFERRED -} odp_feature_t; - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index e15eb590..a0ceb11a 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -19,7 +19,6 @@ extern "C" { #endif #include <odp/api/crypto.h> -#include <odp/api/feature.h> #include <odp/api/packet_io.h> #include <odp/api/classification.h> @@ -231,22 +230,38 @@ typedef struct odp_ipsec_capability_t { /** Maximum number of IPSEC SAs */ uint32_t max_num_sa; - /** Synchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_SYNC) support */ - odp_feature_t op_mode_sync; + /** Synchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_SYNC) support + * + * 0: Synchronous mode is not supported + * 1: Synchronous mode is supported + * 2: Synchronous mode is supported and preferred + */ + uint8_t op_mode_sync; - /** - * Asynchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_ASYNC) support + /** Asynchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_ASYNC) support + * + * 0: Asynchronous mode is not supported + * 1: Asynchronous mode is supported + * 2: Asynchronous mode is supported and preferred */ - odp_feature_t op_mode_async; + uint8_t op_mode_async; - /** Inline IPSEC operation mode (ODP_IPSEC_OP_MODE_INLINE) support */ - odp_feature_t op_mode_inline; + /** Inline IPSEC operation mode (ODP_IPSEC_OP_MODE_INLINE) support + * + * 0: Inline IPSEC operation is not supported + * 1: Inline IPSEC operation is supported + * 2: Inline IPSEC operation is supported and preferred + */ + uint8_t op_mode_inline; - /** - * Support of pipelined classification (ODP_IPSEC_PIPELINE_CLS) of - * resulting inbound packets + /** Support of pipelined classification (ODP_IPSEC_PIPELINE_CLS) of + * resulting inbound packets. + * + * 0: Classification of resulting packets is not supported + * 1: Classification of resulting packets is supported + * 2: Classification of resulting packets is supported and preferred */ - odp_feature_t pipeline_cls; + uint8_t pipeline_cls; /** Soft expiry limit in seconds support * diff --git a/include/odp_api.h b/include/odp_api.h index b736fb88..73e5309a 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -57,7 +57,6 @@ extern "C" { #include <odp/api/spinlock_recursive.h> #include <odp/api/rwlock_recursive.h> #include <odp/api/std_clib.h> -#include <odp/api/feature.h> #include <odp/api/ipsec.h> #ifdef __cplusplus diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 5a63b24b..874cf887 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -31,7 +31,6 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/debug.h \ $(top_srcdir)/include/odp/api/spec/errno.h \ $(top_srcdir)/include/odp/api/spec/event.h \ - $(top_srcdir)/include/odp/api/spec/feature.h \ $(top_srcdir)/include/odp/api/spec/hash.h \ $(top_srcdir)/include/odp/api/spec/hints.h \ $(top_srcdir)/include/odp/api/spec/init.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 95f6369c..0d5299cb 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,7 +37,6 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/debug.h \ $(srcdir)/include/odp/api/errno.h \ $(srcdir)/include/odp/api/event.h \ - $(srcdir)/include/odp/api/feature.h \ $(srcdir)/include/odp/api/hash.h \ $(srcdir)/include/odp/api/hints.h \ $(srcdir)/include/odp/api/init.h \ diff --git a/platform/linux-generic/include/odp/api/feature.h b/platform/linux-generic/include/odp/api/feature.h deleted file mode 100644 index d0aa8179..00000000 --- a/platform/linux-generic/include/odp/api/feature.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP feature API - platform specific header - */ - -#ifndef ODP_PLAT_FEATURE_H_ -#define ODP_PLAT_FEATURE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @ingroup odp_feature - * @{ - */ - -/** - * @} - */ - -#include <odp/api/spec/feature.h> - -#ifdef __cplusplus -} -#endif - -#endif ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/feature.h | 53 ------------------------ include/odp/api/spec/ipsec.h | 39 +++++++++++------ include/odp_api.h | 1 - platform/Makefile.inc | 1 - platform/linux-generic/Makefile.am | 1 - platform/linux-generic/include/odp/api/feature.h | 34 --------------- 6 files changed, 27 insertions(+), 102 deletions(-) delete mode 100644 include/odp/api/spec/feature.h delete mode 100644 platform/linux-generic/include/odp/api/feature.h hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.14.0.0-298-gd0259076

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 d025907602c5cae0f46b8b5219bf392bdba8dc21 (commit) from dd36b4758d0cd9f9929a13d42ec2ac38ae972e37 (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 d025907602c5cae0f46b8b5219bf392bdba8dc21 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Apr 18 00:02:58 2017 +0300 api: ipsec: factor out definitions for feature support levels Instead of having magic 0-1-2 numbers, let's have the special enum for feature support levels (unsupported/supported/preferred). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h new file mode 100644 index 00000000..7ee2ae04 --- /dev/null +++ b/include/odp/api/spec/feature.h @@ -0,0 +1,53 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP feature API + */ + +#ifndef ODP_API_FEATURE_H_ +#define ODP_API_FEATURE_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** @defgroup odp_feature ODP feature + * Common API + * @{ + */ + +/** + * ODP feature support + */ +typedef enum odp_feature_t { + /** + * Feature is not supported + */ + ODP_FEATURE_UNSUPPORTED, + /** + * Feature is supported + */ + ODP_FEATURE_SUPPORTED, + /** + * Feature is supported and preferred + */ + ODP_FEATURE_PREFERRED +} odp_feature_t; + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> +#endif diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index a0ceb11a..e15eb590 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -19,6 +19,7 @@ extern "C" { #endif #include <odp/api/crypto.h> +#include <odp/api/feature.h> #include <odp/api/packet_io.h> #include <odp/api/classification.h> @@ -230,38 +231,22 @@ typedef struct odp_ipsec_capability_t { /** Maximum number of IPSEC SAs */ uint32_t max_num_sa; - /** Synchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_SYNC) support - * - * 0: Synchronous mode is not supported - * 1: Synchronous mode is supported - * 2: Synchronous mode is supported and preferred - */ - uint8_t op_mode_sync; + /** Synchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_SYNC) support */ + odp_feature_t op_mode_sync; - /** Asynchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_ASYNC) support - * - * 0: Asynchronous mode is not supported - * 1: Asynchronous mode is supported - * 2: Asynchronous mode is supported and preferred + /** + * Asynchronous IPSEC operation mode (ODP_IPSEC_OP_MODE_ASYNC) support */ - uint8_t op_mode_async; + odp_feature_t op_mode_async; - /** Inline IPSEC operation mode (ODP_IPSEC_OP_MODE_INLINE) support - * - * 0: Inline IPSEC operation is not supported - * 1: Inline IPSEC operation is supported - * 2: Inline IPSEC operation is supported and preferred - */ - uint8_t op_mode_inline; + /** Inline IPSEC operation mode (ODP_IPSEC_OP_MODE_INLINE) support */ + odp_feature_t op_mode_inline; - /** Support of pipelined classification (ODP_IPSEC_PIPELINE_CLS) of - * resulting inbound packets. - * - * 0: Classification of resulting packets is not supported - * 1: Classification of resulting packets is supported - * 2: Classification of resulting packets is supported and preferred + /** + * Support of pipelined classification (ODP_IPSEC_PIPELINE_CLS) of + * resulting inbound packets */ - uint8_t pipeline_cls; + odp_feature_t pipeline_cls; /** Soft expiry limit in seconds support * diff --git a/include/odp_api.h b/include/odp_api.h index 73e5309a..b736fb88 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -57,6 +57,7 @@ extern "C" { #include <odp/api/spinlock_recursive.h> #include <odp/api/rwlock_recursive.h> #include <odp/api/std_clib.h> +#include <odp/api/feature.h> #include <odp/api/ipsec.h> #ifdef __cplusplus diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 874cf887..5a63b24b 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -31,6 +31,7 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/debug.h \ $(top_srcdir)/include/odp/api/spec/errno.h \ $(top_srcdir)/include/odp/api/spec/event.h \ + $(top_srcdir)/include/odp/api/spec/feature.h \ $(top_srcdir)/include/odp/api/spec/hash.h \ $(top_srcdir)/include/odp/api/spec/hints.h \ $(top_srcdir)/include/odp/api/spec/init.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0d5299cb..95f6369c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,6 +37,7 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/debug.h \ $(srcdir)/include/odp/api/errno.h \ $(srcdir)/include/odp/api/event.h \ + $(srcdir)/include/odp/api/feature.h \ $(srcdir)/include/odp/api/hash.h \ $(srcdir)/include/odp/api/hints.h \ $(srcdir)/include/odp/api/init.h \ diff --git a/platform/linux-generic/include/odp/api/feature.h b/platform/linux-generic/include/odp/api/feature.h new file mode 100644 index 00000000..d0aa8179 --- /dev/null +++ b/platform/linux-generic/include/odp/api/feature.h @@ -0,0 +1,34 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP feature API - platform specific header + */ + +#ifndef ODP_PLAT_FEATURE_H_ +#define ODP_PLAT_FEATURE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @ingroup odp_feature + * @{ + */ + +/** + * @} + */ + +#include <odp/api/spec/feature.h> + +#ifdef __cplusplus +} +#endif + +#endif ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/feature.h | 53 ++++++++++++++++++++++ include/odp/api/spec/ipsec.h | 39 +++++----------- include/odp_api.h | 1 + platform/Makefile.inc | 1 + platform/linux-generic/Makefile.am | 1 + .../include/odp/{drv/driver.h => api/feature.h} | 13 ++---- 6 files changed, 73 insertions(+), 35 deletions(-) create mode 100644 include/odp/api/spec/feature.h copy platform/linux-generic/include/odp/{drv/driver.h => api/feature.h} (53%) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.14.0.0-32-g3e5a07ed

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 3e5a07edf190614e739c8dba76cf165330e1b035 (commit) from 8c0df898b6f90564037fba43b1e9e6224e4ee740 (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 3e5a07edf190614e739c8dba76cf165330e1b035 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Sun Apr 2 17:55:20 2017 -0500 linux-generic: debug: enable helper use from c++ programs The ODP_STATIC_ASSERT() macro expands to _Static_assert(), however when used in C++ programs this needs to expand to static_assert(). This resolves Bug https://bugs.linaro.org/show_bug.cgi?id=2852 Reported-by: Moshe Tubul <moshe.tubul(a)firmitas-cs.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/debug.h b/platform/linux-generic/include/odp/api/debug.h index 7db14339..b0f91b1c 100644 --- a/platform/linux-generic/include/odp/api/debug.h +++ b/platform/linux-generic/include/odp/api/debug.h @@ -19,17 +19,36 @@ extern "C" { #include <odp/api/spec/debug.h> -#if defined(__GNUC__) && !defined(__clang__) - -#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6)) - /** - * @internal _Static_assert was only added in GCC 4.6. Provide a weak replacement - * for previous versions. + * @internal _Static_assert was only added in GCC 4.6 and the C++ version + * static_assert for g++ 6 and above. Provide a weak replacement for previous + * versions. */ -#define _Static_assert(e, s) (extern int (*static_assert_checker(void)) \ - [sizeof(struct { unsigned int error_if_negative:(e) ? 1 : -1; })]) +#define _odp_merge(a, b) a##b +#define _odp_label(a) _odp_merge(_ODP_SASSERT_, a) +#define _ODP_SASSERT _odp_label(__COUNTER__) +#define _ODP_SASSERT_ENUM(e) { _ODP_SASSERT = 1 / !!(e) } +#define _odp_static_assert(e, s) enum _ODP_SASSERT_ENUM(e) + +#if defined(__clang__) +#if defined(__cplusplus) +#if !__has_feature(cxx_static_assert) && !defined(static_assert) +#define static_assert(e, s) _odp_static_assert(e, s) +#endif +#elif !__has_feature(c_static_assert) && !defined(_Static_assert) +#define _Static_assert(e, s) _odp_static_assert(e, s) +#endif +#elif defined(__GNUC__) +#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6)) || \ + (__GNUC__ < 6 && defined(__cplusplus)) +#if defined(__cplusplus) +#if !defined(static_assert) +#define static_assert(e, s) _odp_static_assert(e, s) +#endif +#elif !defined(_Static_assert) +#define _Static_assert(e, s) _odp_static_assert(e, s) +#endif #endif #endif @@ -39,9 +58,11 @@ extern "C" { * if condition 'cond' is false. Macro definition is empty when compiler is not * supported or the compiler does not support static assertion. */ -#define ODP_STATIC_ASSERT(cond, msg) _Static_assert(cond, msg) +#ifndef __cplusplus +#define ODP_STATIC_ASSERT(cond, msg) _Static_assert(cond, msg) -#ifdef __cplusplus +#else +#define ODP_STATIC_ASSERT(cond, msg) static_assert(cond, msg) } #endif diff --git a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp index 2b307864..4578ae4b 100644 --- a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp +++ b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp @@ -1,10 +1,9 @@ #include <cstdio> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/odph_api.h> int main(int argc ODP_UNUSED, const char *argv[] ODP_UNUSED) { - printf("\tODP API version: %s\n", odp_version_api_str()); printf("\tODP implementation version: %s\n", odp_version_impl_str()); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp/api/debug.h | 41 ++++++++++++++++------ .../common_plat/miscellaneous/odp_api_from_cpp.cpp | 3 +- 2 files changed, 32 insertions(+), 12 deletions(-) hooks/post-receive --

8 years, 2 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp April 2017