git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.12.0.0-25-g5ffbdad

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 5ffbdadc12513adb3e8847692d51963cab223084 (commit) from c709c9f1f235551c27f8db14f7c947f334b10d98 (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 5ffbdadc12513adb3e8847692d51963cab223084 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Dec 22 06:43:44 2016 -0600 test: perf: add assert since src_idx cannot be negative Address Bug https://bugs.linaro.org/show_bug.cgi?id=2790 by adding an assert. odp_packet_input_index() only returns a negative value if the packet did not originate on an I/O interface, which is known to be false here. Signed-off-by: Bill Fischofer <bill.fischofer(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/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 8dc4dbe..82c3a25 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -20,6 +20,7 @@ #include <unistd.h> #include <errno.h> #include <inttypes.h> +#include <assert.h> #include <test_debug.h> @@ -353,6 +354,7 @@ static int run_worker_sched_mode(void *arg) /* packets from the same queue are from the same interface */ src_idx = odp_packet_input_index(pkt_tbl[0]); + assert(src_idx >= 0); dst_idx = gbl_args->dst_port_from_idx[src_idx]; fill_eth_addrs(pkt_tbl, pkts, dst_idx); ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/odp_l2fwd.c | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.12.0.0-24-gc709c9f

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 c709c9f1f235551c27f8db14f7c947f334b10d98 (commit) via 5d2595d1b470497c7fa04fe698f79a5f0346e5b8 (commit) via ad6219e3682d94fb8971261936ace46399ed2085 (commit) from 47b343a8f508b1dad511a1498999caa876c12eb5 (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 c709c9f1f235551c27f8db14f7c947f334b10d98 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Dec 23 22:23:20 2016 +0300 scripts/build-pktio-dpdk: do not download full dpdk git Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk index 280f518..36727dd 100755 --- a/scripts/build-pktio-dpdk +++ b/scripts/build-pktio-dpdk @@ -10,9 +10,9 @@ if [ "$?" != "0" ]; then echo "Error: pcap is not installed. You may need to install libpcap-dev" fi -git clone http://dpdk.org/git/dpdk dpdk +git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v16.07 http://dpdk.org/git/dpdk dpdk pushd dpdk -git checkout -b bv16.07 v16.07 +git log --oneline --decorate #Make and edit DPDK configuration make config T=${TARGET} O=${TARGET} commit 5d2595d1b470497c7fa04fe698f79a5f0346e5b8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Dec 23 22:23:19 2016 +0300 travis: accelerate dpdk cloning No need to download full history of dpdk for CI runs. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 0bab50e..03e61b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,9 +36,9 @@ before_install: - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" # DPDK pktio - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} - - git clone http://dpdk.org/git/dpdk dpdk + - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v16.07 http://dpdk.org/git/dpdk dpdk - pushd dpdk - - git checkout -b bv16.07 v16.07 + - git log --oneline --decorate - make config T=${TARGET} O=${TARGET} - pushd ${TARGET} - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config commit ad6219e3682d94fb8971261936ace46399ed2085 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Dec 23 22:23:18 2016 +0300 travis: do not print dpdk build log print only stderr on building dpdk to have log more readable for odp things. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index adf3307..0bab50e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_install: - pushd ${TARGET} - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config - popd - - make install T=${TARGET} EXTRA_CFLAGS="-fPIC" + - make install T=${TARGET} EXTRA_CFLAGS="-fPIC" > /dev/null - popd script: ----------------------------------------------------------------------- Summary of changes: .travis.yml | 6 +++--- scripts/build-pktio-dpdk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.12.0.0-21-g47b343a

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 47b343a8f508b1dad511a1498999caa876c12eb5 (commit) from 5d35ffb5d02c6d3f4cabd170969846b56878f8fd (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 47b343a8f508b1dad511a1498999caa876c12eb5 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Jan 5 19:09:26 2017 +0530 validation: pktio: fix invalid mac addr Fixes https://bugs.linaro.org/show_bug.cgi?id=2496 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c index 7c979fb..23ecc4a 100644 --- a/test/common_plat/validation/api/pktio/pktio.c +++ b/test/common_plat/validation/api/pktio/pktio.c @@ -31,6 +31,8 @@ #define PKTIN_TS_MAX_RES 10000000000 #define PKTIN_TS_CMP_RES 1 +#define PKTIO_SRC_MAC {1, 2, 3, 4, 5, 6} +#define PKTIO_DST_MAC {6, 5, 4, 3, 2, 1} #undef DEBUG_STATS /** interface names used for testing */ @@ -245,7 +247,8 @@ static uint32_t pktio_init_packet(odp_packet_t pkt) odph_udphdr_t *udp; char *buf; uint16_t seq; - uint8_t mac[ODP_PKTIO_MACADDR_MAXSIZE] = {0}; + uint8_t src_mac[ODP_PKTIO_MACADDR_MAXSIZE] = PKTIO_SRC_MAC; + uint8_t dst_mac[ODP_PKTIO_MACADDR_MAXSIZE] = PKTIO_DST_MAC; int pkt_len = odp_packet_len(pkt); buf = odp_packet_data(pkt); @@ -253,8 +256,8 @@ static uint32_t pktio_init_packet(odp_packet_t pkt) /* Ethernet */ odp_packet_l2_offset_set(pkt, 0); eth = (odph_ethhdr_t *)buf; - memcpy(eth->src.addr, mac, ODPH_ETHADDR_LEN); - memcpy(eth->dst.addr, mac, ODPH_ETHADDR_LEN); + memcpy(eth->src.addr, src_mac, ODPH_ETHADDR_LEN); + memcpy(eth->dst.addr, dst_mac, ODPH_ETHADDR_LEN); eth->type = odp_cpu_to_be_16(ODPH_ETHTYPE_IPV4); /* IP */ ----------------------------------------------------------------------- Summary of changes: test/common_plat/validation/api/pktio/pktio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.12.0.0-20-g5d35ffb

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 5d35ffb5d02c6d3f4cabd170969846b56878f8fd (commit) via 24c6e10cba9d6efeaf13e4ea2a7a422764ae5eb2 (commit) from b18dc645a68fd0ae50f1a361aa408b3e74e46c0d (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 5d35ffb5d02c6d3f4cabd170969846b56878f8fd Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Jan 4 14:02:42 2017 +0200 validation: free reserved shared memory blocks Previously all reserverd shared memory blocks were not freed. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/atomic/atomic.c b/test/common_plat/validation/api/atomic/atomic.c index c4e9345..db9484b 100644 --- a/test/common_plat/validation/api/atomic/atomic.c +++ b/test/common_plat/validation/api/atomic/atomic.c @@ -583,6 +583,29 @@ int atomic_init(odp_instance_t *inst) return ret; } +int atomic_term(odp_instance_t inst) +{ + odp_shm_t shm; + + shm = odp_shm_lookup(GLOBAL_SHM_NAME); + if (0 != odp_shm_free(shm)) { + fprintf(stderr, "error: odp_shm_free() failed.\n"); + return -1; + } + + if (0 != odp_term_local()) { + fprintf(stderr, "error: odp_term_local() failed.\n"); + return -1; + } + + if (0 != odp_term_global(inst)) { + fprintf(stderr, "error: odp_term_global() failed.\n"); + return -1; + } + + return 0; +} + /* Atomic tests */ static int test_atomic_inc_dec_thread(void *arg UNUSED) { @@ -875,6 +898,7 @@ int atomic_main(int argc, char *argv[]) return -1; odp_cunit_register_global_init(atomic_init); + odp_cunit_register_global_term(atomic_term); ret = odp_cunit_register(atomic_suites); diff --git a/test/common_plat/validation/api/atomic/atomic.h b/test/common_plat/validation/api/atomic/atomic.h index 4ea837b..66796c8 100644 --- a/test/common_plat/validation/api/atomic/atomic.h +++ b/test/common_plat/validation/api/atomic/atomic.h @@ -31,6 +31,7 @@ extern odp_suiteinfo_t atomic_suites[]; /* executable init/term functions: */ int atomic_init(odp_instance_t *inst); +int atomic_term(odp_instance_t inst); /* main test program: */ int atomic_main(int argc, char *argv[]); diff --git a/test/common_plat/validation/api/barrier/barrier.c b/test/common_plat/validation/api/barrier/barrier.c index d458388..79ee82b 100644 --- a/test/common_plat/validation/api/barrier/barrier.c +++ b/test/common_plat/validation/api/barrier/barrier.c @@ -372,6 +372,29 @@ int barrier_init(odp_instance_t *inst) return ret; } +int barrier_term(odp_instance_t inst) +{ + odp_shm_t shm; + + shm = odp_shm_lookup(GLOBAL_SHM_NAME); + if (0 != odp_shm_free(shm)) { + fprintf(stderr, "error: odp_shm_free() failed.\n"); + return -1; + } + + if (0 != odp_term_local()) { + fprintf(stderr, "error: odp_term_local() failed.\n"); + return -1; + } + + if (0 != odp_term_global(inst)) { + fprintf(stderr, "error: odp_term_global() failed.\n"); + return -1; + } + + return 0; +} + odp_suiteinfo_t barrier_suites[] = { {"barrier", NULL, NULL, barrier_suite_barrier}, @@ -387,6 +410,7 @@ int barrier_main(int argc, char *argv[]) return -1; odp_cunit_register_global_init(barrier_init); + odp_cunit_register_global_term(barrier_term); ret = odp_cunit_register(barrier_suites); diff --git a/test/common_plat/validation/api/barrier/barrier.h b/test/common_plat/validation/api/barrier/barrier.h index e4890e0..188bcb8 100644 --- a/test/common_plat/validation/api/barrier/barrier.h +++ b/test/common_plat/validation/api/barrier/barrier.h @@ -22,6 +22,7 @@ extern odp_suiteinfo_t barrier_suites[]; /* executable init/term functions: */ int barrier_init(odp_instance_t *inst); +int barrier_term(odp_instance_t inst); /* main test program: */ int barrier_main(int argc, char *argv[]); diff --git a/test/common_plat/validation/api/lock/lock.c b/test/common_plat/validation/api/lock/lock.c index a668a31..bd9a2aa 100644 --- a/test/common_plat/validation/api/lock/lock.c +++ b/test/common_plat/validation/api/lock/lock.c @@ -1189,6 +1189,29 @@ int lock_init(odp_instance_t *inst) return ret; } +int lock_term(odp_instance_t inst) +{ + odp_shm_t shm; + + shm = odp_shm_lookup(GLOBAL_SHM_NAME); + if (0 != odp_shm_free(shm)) { + fprintf(stderr, "error: odp_shm_free() failed.\n"); + return -1; + } + + if (0 != odp_term_local()) { + fprintf(stderr, "error: odp_term_local() failed.\n"); + return -1; + } + + if (0 != odp_term_global(inst)) { + fprintf(stderr, "error: odp_term_global() failed.\n"); + return -1; + } + + return 0; +} + odp_suiteinfo_t lock_suites[] = { {"nolocking", lock_suite_init, NULL, lock_suite_no_locking}, /* must be first */ @@ -1214,6 +1237,7 @@ int lock_main(int argc, char *argv[]) return -1; odp_cunit_register_global_init(lock_init); + odp_cunit_register_global_term(lock_term); ret = odp_cunit_register(lock_suites); diff --git a/test/common_plat/validation/api/lock/lock.h b/test/common_plat/validation/api/lock/lock.h index 5adc633..e0f4972 100644 --- a/test/common_plat/validation/api/lock/lock.h +++ b/test/common_plat/validation/api/lock/lock.h @@ -38,6 +38,7 @@ extern odp_suiteinfo_t lock_suites[]; /* executable init/term functions: */ int lock_init(odp_instance_t *inst); +int lock_term(odp_instance_t inst); /* main test program: */ int lock_main(int argc, char *argv[]); diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c index 919cfb6..734135e 100644 --- a/test/common_plat/validation/api/scheduler/scheduler.c +++ b/test/common_plat/validation/api/scheduler/scheduler.c @@ -1577,6 +1577,7 @@ static int destroy_queues(void) int scheduler_suite_term(void) { odp_pool_t pool; + odp_shm_t shm; if (destroy_queues() != 0) { fprintf(stderr, "error: failed to destroy queues\n"); @@ -1587,6 +1588,14 @@ int scheduler_suite_term(void) if (odp_pool_destroy(pool) != 0) fprintf(stderr, "error: failed to destroy pool\n"); + shm = odp_shm_lookup(SHM_THR_ARGS_NAME); + if (odp_shm_free(shm) != 0) + fprintf(stderr, "error: failed to free shm\n"); + + shm = odp_shm_lookup(GLOBALS_SHM_NAME); + if (odp_shm_free(shm) != 0) + fprintf(stderr, "error: failed to free shm\n"); + return 0; } commit 24c6e10cba9d6efeaf13e4ea2a7a422764ae5eb2 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Jan 4 14:02:41 2017 +0200 example: free reserved shared memory blocks Previously all reserverd shared memory blocks were not freed. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-and-tested-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 48d7f5f..1c64765 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -897,6 +897,8 @@ int main(int argc, char *argv[]) odp_timer_pool_destroy(tp); if (0 != odp_pool_destroy(tmop)) fprintf(stderr, "unable to destroy pool \"tmop\"\n"); + if (0 != odp_shm_free(shm)) + fprintf(stderr, "unable to free \"shm\"\n"); odp_term_local(); odp_term_global(instance); printf("Exit\n\n"); diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 6a9a9fe..76ced49 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1361,6 +1361,32 @@ main(int argc, char *argv[]) free(args->appl.if_names); free(args->appl.if_str); + + shm = odp_shm_lookup("shm_args"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free shm_args failed\n"); + shm = odp_shm_lookup("shm_ipsec_cache"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free shm_ipsec_cache failed\n"); + shm = odp_shm_lookup("shm_fwd_db"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free shm_fwd_db failed\n"); + shm = odp_shm_lookup("loopback_db"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free loopback_db failed\n"); + shm = odp_shm_lookup("shm_sa_db"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free shm_sa_db failed\n"); + shm = odp_shm_lookup("shm_tun_db"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free shm_tun_db failed\n"); + shm = odp_shm_lookup("shm_sp_db"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free shm_sp_db failed\n"); + shm = odp_shm_lookup("stream_db"); + if (odp_shm_free(shm) != 0) + EXAMPLE_ERR("Error: shm free stream_db failed\n"); + printf("Exit\n\n"); return 0; diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 8919bd3..441e812 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -942,6 +942,7 @@ int main(int argc, char **argv) odph_odpthread_t thread_tbl[MAX_NB_WORKER]; odp_pool_t pool; odp_pool_param_t params; + odp_shm_t shm; odp_instance_t instance; odph_odpthread_params_t thr_params; odp_cpumask_t cpumask; @@ -1119,6 +1120,22 @@ int main(int argc, char **argv) for (i = 0; i < MAX_NB_ROUTE; i++) free(args->route_str[i]); + shm = odp_shm_lookup("flow_table"); + if (shm != ODP_SHM_INVALID && odp_shm_free(shm) != 0) { + printf("Error: shm free flow_table\n"); + exit(EXIT_FAILURE); + } + shm = odp_shm_lookup("shm_fwd_db"); + if (shm != ODP_SHM_INVALID && odp_shm_free(shm) != 0) { + printf("Error: shm free shm_fwd_db\n"); + exit(EXIT_FAILURE); + } + shm = odp_shm_lookup("fib_lpm_sub"); + if (shm != ODP_SHM_INVALID && odp_shm_free(shm) != 0) { + printf("Error: shm free fib_lpm_sub\n"); + exit(EXIT_FAILURE); + } + if (odp_pool_destroy(pool)) { printf("Error: pool destroy\n"); exit(EXIT_FAILURE); diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 4b944fe..f9c7176 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -1039,6 +1039,11 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + if (odp_shm_free(shm)) { + printf("Error: shm free\n"); + exit(EXIT_FAILURE); + } + if (odp_term_local()) { printf("Error: term local\n"); exit(EXIT_FAILURE); diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 651ed10..8dc4dbe 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -1507,6 +1507,11 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + if (odp_shm_free(shm)) { + LOG_ERR("Error: shm free\n"); + exit(EXIT_FAILURE); + } + if (odp_term_local()) { LOG_ERR("Error: term local\n"); exit(EXIT_FAILURE); diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index 6db02e0..84ab779 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -891,6 +891,14 @@ static int test_term(void) LOG_ERR("Failed to free test_globals\n"); ret = -1; } + if (odp_shm_free(odp_shm_lookup("test_globals.rx_stats")) != 0) { + LOG_ERR("Failed to free test_globals.rx_stats\n"); + ret = -1; + } + if (odp_shm_free(odp_shm_lookup("test_globals.tx_stats")) != 0) { + LOG_ERR("Failed to free test_globals.tx_stats\n"); + ret = -1; + } return ret; } ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 2 ++ example/ipsec/odp_ipsec.c | 26 ++++++++++++++++++++++ example/l3fwd/odp_l3fwd.c | 17 ++++++++++++++ example/switch/odp_switch.c | 5 +++++ test/common_plat/performance/odp_l2fwd.c | 5 +++++ test/common_plat/performance/odp_pktio_perf.c | 8 +++++++ test/common_plat/validation/api/atomic/atomic.c | 24 ++++++++++++++++++++ test/common_plat/validation/api/atomic/atomic.h | 1 + test/common_plat/validation/api/barrier/barrier.c | 24 ++++++++++++++++++++ test/common_plat/validation/api/barrier/barrier.h | 1 + test/common_plat/validation/api/lock/lock.c | 24 ++++++++++++++++++++ test/common_plat/validation/api/lock/lock.h | 1 + .../validation/api/scheduler/scheduler.c | 9 ++++++++ 13 files changed, 147 insertions(+) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.12.0.0-18-gb18dc64

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 b18dc645a68fd0ae50f1a361aa408b3e74e46c0d (commit) from 29dde30264da8106d64328b0d81eb19dad0065ac (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 b18dc645a68fd0ae50f1a361aa408b3e74e46c0d Author: Joe Savage <joe.savage(a)arm.com> Date: Wed Jan 4 14:52:35 2017 +0000 helper: fix odph_ipv4_csum functions for L3 offset 0 Fix a bug where odph_ipv4_csum_{valid, update} would interpret an L3 offset of zero as a sign that the packet has no L3 offset. Signed-off-by: Joe Savage <joe.savage(a)arm.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h index 4cfc00f..ba6e675 100644 --- a/helper/include/odp/helper/ip.h +++ b/helper/include/odp/helper/ip.h @@ -101,17 +101,18 @@ ODP_STATIC_ASSERT(sizeof(odph_ipv4hdr_t) == ODPH_IPV4HDR_LEN, */ static inline int odph_ipv4_csum_valid(odp_packet_t pkt) { + uint32_t offset; odp_u16be_t res = 0; uint16_t *w; int nleft = sizeof(odph_ipv4hdr_t); odph_ipv4hdr_t ip; odp_u16be_t chksum; - if (!odp_packet_l3_offset(pkt)) + offset = odp_packet_l3_offset(pkt); + if (offset == ODP_PACKET_OFFSET_INVALID) return 0; - odp_packet_copy_to_mem(pkt, odp_packet_l3_offset(pkt), - sizeof(odph_ipv4hdr_t), &ip); + odp_packet_copy_to_mem(pkt, offset, sizeof(odph_ipv4hdr_t), &ip); w = (uint16_t *)(void *)&ip; chksum = ip.chksum; @@ -137,10 +138,10 @@ static inline odp_u16sum_t odph_ipv4_csum_update(odp_packet_t pkt) odph_ipv4hdr_t *ip; int nleft = sizeof(odph_ipv4hdr_t); - if (!odp_packet_l3_offset(pkt)) + ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); + if (ip == NULL) return 0; - ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); w = (uint16_t *)(void *)ip; ip->chksum = odph_chksum(w, nleft); return ip->chksum; ----------------------------------------------------------------------- Summary of changes: helper/include/odp/helper/ip.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch api-next updated. v1.12.0.0-194-g29b05df

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 29b05df013426838fe166084fed9f1d56c59ebed (commit) from 54c15b2da776d8c71366a2f952998be23933d6de (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 29b05df013426838fe166084fed9f1d56c59ebed Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Dec 21 13:55:56 2016 +0100 linux-gen: _ishm: fixing typos Fixing a set of iritating typos. just in comments. Signed-off-by: Christophe Milard <christophe.milard(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/_ishm.c b/platform/linux-generic/_ishm.c index 6d5b752..23f620d 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -76,7 +76,7 @@ /* * Maximum number of internal shared memory blocks. * - * This the the number of separate ISHM areas that can be reserved concurrently + * This is the number of separate ISHM areas that can be reserved concurrently * (Note that freeing such blocks may take time, or possibly never happen * if some of the block ownwers never procsync() after free). This number * should take that into account) @@ -240,7 +240,7 @@ static void procsync(void); * Take a piece of the preallocated virtual space to fit "size" bytes. * (best fit). Size must be rounded up to an integer number of pages size. * Possibly split the fragment to keep track of remaining space. - * Returns the allocated fragment (best_fragmnt) and the corresponding address. + * Returns the allocated fragment (best_fragment) and the corresponding address. * External caller must ensure mutex before the call! */ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, @@ -286,11 +286,11 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, /* * if there is room between previous fragment and new one, (due to - * alignement requirement) then fragment (split) the space between + * alignment requirement) then fragment (split) the space between * the end of the previous fragment and the beginning of the new one: */ if (border - (uintptr_t)(*best_fragmnt)->start > 0) { - /* frangment space, i.e. take a new fragment descriptor... */ + /* fragment space, i.e. take a new fragment descriptor... */ rem_fragmnt = ishm_ftbl->unused_fragmnts; if (!rem_fragmnt) { ODP_ERR("unable to get shmem fragment descriptor!\n."); @@ -320,7 +320,7 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align, if (remainder == 0) return (*best_fragmnt)->start; - /* otherwise, frangment space, i.e. take a new fragment descriptor... */ + /* otherwise, fragment space, i.e. take a new fragment descriptor... */ rem_fragmnt = ishm_ftbl->unused_fragmnts; if (!rem_fragmnt) { ODP_ERR("unable to get shmem fragment descriptor!\n."); @@ -515,7 +515,7 @@ static void delete_file(ishm_block_t *block) * performs the mapping, possibly allocating a fragment of the pre-reserved * VA space if the _ODP_ISHM_SINGLE_VA flag was given. * Sets fd, and returns the mapping address. - * This funstion will also set the _ODP_ISHM_SINGLE_VA flag if the alignment + * This function will also set the _ODP_ISHM_SINGLE_VA flag if the alignment * requires it * Mutex must be assured by the caller. */ @@ -736,7 +736,7 @@ static void procsync(void) last = ishm_proctable->nb_entries; while (i < last) { - /* if the procecess sequence number doesn't match the main + /* if the process sequence number doesn't match the main * table seq number, this entry is obsolete */ block = &ishm_tbl->block[ishm_proctable->entry[i].block_index]; @@ -1065,7 +1065,7 @@ static int block_free(int block_index) } /* - * Free and unmap internal shared memory, intentified by its block number: + * Free and unmap internal shared memory, identified by its block number: * return -1 on error. 0 if OK. */ int _odp_ishm_free_by_index(int block_index) @@ -1081,7 +1081,7 @@ int _odp_ishm_free_by_index(int block_index) } /* - * free and unmap internal shared memory, intentified by its block name: + * free and unmap internal shared memory, identified by its block name: * return -1 on error. 0 if OK. */ int _odp_ishm_free_by_name(const char *name) @@ -1492,8 +1492,8 @@ static int do_odp_ishm_term_local(void) * Go through the table of visible blocks for this process, * decreasing the refcnt of each visible blocks, and issuing * warning for those no longer referenced by any process. - * Note that non-referenced blocks are nor freeed: this is - * deliberate as this would imply that the sementic of the + * Note that non-referenced blocks are not freed: this is + * deliberate as this would imply that the semantic of the * freeing function would differ depending on whether we run * with odp_thread as processes or pthreads. With this approach, * the user should always free the blocks manually, which is @@ -1699,7 +1699,7 @@ int _odp_ishm_status(const char *title) fragmnt; fragmnt = fragmnt->next) nb_unused_frgments++; - ODP_DBG("ishm: %d fragment used. %d fragements unused. (total=%d)\n", + ODP_DBG("ishm: %d fragment used. %d fragments unused. (total=%d)\n", nb_used_frgments, nb_unused_frgments, nb_used_frgments + nb_unused_frgments); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_ishm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch next updated. v1.12.0.0-121-g26e0820

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, next has been updated via 26e0820a7bc833239a8a66bc15d2eab5fd3edb87 (commit) via 22c01aac0d2ff868a02a20d394e4c763b1093ec1 (commit) via cbe195a283c703d84eceaa38e81bc305627074c1 (commit) via 6f7d32d9fa1ff48f3907f8ae9c9d61d02c1e5eee (commit) via 66e87bb0ae69813a7d69a0a357347ebe60f99aba (commit) from 4f87885fe0d7301cc8ff7da6d925c18a09e7e6be (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 26e0820a7bc833239a8a66bc15d2eab5fd3edb87 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Dec 21 12:11:33 2016 +0100 test: shm: checking exported vs imported block length Checking that the block size returned by odp_shm_info() matches the exported block length. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.c b/test/linux-generic/validation/api/shmem/shmem_odp2.c index e39dc76..7d8c682 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp2.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp2.c @@ -28,6 +28,7 @@ int main(int argc, char *argv[]) odp_instance_t odp1; odp_instance_t odp2; odp_shm_t shm; + odp_shm_info_t info; test_shared_data_t *test_shared_data; /* odp init: */ @@ -59,6 +60,13 @@ int main(int argc, char *argv[]) return 1; } + /* check that the read size matches the allocated size (in other ODP):*/ + if ((odp_shm_info(shm, &info)) || + (info.size != sizeof(*test_shared_data))) { + fprintf(stderr, "error: odp_shm_info failed.\n"); + return 1; + } + test_shared_data = odp_shm_addr(shm); if (test_shared_data == NULL) { fprintf(stderr, "error: odp_shm_addr failed.\n"); commit 22c01aac0d2ff868a02a20d394e4c763b1093ec1 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Dec 21 12:11:32 2016 +0100 linux-gen: _ishm: exporting/importing user len and flags The size of the shared memory and its user flag set, as given at reserve time, are exported and imported so that odp_shm_info() return proper values on imported blocks Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 33ef731..8b54be2 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -125,7 +125,9 @@ #define EXPORT_FILE_LINE3_FMT "file: %s" #define EXPORT_FILE_LINE4_FMT "length: %" PRIu64 #define EXPORT_FILE_LINE5_FMT "flags: %" PRIu32 -#define EXPORT_FILE_LINE6_FMT "align: %" PRIu32 +#define EXPORT_FILE_LINE6_FMT "user_length: %" PRIu64 +#define EXPORT_FILE_LINE7_FMT "user_flags: %" PRIu32 +#define EXPORT_FILE_LINE8_FMT "align: %" PRIu32 /* * A fragment describes a piece of the shared virtual address space, * and is allocated only when allocation is done with the _ODP_ISHM_SINGLE_VA @@ -481,7 +483,11 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, new_block->filename); fprintf(export_file, EXPORT_FILE_LINE4_FMT "\n", len); fprintf(export_file, EXPORT_FILE_LINE5_FMT "\n", flags); - fprintf(export_file, EXPORT_FILE_LINE6_FMT "\n", align); + fprintf(export_file, EXPORT_FILE_LINE6_FMT "\n", + new_block->user_len); + fprintf(export_file, EXPORT_FILE_LINE7_FMT "\n", + new_block->user_flags); + fprintf(export_file, EXPORT_FILE_LINE8_FMT "\n", align); fclose(export_file); } @@ -806,6 +812,10 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, else new_block->name[0] = 0; + /* save user data: */ + new_block->user_flags = user_flags; + new_block->user_len = size; + /* If a file descriptor is provided, get the real size and map: */ if (fd >= 0) { fstat(fd, &statbuf); @@ -921,9 +931,11 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid, FILE *export_file; uint64_t len; uint32_t flags; + uint64_t user_len; + uint32_t user_flags; uint32_t align; int fd; - int ret; + int block_index; /* try to read the block description file: */ snprintf(export_filename, ISHM_FILENAME_MAXLEN, @@ -953,7 +965,13 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid, if (fscanf(export_file, EXPORT_FILE_LINE5_FMT " ", &flags) != 1) goto error_exp_file; - if (fscanf(export_file, EXPORT_FILE_LINE6_FMT " ", &align) != 1) + if (fscanf(export_file, EXPORT_FILE_LINE6_FMT " ", &user_len) != 1) + goto error_exp_file; + + if (fscanf(export_file, EXPORT_FILE_LINE7_FMT " ", &user_flags) != 1) + goto error_exp_file; + + if (fscanf(export_file, EXPORT_FILE_LINE8_FMT " ", &align) != 1) goto error_exp_file; fclose(export_file); @@ -970,13 +988,17 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid, flags &= ~(uint32_t)_ODP_ISHM_EXPORT; /* reserve the memory, providing the opened file descriptor: */ - ret = _odp_ishm_reserve(local_name, 0, fd, align, flags, 0); - if (ret < 0) { + block_index = _odp_ishm_reserve(local_name, 0, fd, align, flags, 0); + if (block_index < 0) { close(fd); - return ret; + return block_index; } - return ret; + /* set inherited info: */ + ishm_tbl->block[block_index].user_flags = user_flags; + ishm_tbl->block[block_index].user_len = user_len; + + return block_index; error_exp_file: fclose(export_file); diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c index 39473f3..2f4c762 100644 --- a/test/linux-generic/validation/api/shmem/shmem_linux.c +++ b/test/linux-generic/validation/api/shmem/shmem_linux.c @@ -102,7 +102,8 @@ */ static int read_shmem_attribues(uint64_t ext_odp_pid, const char *blockname, char *filename, uint64_t *len, - uint32_t *flags, uint32_t *align) + uint32_t *flags, uint64_t *user_len, + uint32_t *user_flags, uint32_t *align) { char shm_attr_filename[PATH_MAX]; FILE *export_file; @@ -130,6 +131,12 @@ static int read_shmem_attribues(uint64_t ext_odp_pid, const char *blockname, if (fscanf(export_file, "flags: %" PRIu32 " ", flags) != 1) goto export_file_read_err; + if (fscanf(export_file, "user_length: %" PRIu64 " ", user_len) != 1) + goto export_file_read_err; + + if (fscanf(export_file, "user_flags: %" PRIu32 " ", user_flags) != 1) + goto export_file_read_err; + if (fscanf(export_file, "align: %" PRIu32 " ", align) != 1) goto export_file_read_err; @@ -192,6 +199,8 @@ int main(int argc __attribute__((unused)), char *argv[]) char shm_filename[PATH_MAX];/* shared mem device name, under /dev/shm */ uint64_t len; uint32_t flags; + uint64_t user_len; + uint32_t user_flags; uint32_t align; int shm_fd; test_shared_linux_data_t *addr; @@ -231,7 +240,8 @@ int main(int argc __attribute__((unused)), char *argv[]) /* read the shared memory attributes (includes the shm filename): */ if (read_shmem_attribues(odp_app1, ODP_SHM_NAME, - shm_filename, &len, &flags, &align) != 0) + shm_filename, &len, &flags, + &user_len, &user_flags, &align) != 0) test_failure(fifo_name, fifo_fd, odp_app1); /* open the shm filename (which is either on /tmp or on hugetlbfs) commit cbe195a283c703d84eceaa38e81bc305627074c1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Dec 21 13:27:22 2016 +0200 validation: test creating pool and timer pool with no name Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/pool/pool.c b/test/common_plat/validation/api/pool/pool.c index d48ac2a..8687941 100644 --- a/test/common_plat/validation/api/pool/pool.c +++ b/test/common_plat/validation/api/pool/pool.c @@ -8,19 +8,14 @@ #include "odp_cunit_common.h" #include "pool.h" -static int pool_name_number = 1; static const int default_buffer_size = 1500; static const int default_buffer_num = 1000; static void pool_create_destroy(odp_pool_param_t *params) { odp_pool_t pool; - char pool_name[ODP_POOL_NAME_LEN]; - snprintf(pool_name, sizeof(pool_name), - "test_pool-%d", pool_name_number++); - - pool = odp_pool_create(pool_name, params); + pool = odp_pool_create(NULL, params); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); CU_ASSERT(odp_pool_to_u64(pool) != odp_pool_to_u64(ODP_POOL_INVALID)); diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index 0007639..1945afa 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -156,7 +156,7 @@ void timer_test_odp_timer_cancel(void) tparam.num_timers = 1; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; - tp = odp_timer_pool_create("timer_pool0", &tparam); + tp = odp_timer_pool_create(NULL, &tparam); if (tp == ODP_TIMER_POOL_INVALID) CU_FAIL_FATAL("Timer pool create failed"); commit 6f7d32d9fa1ff48f3907f8ae9c9d61d02c1e5eee Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Dec 21 13:27:23 2016 +0200 api: move ODP_*_NAME_LEN definitions from API to implementation Enables the implementations to choose the define values. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.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/pool.h b/include/odp/api/spec/pool.h index af2829b..c0de195 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -36,8 +36,10 @@ extern "C" { * Invalid pool */ -/** Maximum pool name length in chars including null char */ -#define ODP_POOL_NAME_LEN 32 +/** + * @def ODP_POOL_NAME_LEN + * Maximum pool name length in chars including null char + */ /** * Pool capabilities diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 074c883..1a9c129 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -40,8 +40,10 @@ extern "C" { * Synonym for buffer pool use */ -/** Maximum shared memory block name length in chars including null char */ -#define ODP_SHM_NAME_LEN 32 +/** + * @def ODP_SHM_NAME_LEN + * Maximum shared memory block name length in chars including null char + */ /* * Shared memory flags: diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 46a4369..75f9db9 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -90,8 +90,10 @@ typedef enum { ODP_TIMER_NOEVENT = -3 } odp_timer_set_t; -/** Maximum timer pool name length in chars including null char */ -#define ODP_TIMER_POOL_NAME_LEN 32 +/** + * @def ODP_TIMER_POOL_NAME_LEN + * Maximum timer pool name length in chars including null char + */ /** Timer pool parameters * Timer pool parameters are used when creating and querying timer pools. diff --git a/platform/linux-generic/include/odp/api/plat/pool_types.h b/platform/linux-generic/include/odp/api/plat/pool_types.h index 4e39de5..6baff09 100644 --- a/platform/linux-generic/include/odp/api/plat/pool_types.h +++ b/platform/linux-generic/include/odp/api/plat/pool_types.h @@ -30,6 +30,8 @@ typedef ODP_HANDLE_T(odp_pool_t); #define ODP_POOL_INVALID _odp_cast_scalar(odp_pool_t, 0xffffffff) +#define ODP_POOL_NAME_LEN 32 + /** * Pool type */ diff --git a/platform/linux-generic/include/odp/api/plat/shared_memory_types.h b/platform/linux-generic/include/odp/api/plat/shared_memory_types.h index 4d8bbcc..afa0bf9 100644 --- a/platform/linux-generic/include/odp/api/plat/shared_memory_types.h +++ b/platform/linux-generic/include/odp/api/plat/shared_memory_types.h @@ -31,6 +31,8 @@ typedef ODP_HANDLE_T(odp_shm_t); #define ODP_SHM_INVALID _odp_cast_scalar(odp_shm_t, 0) #define ODP_SHM_NULL ODP_SHM_INVALID +#define ODP_SHM_NAME_LEN 32 + /** Get printable format of odp_shm_t */ static inline uint64_t odp_shm_to_u64(odp_shm_t hdl) { diff --git a/platform/linux-generic/include/odp/api/plat/timer_types.h b/platform/linux-generic/include/odp/api/plat/timer_types.h index 68d6f6f..8821bed 100644 --- a/platform/linux-generic/include/odp/api/plat/timer_types.h +++ b/platform/linux-generic/include/odp/api/plat/timer_types.h @@ -30,6 +30,8 @@ typedef struct odp_timer_pool_s *odp_timer_pool_t; #define ODP_TIMER_POOL_INVALID NULL +#define ODP_TIMER_POOL_NAME_LEN 32 + typedef ODP_HANDLE_T(odp_timer_t); #define ODP_TIMER_INVALID _odp_cast_scalar(odp_timer_t, 0xffffffff) commit 66e87bb0ae69813a7d69a0a357347ebe60f99aba Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Dec 21 13:27:21 2016 +0200 api: unify ODP_*_NAME_LEN specifications Unify name length definitions to always include terminating null character. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.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/classification.h b/include/odp/api/spec/classification.h index 0e442c7..0e1addd 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -44,7 +44,7 @@ extern "C" { /** * @def ODP_COS_NAME_LEN - * Maximum ClassOfService name length in chars + * Maximum ClassOfService name length in chars including null char */ /** diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index 041f4af..af2829b 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -36,7 +36,7 @@ extern "C" { * Invalid pool */ -/** Maximum queue name length in chars */ +/** Maximum pool name length in chars including null char */ #define ODP_POOL_NAME_LEN 32 /** diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index b0c5e31..7972fea 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -44,7 +44,7 @@ extern "C" { /** * @def ODP_QUEUE_NAME_LEN - * Maximum queue name length in chars + * Maximum queue name length in chars including null char */ /** diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index f976a4c..8244746 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -42,7 +42,7 @@ extern "C" { /** * @def ODP_SCHED_GROUP_NAME_LEN - * Maximum schedule group name length in chars + * Maximum schedule group name length in chars including null char */ /** diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 885751d..074c883 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -40,7 +40,7 @@ extern "C" { * Synonym for buffer pool use */ -/** Maximum shared memory block name length in chars */ +/** Maximum shared memory block name length in chars including null char */ #define ODP_SHM_NAME_LEN 32 /* diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 49221c4..46a4369 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -90,7 +90,7 @@ typedef enum { ODP_TIMER_NOEVENT = -3 } odp_timer_set_t; -/** Maximum timer pool name length in chars (including null char) */ +/** Maximum timer pool name length in chars including null char */ #define ODP_TIMER_POOL_NAME_LEN 32 /** Timer pool parameters ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/classification.h | 2 +- include/odp/api/spec/pool.h | 6 ++-- include/odp/api/spec/queue.h | 2 +- include/odp/api/spec/schedule.h | 2 +- include/odp/api/spec/shared_memory.h | 6 ++-- include/odp/api/spec/timer.h | 6 ++-- platform/linux-generic/_ishm.c | 38 +++++++++++++++++----- .../include/odp/api/plat/pool_types.h | 2 ++ .../include/odp/api/plat/shared_memory_types.h | 2 ++ .../include/odp/api/plat/timer_types.h | 2 ++ test/common_plat/validation/api/pool/pool.c | 7 +--- test/common_plat/validation/api/timer/timer.c | 2 +- .../validation/api/shmem/shmem_linux.c | 14 ++++++-- .../validation/api/shmem/shmem_odp2.c | 8 +++++ 14 files changed, 73 insertions(+), 26 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch master updated. v1.12.0.0-17-g29dde30

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 29dde30264da8106d64328b0d81eb19dad0065ac (commit) from 92ae191876c39a3f5d4fba63e58dd9e8c444239b (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 29dde30264da8106d64328b0d81eb19dad0065ac Author: Stanislaw Kardach <kda(a)semihalf.com> Date: Wed Dec 28 16:12:52 2016 +0100 helper: do not break odp_term_global protocol As per API documentation, odp_term_global() should be a final ODP call when terminating the ODP application in a controlled way. Therefore ODP threads or sub-processes created using ODP helper API should not call this function but leave it to the main application thread/process. Signed-off-by: Stanislaw Kardach <kda(a)semihalf.com> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/linux.c b/helper/linux.c index 7bd0b07..1f009cd 100644 --- a/helper/linux.c +++ b/helper/linux.c @@ -42,8 +42,6 @@ static void *odp_run_start_routine(void *arg) if (ret < 0) ODPH_ERR("Local term failed\n"); - else if (ret == 0 && odp_term_global(thr_params->instance)) - ODPH_ERR("Global term failed\n"); return ret_ptr; } @@ -277,8 +275,6 @@ static void *odpthread_run_start_routine(void *arg) if (ret < 0) ODPH_ERR("Local term failed\n"); - else if (ret == 0 && odp_term_global(thr_params->instance)) - ODPH_ERR("Global term failed\n"); /* for process implementation of odp threads, just return status... */ if (start_args->linuxtype == ODPTHREAD_PROCESS) ----------------------------------------------------------------------- Summary of changes: helper/linux.c | 4 ---- 1 file changed, 4 deletions(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch next updated. v1.12.0.0-116-g4f87885

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, next has been updated via 4f87885fe0d7301cc8ff7da6d925c18a09e7e6be (commit) from ec84962de6f2b392bbde9e8ebc802781979b95dc (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 4f87885fe0d7301cc8ff7da6d925c18a09e7e6be Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Dec 28 14:33:12 2016 -0600 api: pktio: pktio documentation typo correction Signed-off-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/packet_io.h b/include/odp/api/spec/packet_io.h index 2dabfcc..85cd6d1 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -189,7 +189,7 @@ typedef struct odp_pktin_queue_param_t { /** Number of input queues to be created * - * When classifier is enabled in odp_ipktin_queue_config() this + * When classifier is enabled in odp_pktin_queue_config() this * value is ignored, otherwise at least one queue is required. * More than one input queues require flow hashing configured. * The maximum value is defined by pktio capability 'max_input_queues'. ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet_io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

8 years, 5 months

[COMMIT] branch api-next updated. v1.12.0.0-193-g54c15b2

by git＠git-us.linaro.org

8 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp