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 ba70a2a8ef150ac62f2850e0b47d4708f3730a79 (commit) via ff7600a119f02bb1ef2a57e5611e392968666420 (commit) via a09bc35bf1159478195484e11eccb52cb33ae554 (commit) via bd9f58474822c5c58f1b5ad52edb169264900772 (commit) via 7e2327fd48c94b6078aaa1c83701bcd123f184aa (commit) via 5ebc1243efae6b4a6c01ae9cbbe6564d2a07922c (commit) via 4960e04aff0c21b3213eba480cf7ca38578e0839 (commit) via 61902866c68f794a7f92cdf97a475d09d263b621 (commit) via 484f37b71aac5f5a56cd12c72c348d90d1095e31 (commit) via bcf8b3b1b5d509ba01c0daff9f2b2056026b643a (commit) via 17454218029d3f22c15755d91b9e97c46fb16d61 (commit) from 926505016132ba543251eb109d5c9c93f8520314 (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 ba70a2a8ef150ac62f2850e0b47d4708f3730a79 Merge: 9265050 ff7600a Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Wed Mar 1 16:18:55 2017 +0300

Merge branch 'master' into api-next

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --cc platform/linux-generic/Makefile.am index deab284,62f372f..b21df44 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -81,7 -78,10 +81,11 @@@ odpapiplatinclude_HEADERS = $(srcdir)/include/odp/api/plat/crypto_types.h \ $(srcdir)/include/odp/api/plat/event_types.h \ $(srcdir)/include/odp/api/plat/init_types.h \ + $(srcdir)/include/odp/api/plat/ipsec_types.h \ + $(srcdir)/include/odp/api/plat/packet_flag_inlines.h \ + $(srcdir)/include/odp/api/plat/packet_flag_inlines_api.h \ + $(srcdir)/include/odp/api/plat/packet_inlines.h \ + $(srcdir)/include/odp/api/plat/packet_inlines_api.h \ $(srcdir)/include/odp/api/plat/packet_types.h \ $(srcdir)/include/odp/api/plat/packet_io_types.h \ $(srcdir)/include/odp/api/plat/pool_types.h \ diff --cc platform/linux-generic/odp_packet.c index 9eccb57,3019418..60eef3a --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@@ -2222,76 -2144,7 +2144,81 @@@ uint64_t odp_packet_seg_to_u64(odp_pack return _odp_pri(hdl); }

+odp_packet_t odp_packet_ref_static(odp_packet_t pkt) +{ + return odp_packet_copy(pkt, odp_packet_pool(pkt)); +} + +odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset) +{ + odp_packet_t new; + int ret; + + new = odp_packet_copy(pkt, odp_packet_pool(pkt)); + + if (new == ODP_PACKET_INVALID) { + ODP_ERR("copy failed\n"); + return ODP_PACKET_INVALID; + } + + ret = odp_packet_trunc_head(&new, offset, NULL, NULL); + + if (ret < 0) { + ODP_ERR("trunk_head failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; + } + + return new; +} + +odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, + odp_packet_t hdr) +{ + odp_packet_t new; + int ret; + + new = odp_packet_copy(pkt, odp_packet_pool(pkt)); + + if (new == ODP_PACKET_INVALID) { + ODP_ERR("copy failed\n"); + return ODP_PACKET_INVALID; + } + + if (offset) { + ret = odp_packet_trunc_head(&new, offset, NULL, NULL); + + if (ret < 0) { + ODP_ERR("trunk_head failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; + } + } + + ret = odp_packet_concat(&hdr, new); + + if (ret < 0) { + ODP_ERR("concat failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; + } + + return hdr; +} + +int odp_packet_has_ref(odp_packet_t pkt) +{ + (void)pkt; + + return 0; +} + +uint32_t odp_packet_unshared_len(odp_packet_t pkt) +{ + return odp_packet_len(pkt); +} ++ + /* Include non-inlined versions of API functions */ + #if ODP_ABI_COMPAT == 1 + #include <odp/api/plat/packet_inlines_api.h> + #endif

-----------------------------------------------------------------------

Summary of changes: platform/linux-generic/Makefile.am | 5 + platform/linux-generic/include/odp/api/packet.h | 11 +- .../linux-generic/include/odp/api/packet_flags.h | 11 +- .../include/odp/api/plat/atomic_inlines.h | 114 +++++---- .../include/odp/api/plat/byteorder_inlines.h | 24 +- .../include/odp/api/plat/packet_flag_inlines.h | 90 +++++++ .../include/odp/api/plat/packet_flag_inlines_api.h | 41 +++ .../include/odp/api/plat/packet_inlines.h | 173 +++++++++++++ .../include/odp/api/plat/packet_inlines_api.h | 113 +++++++++ .../include/odp/api/plat/packet_types.h | 87 ++++++- .../include/odp/api/plat/static_inline.h.in | 8 +- .../include/odp/api/plat/std_clib_inlines.h | 6 +- .../include/odp/api/plat/sync_inlines.h | 6 +- .../include/odp/api/plat/ticketlock_inlines.h | 19 +- .../include/odp/api/plat/ticketlock_inlines_api.h | 36 +++ .../linux-generic/include/odp/api/ticketlock.h | 4 + .../linux-generic/include/odp_crypto_internal.h | 1 + .../linux-generic/include/odp_packet_internal.h | 62 +---- platform/linux-generic/odp_crypto.c | 12 +- platform/linux-generic/odp_packet.c | 275 ++++++++------------- platform/linux-generic/odp_packet_flags.c | 41 +-- platform/linux-generic/odp_ticketlock.c | 24 +- platform/linux-generic/odp_traffic_mngr.c | 2 +- platform/linux-generic/pktio/dpdk.c | 5 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/netmap.c | 5 +- test/common_plat/performance/Makefile.am | 4 + 27 files changed, 798 insertions(+), 383 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h create mode 100644 platform/linux-generic/include/odp/api/plat/packet_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/packet_inlines_api.h create mode 100644 platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h

hooks/post-receive