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 11207ff1e211658bfb44c635423ae818a0654239 (commit) via 3abbe8b729310d29b9a2c84a7d7a11771513908d (commit) via f49289a7f621ffe5c981caa8531623d9e0a4abd9 (commit) via cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 (commit) via 332877d51e773a584d272a03f08446d18cbe1634 (commit) from bed462d28fa081a0d66dd29a8034f188256c7d04 (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 11207ff1e211658bfb44c635423ae818a0654239 Author: Petri Savolainen petri.savolainen@linaro.org Date: Mon May 7 12:41:54 2018 +0300
linux-gen: use inlined event type function
Implementation uses internally inlined version of event functions.
Signed-off-by: Petri Savolainen petri.savolainen@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index aca822d8..0fce762a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -20,6 +20,9 @@ #include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h>
+/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #include <string.h> #include <stdlib.h>
diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 7fcebeb8..247e9f8b 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -14,6 +14,9 @@ #include <odp_ipsec_internal.h> #include <odp_pool_internal.h>
+/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + typedef struct { /* common buffer header */ odp_buffer_hdr_t buf_hdr; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index d4b19fee..e0635444 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -16,6 +16,9 @@ #include <odp/api/packet_io.h> #include <odp/api/plat/pktio_inlines.h>
+/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #include <protocols/eth.h> #include <protocols/ip.h> #include <protocols/tcp.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 3fc8f380..9085f1bb 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -56,6 +56,9 @@ #include <odp_arch_time_internal.h> #include <odp_timer_internal.h>
+/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h> + #define TMO_UNUSED ((uint64_t)0xFFFFFFFFFFFFFFFF) /* TMO_INACTIVE is or-ed with the expiration tick to indicate an expired timer. * The original expiration tick (63 bits) is still available so it can be used
commit 3abbe8b729310d29b9a2c84a7d7a11771513908d Author: Petri Savolainen petri.savolainen@linaro.org Date: Fri May 4 15:20:33 2018 +0300
linux-gen: event: inline event_type function
Inline odp_event_type() as an example how current inline mechanism can be simplified. Only one file is needed for inline function definitions (xxx_inlines.h) and _ODP_NO_INLINE macro selects when non-inlined implementation is needed (only by xxx_api.c files). Implementation uses internally always inlined functions. Inlined function name is changed with macro from odp_foo() to __odp_foo().
Signed-off-by: Petri Savolainen petri.savolainen@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index de2ada50..a73dc61d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -24,8 +24,10 @@ if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ + include/odp/api/plat/buffer_inline_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_inlines_api.h \ + include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inline_types.h \ @@ -213,6 +215,7 @@ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ odp_byteorder.c \ + odp_event_api.c \ odp_packet_api.c \ odp_packet_flags_api.c \ odp_pktio_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/event.h b/platform/linux-generic/include-abi/odp/api/abi/event.h index 7ba426a6..d7bd57c0 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/event.h +++ b/platform/linux-generic/include-abi/odp/api/abi/event.h @@ -43,6 +43,9 @@ typedef enum odp_event_subtype_t { ODP_EVENT_PACKET_IPSEC = 3 } odp_event_subtype_t;
+/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/event_inlines.h> + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h new file mode 100644 index 00000000..29f49f8d --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/buffer_inline_types.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_BUFFER_INLINE_TYPES_H_ +#define ODP_PLAT_BUFFER_INLINE_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +/* Buffer header field accessor */ +#define _odp_buf_hdr_field(buf_hdr, cast, field) \ + (*(cast *)(uintptr_t)((uint8_t *)buf_hdr + \ + _odp_buffer_inline_offset.field)) + +/* Buffer header field offsets for inline functions */ +typedef struct _odp_buffer_inline_offset_t { + uint16_t event_type; + +} _odp_buffer_inline_offset_t; + +/** @endcond */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/event_inlines.h b/platform/linux-generic/include/odp/api/plat/event_inlines.h new file mode 100644 index 00000000..fbecd2c1 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/event_inlines.h @@ -0,0 +1,37 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_EVENT_INLINES_H_ +#define ODP_PLAT_EVENT_INLINES_H_ + +#include <odp/api/abi/buffer.h> +#include <odp/api/plat/buffer_inline_types.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +extern const _odp_buffer_inline_offset_t _odp_buffer_inline_offset; + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_event_type __odp_event_type +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE odp_event_type_t odp_event_type(odp_event_t event) +{ + int8_t type; + odp_buffer_t buf = (odp_buffer_t)event; + + type = _odp_buf_hdr_field(buf, int8_t, event_type); + + return (odp_event_type_t)type; +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 8c9d921c..ac0b9f9c 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -10,11 +10,22 @@ #include <odp_pool_internal.h> #include <odp_buffer_internal.h> #include <odp_debug_internal.h> +#include <odp/api/plat/buffer_inline_types.h>
#include <string.h> #include <stdio.h> #include <inttypes.h>
+#include <odp/visibility_begin.h> + +/* Fill in buffer header field offsets for inline functions */ +const _odp_buffer_inline_offset_t ODP_ALIGNED_CACHE +_odp_buffer_inline_offset = { + .event_type = offsetof(odp_buffer_hdr_t, event_type) +}; + +#include <odp/visibility_end.h> + odp_buffer_t odp_buffer_from_event(odp_event_t ev) { return (odp_buffer_t)ev; diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index f8ed478c..fa20af5f 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -17,10 +17,8 @@ #include <odp_debug_internal.h> #include <odp_packet_internal.h>
-odp_event_type_t odp_event_type(odp_event_t event) -{ - return _odp_buffer_event_type(odp_buffer_from_event(event)); -} +/* Inlined API functions */ +#include <odp/api/plat/event_inlines.h>
odp_event_subtype_t odp_event_subtype(odp_event_t event) { diff --git a/platform/linux-generic/odp_event_api.c b/platform/linux-generic/odp_event_api.c new file mode 100644 index 00000000..ea9e6110 --- /dev/null +++ b/platform/linux-generic/odp_event_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/event.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/event_inlines.h>
commit f49289a7f621ffe5c981caa8531623d9e0a4abd9 Author: Petri Savolainen petri.savolainen@linaro.org Date: Fri May 4 14:58:47 2018 +0300
linux-gen: buffer: remove buffer_inlines header file
Moved odp_buffer_inlines.h content to odp_buffer_internal.h and removed the file. Other xxx_inlines.h headers do not contain internal functions but only code for API function inlining.
Signed-off-by: Petri Savolainen petri.savolainen@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7d1d5554..de2ada50 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -86,7 +86,6 @@ noinst_HEADERS = \ include/odp_atomic_internal.h \ include/odp_bitmap_internal.h \ include/odp_bitset.h \ - include/odp_buffer_inlines.h \ include/odp_buffer_internal.h \ include/odp_classification_datamodel.h \ include/odp_classification_inlines.h \ diff --git a/platform/linux-generic/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h deleted file mode 100644 index 9e3b6ef7..00000000 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Inline functions for ODP buffer mgmt routines - implementation internal - */ - -#ifndef ODP_BUFFER_INLINES_H_ -#define ODP_BUFFER_INLINES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp_buffer_internal.h> - -odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); -void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); -int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); - -static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr) -{ - return (odp_buffer_t)hdr; -} - -static inline odp_event_t event_from_buf_hdr(odp_buffer_hdr_t *hdr) -{ - return (odp_event_t)hdr; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index e50dd604..48e74dd2 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -111,6 +111,20 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE");
+odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); +void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); +int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); + +static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr) +{ + return (odp_buffer_t)hdr; +} + +static inline odp_event_t event_from_buf_hdr(odp_buffer_hdr_t *hdr) +{ + return (odp_event_t)hdr; +} + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 04112662..933dd4be 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -21,7 +21,6 @@ extern "C" { #include <odp/api/debug.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_buffer_inlines.h> #include <odp/api/packet.h> #include <odp/api/plat/packet_inline_types.h> #include <odp/api/packet_io.h> diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index fcab5e81..8c9d921c 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -9,7 +9,6 @@ #include <odp/api/buffer.h> #include <odp_pool_internal.h> #include <odp_buffer_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h>
#include <string.h> diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 986b7317..f8ed478c 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -14,7 +14,6 @@ #include <odp/api/pool.h> #include <odp_buffer_internal.h> #include <odp_ipsec_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h>
diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 93f838a5..7fcebeb8 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -10,7 +10,6 @@ #include <odp/api/shared_memory.h>
#include <odp_buffer_internal.h> -#include <odp_buffer_inlines.h> #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> #include <odp_pool_internal.h> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 955e14f9..0df8aa3f 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -14,7 +14,6 @@
#include <odp_pool_internal.h> #include <odp_internal.h> -#include <odp_buffer_inlines.h> #include <odp_packet_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 89a0cd90..764f39e8 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -14,7 +14,6 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_buffer_inlines.h> #include <odp_internal.h> #include <odp/api/shared_memory.h> #include <odp/api/schedule.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 2a5e01d4..05246410 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -20,7 +20,6 @@ #include <odp_config_internal.h> #include <odp_debug_internal.h>
-#include <odp_buffer_inlines.h> #include <odp_packet_io_internal.h> #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index b50462a5..540dc6a4 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -26,7 +26,6 @@ #include <odp_ring_internal.h> #include <odp_timer_internal.h> #include <odp_queue_internal.h> -#include <odp_buffer_inlines.h> #include <odp_libconfig_internal.h>
/* Number of priority levels */ diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 023ab1ed..58d5190c 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -25,7 +25,6 @@ #include <odp_ishmpool_internal.h>
#include <odp_align_internal.h> -#include <odp_buffer_inlines.h> #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 37d0304c..3fc8f380 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -38,7 +38,6 @@ #include <odp/api/atomic.h> #include <odp_atomic_internal.h> #include <odp/api/buffer.h> -#include <odp_buffer_inlines.h> #include <odp/api/cpu.h> #include <odp/api/pool.h> #include <odp_pool_internal.h>
commit cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 Author: Petri Savolainen petri.savolainen@linaro.org Date: Mon May 7 11:10:32 2018 +0300
test: ipsec: fix link order
In LDADD a library using another library, must become before that library. An application library uses ODP, so it must become before ODP library.
Signed-off-by: Petri Savolainen petri.savolainen@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index 32882699..a9caba17 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -21,4 +21,4 @@ ipsec_async_SOURCES = ipsec_async.c ipsec_inline_in_SOURCES = ipsec_inline_in.c ipsec_inline_out_SOURCES = ipsec_inline_out.c
-LDADD += libtestipsec.la +PRELDADD += libtestipsec.la
commit 332877d51e773a584d272a03f08446d18cbe1634 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Tue May 8 18:01:15 2018 +0300
configure.ac: update version to v1.19.0.1
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/configure.ac b/configure.ac index d3f02665..11a89b58 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.5]) m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [19]) m4_define([odpapi_minor_version], [0]) -m4_define([odpapi_point_version], [0]) +m4_define([odpapi_point_version], [1]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp@lists.linaro.org])
-----------------------------------------------------------------------
Summary of changes: configure.ac | 2 +- platform/linux-generic/Makefile.am | 4 ++- .../linux-generic/include-abi/odp/api/abi/event.h | 3 ++ .../include/odp/api/plat/buffer_inline_types.h | 35 +++++++++++++++++++ .../include/odp/api/plat/event_inlines.h | 37 ++++++++++++++++++++ .../linux-generic/include/odp_buffer_inlines.h | 40 ---------------------- .../linux-generic/include/odp_buffer_internal.h | 14 ++++++++ .../linux-generic/include/odp_packet_internal.h | 1 - platform/linux-generic/odp_buffer.c | 12 ++++++- platform/linux-generic/odp_crypto.c | 3 ++ platform/linux-generic/odp_event.c | 7 ++-- platform/linux-generic/odp_event_api.c | 13 +++++++ platform/linux-generic/odp_ipsec_events.c | 4 ++- platform/linux-generic/odp_packet.c | 3 ++ platform/linux-generic/odp_pool.c | 1 - platform/linux-generic/odp_queue_basic.c | 1 - platform/linux-generic/odp_queue_scalable.c | 1 - platform/linux-generic/odp_schedule_basic.c | 1 - platform/linux-generic/odp_schedule_scalable.c | 1 - platform/linux-generic/odp_timer.c | 4 ++- test/validation/api/ipsec/Makefile.am | 2 +- 21 files changed, 132 insertions(+), 57 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/buffer_inline_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/event_inlines.h delete mode 100644 platform/linux-generic/include/odp_buffer_inlines.h create mode 100644 platform/linux-generic/odp_event_api.c
hooks/post-receive
-
git＠git-us.linaro.org