git-lng-odp

git-lng-odp@lists.linaro.org

1216 discussions

[COMMIT] branch master updated. v1.21.0.0-34-ge3217b34b

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 e3217b34b9741560443b972aea71e270b547e7d9 (commit) via 1bb85b0de781e8c6fb3b79cf463337d04798b1af (commit) via 50d6e131ea081b60237e6c46f8515a7909770987 (commit) from 291afb1577f2954b94f7dfbec31e3d3768de8a81 (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 e3217b34b9741560443b972aea71e270b547e7d9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Mar 15 15:57:24 2019 +0200 validation: scheduler: prevent pause resume test getting stuck scheduler_test_pause_resume() will get stuck if all events are not successfully enqueued, so use fatal check. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 3d0f1f5b9..7ad6acf48 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -1671,10 +1671,7 @@ static void scheduler_test_pause_resume(void) CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); ev = odp_buffer_to_event(buf); ret = odp_queue_enq(queue, ev); - CU_ASSERT(ret == 0); - - if (ret) - odp_buffer_free(buf); + CU_ASSERT_FATAL(ret == 0); } for (i = 0; i < NUM_BUFS_BEFORE_PAUSE; i++) { @@ -1699,7 +1696,7 @@ static void scheduler_test_pause_resume(void) local_bufs++; } - CU_ASSERT(local_bufs < NUM_BUFS_PAUSE - NUM_BUFS_BEFORE_PAUSE); + CU_ASSERT(local_bufs <= NUM_BUFS_PAUSE - NUM_BUFS_BEFORE_PAUSE); odp_schedule_resume(); commit 1bb85b0de781e8c6fb3b79cf463337d04798b1af Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Mar 15 15:42:04 2019 +0200 validation: scheduler: remove ODP_ prefix from test define Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 652591754..3d0f1f5b9 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -54,7 +54,7 @@ #define CHAOS_PTR_TO_NDX(p) ((uint64_t)(uint32_t)(uintptr_t)p) #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n) -#define ODP_WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) +#define WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) #define WAIT_1MS_RETRIES 1000 /* Test global variables */ @@ -192,7 +192,7 @@ static void scheduler_test_wait_time(void) diff = odp_time_diff(end_time, start_time); lower_limit = ODP_TIME_NULL; - upper_limit = odp_time_local_from_ns(ODP_WAIT_TOLERANCE); + upper_limit = odp_time_local_from_ns(WAIT_TOLERANCE); CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); @@ -205,9 +205,9 @@ static void scheduler_test_wait_time(void) diff = odp_time_diff(end_time, start_time); lower_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS - - ODP_WAIT_TOLERANCE); + WAIT_TOLERANCE); upper_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS + - ODP_WAIT_TOLERANCE); + WAIT_TOLERANCE); if (odp_time_cmp(diff, lower_limit) <= 0) { fprintf(stderr, "Exceed lower limit: " commit 50d6e131ea081b60237e6c46f8515a7909770987 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Mar 15 15:31:52 2019 +0200 validation: scheduler: fix groups test invalid failure The test would fail if odp_schedule(ODP_SCHED_NO_WAIT) wouldn't return any events on the first call. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Angela Czubak <aczubak(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index b7128c1f0..652591754 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -55,6 +55,7 @@ #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n) #define ODP_WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) +#define WAIT_1MS_RETRIES 1000 /* Test global variables */ typedef struct { @@ -737,7 +738,9 @@ static void scheduler_test_groups(void) odp_queue_t queue, from; odp_schedule_group_t mygrp[NUM_GROUPS]; odp_queue_t queue_grp[NUM_GROUPS]; + uint64_t wait_time; int num = NUM_GROUPS; + int schedule_retries; odp_queue_param_init(&qp); qp.type = ODP_QUEUE_TYPE_SCHED; @@ -795,21 +798,19 @@ static void scheduler_test_groups(void) odp_schedule_group_leave(mygrp2, &mymask); odp_schedule_group_join(mygrp1, &mymask); + wait_time = odp_schedule_wait_time(ODP_TIME_MSEC_IN_NS); + schedule_retries = 0; while (num) { queue = queue_grp[j]; - ev = odp_schedule(&from, ODP_SCHED_NO_WAIT); + ev = odp_schedule(&from, wait_time); if (ev == ODP_EVENT_INVALID) { - /* change group */ - rc = odp_schedule_group_leave(mygrp[j], - &mymask); - CU_ASSERT_FATAL(rc == 0); - - j = (j + 1) % NUM_GROUPS; - rc = odp_schedule_group_join(mygrp[j], - &mymask); - CU_ASSERT_FATAL(rc == 0); + CU_ASSERT_FATAL(schedule_retries < + WAIT_1MS_RETRIES); + schedule_retries++; continue; + } else { + schedule_retries = 0; } CU_ASSERT_FATAL(from == queue); @@ -826,6 +827,14 @@ static void scheduler_test_groups(void) odp_buffer_free(buf); + /* Change group */ + rc = odp_schedule_group_leave(mygrp[j], &mymask); + CU_ASSERT_FATAL(rc == 0); + + j = (j + 1) % NUM_GROUPS; + rc = odp_schedule_group_join(mygrp[j], &mymask); + CU_ASSERT_FATAL(rc == 0); + /* Tell scheduler we're about to request an event. * Not needed, but a convenient place to test this API. */ ----------------------------------------------------------------------- Summary of changes: test/validation/api/scheduler/scheduler.c | 44 ++++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) hooks/post-receive --

7 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-31-g291afb157

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 291afb1577f2954b94f7dfbec31e3d3768de8a81 (commit) via cac506f75c63ddc7b8a983a34000d90ebc65095c (commit) via a0ab1025cde22c089d8f286a6babe99d1bb3fbd4 (commit) via 1974bcc6decc9d1cda9e728f17931c02139fb6b8 (commit) from 6d832e408b848c739cd1ce07584322619030936a (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 291afb1577f2954b94f7dfbec31e3d3768de8a81 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Mar 18 14:51:09 2019 +0200 api: increment version to v1.21.2 Increment minor version number to reflect backward compatible API changes. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/configure.ac b/configure.ac index 923d98dff..f4ad79f5f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.5]) ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [21]) -m4_define([odpapi_minor_version], [1]) +m4_define([odpapi_minor_version], [2]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) commit cac506f75c63ddc7b8a983a34000d90ebc65095c Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Feb 18 14:53:01 2019 +0200 validation: shm: add validation test for new ODP_SHM_HP flag Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index 91235851e..4e2c13a22 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2014-2018, Linaro Limited +/* Copyright (c) 2019, Nokia + * Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -213,6 +214,45 @@ static void shmem_test_basic(void) CU_ASSERT(0 == odp_shm_free(shm)); } +/* + * test reserving memory from huge pages + */ +static void shmem_test_hp(void) +{ + odp_shm_t shm; + odp_shm_info_t info; + int i; + int num_sizes = odp_sys_huge_page_size_all(NULL, 0); + + CU_ASSERT_FATAL(num_sizes >= 0); + + shm = odp_shm_reserve(MEM_NAME, sizeof(shared_test_data_t), + ALIGN_SIZE, ODP_SHM_HP); + if (shm == ODP_SHM_INVALID) { + printf(" No huge pages available\n"); + return; + } + + /* Make sure that the memory is reserved from huge pages */ + + CU_ASSERT_FATAL(num_sizes > 0); + CU_ASSERT_FATAL(odp_shm_info(shm, &info) == 0); + + uint64_t hp_sizes[num_sizes]; + + CU_ASSERT_FATAL(odp_sys_huge_page_size_all(hp_sizes, num_sizes) == + num_sizes); + + for (i = 0; i < num_sizes; i++) { + if (hp_sizes[i] == info.page_size) + break; + } + + CU_ASSERT(i < num_sizes); + + CU_ASSERT(odp_shm_free(shm) == 0); +} + /* * maximum size reservation */ @@ -821,6 +861,7 @@ static void shmem_test_stress(void) odp_testinfo_t shmem_suite[] = { ODP_TEST_INFO(shmem_test_basic), + ODP_TEST_INFO(shmem_test_hp), ODP_TEST_INFO(shmem_test_max_reserve), ODP_TEST_INFO(shmem_test_reserve_after_fork), ODP_TEST_INFO(shmem_test_singleva_after_fork), commit a0ab1025cde22c089d8f286a6babe99d1bb3fbd4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Feb 18 14:05:37 2019 +0200 linux-gen: shm: implement new ODP_SHM_HP flag Internal _ODP_ISHM_USE_HP flag is replaced with API ODP_SHM_HP flag. This makes internal _odp_shm_reserve() wrapper function unnecessary. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h index c98f07deb..9e51ffad1 100644 --- a/platform/linux-generic/include/odp_shm_internal.h +++ b/platform/linux-generic/include/odp_shm_internal.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2016-2018, Linaro Limited +/* Copyright (c) 2019, Nokia + * Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -20,7 +21,6 @@ extern "C" { #define _ODP_ISHM_SINGLE_VA 1 #define _ODP_ISHM_LOCK 2 #define _ODP_ISHM_EXPORT 4 /* create export descr file in /tmp */ -#define _ODP_ISHM_USE_HP 8 /* allocate memory from huge pages */ /** * Shared memory block info @@ -34,9 +34,6 @@ typedef struct _odp_ishm_info_t { uint32_t user_flags;/**< user specific flags */ } _odp_ishm_info_t; -odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align, - uint32_t flags, uint32_t extra_flags); - int _odp_ishm_reserve(const char *name, uint64_t size, int fd, uint32_t align, uint64_t offset, uint32_t flags, uint32_t user_flags); int _odp_ishm_free_by_index(int block_index); diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 14255eccc..aa4d497a5 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2016-2018, Linaro Limited +/* Copyright (c) 2019, Nokia + * Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -1114,7 +1115,7 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, } /* Otherwise, Try first huge pages when possible and needed: */ - if ((fd < 0) && page_hp_size && ((flags & _ODP_ISHM_USE_HP) || + if ((fd < 0) && page_hp_size && ((user_flags & ODP_SHM_HP) || size > ishm_tbl->huge_page_limit)) { /* at least, alignment in VA should match page size, but user * can request more: If the user requirement exceeds the page @@ -1168,6 +1169,11 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd, /* Try normal pages if huge pages failed */ if (fd < 0) { + if (user_flags & ODP_SHM_HP) { + odp_spinlock_unlock(&ishm_tbl->lock); + ODP_ERR("Unable to allocate memory from huge pages\n"); + return -1; + } /* at least, alignment in VA should match page size, but user * can request more: If the user requirement exceeds the page * size then we have to make sure the block will be mapped at diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 7f4bb795a..feb25cf39 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2013-2018, Linaro Limited +/* Copyright (c) 2019, Nokia + * Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -384,7 +385,6 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, uint32_t max_len; uint32_t ring_size; uint32_t num_extra = 0; - uint32_t extra_shm_flags = 0; int name_len; const char *postfix = "_uarea"; char uarea_name[ODP_POOL_NAME_LEN + sizeof(postfix)]; @@ -514,7 +514,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, return ODP_POOL_INVALID; } if (dpdk_obj_size != block_size) - extra_shm_flags |= _ODP_ISHM_USE_HP; + shmflags |= ODP_SHM_HP; block_size = dpdk_obj_size; } @@ -548,8 +548,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->ext_desc = NULL; pool->ext_destroy = NULL; - shm = _odp_shm_reserve(pool->name, pool->shm_size, - ODP_PAGE_SIZE, shmflags, extra_shm_flags); + shm = odp_shm_reserve(pool->name, pool->shm_size, ODP_PAGE_SIZE, + shmflags); pool->shm = shm; diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index b1bbdeb7b..d92b22587 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2013-2018, Linaro Limited +/* Copyright (c) 2019, Nokia + * Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -44,22 +45,6 @@ static uint32_t get_ishm_flags(uint32_t flags) return f; } -odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align, - uint32_t flags, uint32_t extra_flags) -{ - int block_index; - uint32_t flgs = 0; /* internal ishm flags */ - - flgs = get_ishm_flags(flags); - flgs |= extra_flags; - - block_index = _odp_ishm_reserve(name, size, -1, align, 0, flgs, flags); - if (block_index >= 0) - return to_handle(block_index); - else - return ODP_SHM_INVALID; -} - int odp_shm_capability(odp_shm_capability_t *capa) { memset(capa, 0, sizeof(odp_shm_capability_t)); @@ -74,7 +59,16 @@ int odp_shm_capability(odp_shm_capability_t *capa) odp_shm_t odp_shm_reserve(const char *name, uint64_t size, uint64_t align, uint32_t flags) { - return _odp_shm_reserve(name, size, align, flags, 0); + int block_index; + uint32_t flgs = 0; /* internal ishm flags */ + + flgs = get_ishm_flags(flags); + + block_index = _odp_ishm_reserve(name, size, -1, align, 0, flgs, flags); + if (block_index >= 0) + return to_handle(block_index); + else + return ODP_SHM_INVALID; } odp_shm_t odp_shm_import(const char *remote_name, commit 1974bcc6decc9d1cda9e728f17931c02139fb6b8 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Feb 18 13:31:21 2019 +0200 api: shm: add ODP_SHM_HP flag When set, this flag guarantees that the memory reserved by odp_shm_reserve() is allocated from huge pages. If enough huge page memory is not available the call will fail. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 05c8de401..0882c4a1c 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2013-2018, Linaro Limited +/* Copyright (c) 2019, Nokia + * Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -39,11 +40,17 @@ extern "C" { * Maximum shared memory block name length in chars including null char */ -/* - * Shared memory flags: + /* Shared memory flags */ + +/** + * Application SW only, no HW access + */ +#define ODP_SHM_SW_ONLY 0x1 + +/** + * Share with external processes */ -#define ODP_SHM_SW_ONLY 0x1 /**< Application SW only, no HW access */ -#define ODP_SHM_PROC 0x2 /**< Share with external processes */ +#define ODP_SHM_PROC 0x2 /** * Single virtual address @@ -62,6 +69,15 @@ extern "C" { */ #define ODP_SHM_EXPORT 0x08 +/** + * Use huge pages + * + * When set, this flag guarantees that the memory reserved by odp_shm_reserve() + * is allocated from huge pages. The reserve call will return failure if enough + * huge page memory is not available. + */ +#define ODP_SHM_HP 0x10 + /** * Shared memory block info */ ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- include/odp/api/spec/shared_memory.h | 26 +++++++++++--- platform/linux-generic/include/odp_shm_internal.h | 7 ++-- platform/linux-generic/odp_ishm.c | 10 ++++-- platform/linux-generic/odp_pool.c | 10 +++--- platform/linux-generic/odp_shared_memory.c | 30 +++++++--------- test/validation/api/shmem/shmem.c | 43 ++++++++++++++++++++++- 7 files changed, 91 insertions(+), 37 deletions(-) hooks/post-receive --

7 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-27-g6d832e408

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 6d832e408b848c739cd1ce07584322619030936a (commit) from 123d4b5092725f3fbc7178ff0cde4c7f8d53ffd3 (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 6d832e408b848c739cd1ce07584322619030936a Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Mar 13 14:49:59 2019 +0200 linux-gen: netmap: bump tested version to v13.0 Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index bb84ab19e..607e89477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ install: echo "Installing NETMAP"; sudo apt-get install linux-headers-`uname -r` ; CDIR=`pwd` ; - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git; + git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v13.0 https://github.com/luigirizzo/netmap.git; pushd netmap/LINUX; ./configure --drivers= ; make -j $(nproc); diff --git a/DEPENDENCIES b/DEPENDENCIES index f16617bc3..917d84158 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -96,13 +96,13 @@ Prerequisites for building the OpenDataPlane (ODP) API 3.3.1 Building netmap kernel modules ODP works at least with the latest release version of netmap, which is - currently 11.2. However, if possible one should try to use the latest netmap + currently v13.0. However, if possible one should try to use the latest netmap master branch commit for the best performance and the latest bug fixes. # Checkout netmap code $ git clone https://github.com/luigirizzo/netmap.git $ cd netmap - $ git checkout v11.2 (optional) + $ git checkout v13.0 (optional) This is enough to build ODP. If you don't want to build netmap kernel modules you can jump to section 3.3.2. ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- DEPENDENCIES | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive --

7 years, 2 months

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

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 123d4b5092725f3fbc7178ff0cde4c7f8d53ffd3 (commit) from 31b17c87d784fc841d310b03462f0d02dac35eac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 123d4b5092725f3fbc7178ff0cde4c7f8d53ffd3 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Mar 13 12:50:06 2019 +0200 ci: remove deleted configure option test-perf-proc Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.shippable.yml b/.shippable.yml index 0bf68f330..47d281845 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -5,13 +5,8 @@ compiler: - clang env: - - CONF="--disable-test-perf --disable-test-perf-proc" - - CONF="--disable-abi-compat --disable-test-perf --disable-test-perf-proc" - # - CONF="--enable-dpdk-zero-copy" - # - CROSS_ARCH="arm64" - # - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - # - CROSS_ARCH="powerpc" - # - CROSS_ARCH="i386" + - CONF="--disable-test-perf" + - CONF="--disable-abi-compat --disable-test-perf" build: ci: diff --git a/.travis.yml b/.travis.yml index e223c756b..bb84ab19e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ stages: # project: # name: "$TRAVIS_REPO_SLUG" # notification_email: xxxx -# build_command_prepend: "./bootstrap && ./configure --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example" +# build_command_prepend: "./bootstrap && ./configure --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-example" # build_command: "make" # branch_pattern: coverity_scan diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh index 9640b7114..0ab2f028b 100755 --- a/scripts/ci/coverage.sh +++ b/scripts/ci/coverage.sh @@ -9,7 +9,7 @@ cd "$(dirname "$0")"/../.. ./bootstrap ./configure \ CFLAGS="-O0 -coverage $CLFAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \ - --enable-debug=full --enable-helper-linux --enable-dpdk --disable-test-perf --disable-test-perf-proc + --enable-debug=full --enable-helper-linux --enable-dpdk --disable-test-perf export CCACHE_DISABLE=1 make -j $(nproc) ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 9 ++------- .travis.yml | 2 +- scripts/ci/coverage.sh | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) hooks/post-receive --

7 years, 2 months

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

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 31b17c87d784fc841d310b03462f0d02dac35eac (commit) from e7a14391d9375aab1f9f6ec8d16de9ff29f51956 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 31b17c87d784fc841d310b03462f0d02dac35eac Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Wed Mar 13 20:21:45 2019 +0300 m4: fix ODP_PTHREAD definition AC_SUBST PTHREAD_CFLAGS/_LIBS variables inside ODP_PTHREAD macro definition, so they get properly substituted when compiling. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/m4/odp_pthread.m4 b/m4/odp_pthread.m4 index 0e3485e37..ad65f4d1a 100644 --- a/m4/odp_pthread.m4 +++ b/m4/odp_pthread.m4 @@ -11,7 +11,7 @@ AC_DEFUN([ODP_PTHREAD], [ AC_LANG_PUSH([C]) PTHEAD_CFLAGS="-pthread" CFLAGS="$CFLAGS $PTHEAD_CFLAGS" - PTHEAD_LIBS="-pthread" + PTHREAD_LIBS="-pthread" LDFLAGS="$LDFLAGS $PTHREAD_LIBS" AC_TRY_LINK_FUNC([pthread_create], [pthread=yes]) if test x"$pthread" != "xyes"; then @@ -19,6 +19,6 @@ AC_DEFUN([ODP_PTHREAD], [ fi AC_MSG_RESULT([yes]) AC_LANG_POP([C]) + AC_SUBST([PTHREAD_LIBS]) + AC_SUBST([PTHREAD_CFLAGS]) ]) -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) ----------------------------------------------------------------------- Summary of changes: m4/odp_pthread.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive --

7 years, 2 months

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

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via e7a14391d9375aab1f9f6ec8d16de9ff29f51956 (commit) from 3e3f2536bd4246010a765dde30bc1b88f824dcab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e7a14391d9375aab1f9f6ec8d16de9ff29f51956 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Mar 8 15:17:07 2019 +0200 linux-gen: shm: check proc_index value before usage Fixes build error ("array subscript is below array bounds") on Debian 8 (gcc 4.9.2). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reported-by: Risto Teittinen <risto.teittinen(a)nokia-bell-labs.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 94a14549a..14255eccc 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -1988,6 +1988,10 @@ int _odp_ishm_status(const char *title) /* display block table: 1 line per entry +1 extra line if mapped here */ for (i = 0; i < ISHM_MAX_NB_BLOCKS; i++) { + void *start_addr = NULL; + void *end_addr = NULL; + int entry_fd = -1; + if (ishm_tbl->block[i].len <= 0) continue; /* unused block */ @@ -2020,25 +2024,25 @@ int _odp_ishm_status(const char *title) lost_total += ishm_tbl->block[i].len - ishm_tbl->block[i].user_len; len_total += ishm_tbl->block[i].len; - ODP_PRINT("%2i %-*s %s%c 0x%-08lx-0x%08lx %-08ld %-08ld %-3lu %-3lu", + + if (proc_index >= 0) { + start_addr = ishm_proctable->entry[proc_index].start; + end_addr = (void *)(uintptr_t)((uintptr_t)start_addr + + ishm_tbl->block[i].len); + entry_fd = ishm_proctable->entry[proc_index].fd; + } + + ODP_PRINT("%2i %-*s %s%c 0x%-08lx-0x%08lx %-08ld %-08ld %-3lu %-3lu %-3d %s\n", i, max_name_len, ishm_tbl->block[i].name, - flags, huge, - ishm_proctable->entry[proc_index].start, - (uintptr_t)ishm_proctable->entry[proc_index].start + - ishm_tbl->block[i].len, + flags, huge, start_addr, end_addr, ishm_tbl->block[i].user_len, ishm_tbl->block[i].len - ishm_tbl->block[i].user_len, ishm_tbl->block[i].seq, - ishm_tbl->block[i].refcnt); - - if (proc_index < 0) - continue; - - ODP_PRINT(" %-3d", - ishm_proctable->entry[proc_index].fd); - - ODP_PRINT("%s\n", ishm_tbl->block[i].filename[0] ? - ishm_tbl->block[i].filename : "(none)"); + ishm_tbl->block[i].refcnt, + entry_fd, + ishm_tbl->block[i].filename[0] ? + ishm_tbl->block[i].filename : + "(none)"); } ODP_PRINT("TOTAL: %58s%-08ld %2s%-08ld\n", "", len_total, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_ishm.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) hooks/post-receive --

7 years, 3 months

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

by git＠git-us.linaro.org

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

7 years, 3 months

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

by git＠git-us.linaro.org

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

7 years, 3 months

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

by git＠git-us.linaro.org

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

7 years, 3 months

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

by git＠git-us.linaro.org

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

7 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
122
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp