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, 2.0 has been updated via 00c7441fae53949dd87855d48102f932f8f64537 (commit) via ff5ecde9f73158f00df5df7da6f6ceb9ad4fe0f2 (commit) via cb4d057c0f35fbd9855c4b4a08481aab69be3e07 (commit) via f47262a495ce304a924a3c5eb00eb349faeb3666 (commit) via 9126cea4346f5b715e335a54b9d72ec89533187a (commit) via 8c1cb083f8bacd0c1fe56a759591ff7e0633be37 (commit) via 0e8647378bfbe730101e5f089e134356dea00cda (commit) from 7074b71b266de9c4eb5bf03513186a72ea27b2bc (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 00c7441fae53949dd87855d48102f932f8f64537 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Fri Nov 24 10:25:19 2017 +0200
doc: application-api-guide: exclude subsystem files
Exclude subsystem files form application API guide document. Documentation will be added when API will be stable.
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index 2709f6fd..05415849 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -5,6 +5,7 @@ PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/include +EXCLUDE = $(SRCDIR)/include/subsystem EXCLUDE_PATTERNS = drv* odp_drv.h EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) WARNINGS = NO
commit ff5ecde9f73158f00df5df7da6f6ceb9ad4fe0f2 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Thu Nov 23 16:51:21 2017 +0200
linux-gen: modular-framework: move schedule subsystem header to a public folder
Move schedule subsystem header to a public folder.
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 4436c61b..b7c31c1f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -72,7 +72,8 @@ subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ subsystem/spec/buffer_subsystem.h \ subsystem/spec/pool_subsystem.h \ - subsystem/spec/queue_subsystem.h + subsystem/spec/queue_subsystem.h \ + subsystem/spec/schedule_subsystem.h
odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp_schedule_subsystem.h b/include/subsystem/spec/schedule_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_schedule_subsystem.h rename to include/subsystem/spec/schedule_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 7742aea3..6dde37b9 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -214,7 +214,6 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ ${top_srcdir}/platform/linux-generic/include/odp_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \ - ${top_srcdir}/platform/linux-generic/include/odp_schedule_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/odp_sorted_list_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_shm_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_time_internal.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 47de83f9..8813aea9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -199,7 +199,6 @@ noinst_HEADERS = \ include/odp_schedule_scalable.h \ include/odp_schedule_scalable_config.h \ include/odp_schedule_scalable_ordered.h \ - include/odp_schedule_subsystem.h \ include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ include/odp_time_internal.h \ diff --git a/platform/linux-generic/schedule/generic.c b/platform/linux-generic/schedule/generic.c index 73fef40c..e2276285 100644 --- a/platform/linux-generic/schedule/generic.c +++ b/platform/linux-generic/schedule/generic.c @@ -25,7 +25,7 @@ #include <odp/api/packet_io.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h>
/* Should remove this dependency */ diff --git a/platform/linux-generic/schedule/iquery.c b/platform/linux-generic/schedule/iquery.c index 5de22983..76d96ff5 100644 --- a/platform/linux-generic/schedule/iquery.c +++ b/platform/linux-generic/schedule/iquery.c @@ -25,7 +25,7 @@ #include <odp/api/packet_io.h> #include <odp_config_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h>
/* Should remove this dependency */ diff --git a/platform/linux-generic/schedule/scalable.c b/platform/linux-generic/schedule/scalable.c index d8f53820..de9c6528 100644 --- a/platform/linux-generic/schedule/scalable.c +++ b/platform/linux-generic/schedule/scalable.c @@ -29,7 +29,7 @@ #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_bitset.h> #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/schedule/sp.c b/platform/linux-generic/schedule/sp.c index ea7b8342..06e2a144 100644 --- a/platform/linux-generic/schedule/sp.c +++ b/platform/linux-generic/schedule/sp.c @@ -18,7 +18,7 @@ #include <odp_config_internal.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h> #include <odp_queue_internal.h>
diff --git a/platform/linux-generic/schedule/subsystem.c b/platform/linux-generic/schedule/subsystem.c index ba9a095f..516cdf3b 100644 --- a/platform/linux-generic/schedule/subsystem.c +++ b/platform/linux-generic/schedule/subsystem.c @@ -15,7 +15,7 @@ #include <odp_debug_internal.h> #include <odp_internal.h> #include <odp_module.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h>
ODP_SUBSYSTEM_DEFINE(schedule, "schedule public APIs", SCHEDULE_SUBSYSTEM_VERSION);
commit cb4d057c0f35fbd9855c4b4a08481aab69be3e07 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Thu Nov 23 15:54:40 2017 +0200
linux-gen: modular-framework: move queue subsystem header to a public folder
Move queue subsystem header to a public folder.
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 6bb497dc..4436c61b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -71,7 +71,8 @@ odpdrvspecinclude_HEADERS = \ subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ subsystem/spec/buffer_subsystem.h \ - subsystem/spec/pool_subsystem.h + subsystem/spec/pool_subsystem.h \ + subsystem/spec/queue_subsystem.h
odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp_queue_subsystem.h b/include/subsystem/spec/queue_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_queue_subsystem.h rename to include/subsystem/spec/queue_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index f188c377..7742aea3 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -212,7 +212,6 @@ noinst_HEADERS = \ ${srcdir}/include/odp_posix_extensions.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ - ${top_srcdir}/platform/linux-generic/include/odp_queue_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/odp_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_subsystem.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 745b86ba..47de83f9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -189,7 +189,6 @@ noinst_HEADERS = \ include/odp_pktio_ops_tap.h \ include/odp_pktio_ops_subsystem.h \ include/odp_pkt_queue_internal.h \ - include/odp_queue_subsystem.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ include/odp_queue_internal.h \ diff --git a/platform/linux-generic/queue/generic.c b/platform/linux-generic/queue/generic.c index ab2b9704..37c02380 100644 --- a/platform/linux-generic/queue/generic.c +++ b/platform/linux-generic/queue/generic.c @@ -9,7 +9,7 @@ #include <odp/api/queue.h> #include <odp_queue_internal.h> #include <odp_queue_if.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp/api/std_types.h> #include <odp/api/align.h> #include <odp/api/buffer.h> diff --git a/platform/linux-generic/queue/scalable.c b/platform/linux-generic/queue/scalable.c index 00cd8da6..f4f5efb8 100644 --- a/platform/linux-generic/queue/scalable.c +++ b/platform/linux-generic/queue/scalable.c @@ -23,7 +23,7 @@ #include <odp_packet_io_internal.h> #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp_schedule_if.h> #include <_ishm_internal.h> #include <_ishmpool_internal.h> diff --git a/platform/linux-generic/queue/subsystem.c b/platform/linux-generic/queue/subsystem.c index 5a88b2df..b53c440f 100644 --- a/platform/linux-generic/queue/subsystem.c +++ b/platform/linux-generic/queue/subsystem.c @@ -11,7 +11,7 @@ #include <odp/api/queue.h> #include <odp_internal.h> #include <odp_debug_internal.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp_module.h>
ODP_SUBSYSTEM_DEFINE(queue, "queue public APIs", QUEUE_SUBSYSTEM_VERSION);
commit f47262a495ce304a924a3c5eb00eb349faeb3666 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Thu Nov 23 15:37:33 2017 +0200
linux-gen: modular-framework: move pool subsystem header to a public folder
Move pool subsystem header to a public folder.
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 0edaf31a..6bb497dc 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -70,7 +70,8 @@ odpdrvspecinclude_HEADERS = \
subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ - subsystem/spec/buffer_subsystem.h + subsystem/spec/buffer_subsystem.h \ + subsystem/spec/pool_subsystem.h
odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp_pool_subsystem.h b/include/subsystem/spec/pool_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_pool_subsystem.h rename to include/subsystem/spec/pool_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 67a46cb8..f188c377 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -209,7 +209,6 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_packet_io_pool_access.h \ ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ ${srcdir}/include/odp_pool_internal.h \ - ${top_srcdir}/platform/linux-generic/include/odp_pool_subsystem.h \ ${srcdir}/include/odp_posix_extensions.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ diff --git a/platform/linux-dpdk/include/odp_pool_internal.h b/platform/linux-dpdk/include/odp_pool_internal.h index 2b3fc18c..7d8fba14 100644 --- a/platform/linux-dpdk/include/odp_pool_internal.h +++ b/platform/linux-dpdk/include/odp_pool_internal.h @@ -20,7 +20,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/pool.h> -#include <odp_pool_subsystem.h> +#include <subsystem/spec/pool_subsystem.h> #include <odp_buffer_internal.h> #include <odp/api/packet_io.h> #include <odp/api/align.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ffc6daa9..745b86ba 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -191,7 +191,6 @@ noinst_HEADERS = \ include/odp_pkt_queue_internal.h \ include/odp_queue_subsystem.h \ include/odp_pool_internal.h \ - include/odp_pool_subsystem.h \ include/odp_posix_extensions.h \ include/odp_queue_internal.h \ include/odp_queue_scalable_internal.h \ diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 0ec12148..60687b3d 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -21,7 +21,7 @@ extern "C" { #include <odp/api/shared_memory.h> #include <odp/api/ticketlock.h>
-#include <odp_pool_subsystem.h> +#include <subsystem/spec/pool_subsystem.h> #include <odp_buffer_internal.h> #include <odp_config_internal.h> #include <odp_ring_internal.h> diff --git a/platform/linux-generic/pool/subsystem.c b/platform/linux-generic/pool/subsystem.c index c5f64491..c845ce16 100644 --- a/platform/linux-generic/pool/subsystem.c +++ b/platform/linux-generic/pool/subsystem.c @@ -7,7 +7,7 @@ */ #include <odp/api/pool.h> #include <odp_internal.h> -#include <odp_pool_subsystem.h> +#include <subsystem/spec/pool_subsystem.h> #include <odp_debug_internal.h> #include <odp_module.h>
commit 9126cea4346f5b715e335a54b9d72ec89533187a Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Thu Nov 23 15:16:45 2017 +0200
linux-gen: modular-framework: move buffer subsystem header to a public folder
Move buffer subsystem header to a public folder.
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 37691672..0edaf31a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -68,6 +68,10 @@ odpdrvspecinclude_HEADERS = \ odp/drv/spec/std_types.h \ odp/drv/spec/sync.h
+subsystemspecincludedir= $(includedir)/subsystem/spec +subsystemspecinclude_HEADERS = \ + subsystem/spec/buffer_subsystem.h + odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ odp/arch/default/api/abi/buffer.h \ diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/include/subsystem/spec/buffer_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_buffer_subsystem.h rename to include/subsystem/spec/buffer_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index ee6c36e2..67a46cb8 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -175,7 +175,6 @@ odpdrvplatinclude_HEADERS = \
noinst_HEADERS = \ - ${top_srcdir}/platform/linux-generic/include/odp_buffer_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/_fdserver_internal.h \ ${top_srcdir}/platform/linux-generic/include/_ishm_internal.h \ ${top_srcdir}/platform/linux-generic/include/_ishmphy_internal.h \ diff --git a/platform/linux-dpdk/buffer/dpdk.c b/platform/linux-dpdk/buffer/dpdk.c index 704468ee..22e1123b 100644 --- a/platform/linux-dpdk/buffer/dpdk.c +++ b/platform/linux-dpdk/buffer/dpdk.c @@ -9,7 +9,7 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_buffer_inlines.h> -#include <odp_buffer_subsystem.h> +#include <subsystem/spec/buffer_subsystem.h> #include <odp_debug_internal.h> #include <odp_pool_internal.h>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a4aaa769..ffc6daa9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -160,7 +160,6 @@ noinst_HEADERS = \ include/odp_bitmap_internal.h \ include/odp_bitset.h \ include/odp_buffer_internal.h \ - include/odp_buffer_subsystem.h \ include/odp_classification_datamodel.h \ include/odp_classification_inlines.h \ include/odp_classification_internal.h \ diff --git a/platform/linux-generic/buffer/generic.c b/platform/linux-generic/buffer/generic.c index 3281119b..cf99407c 100644 --- a/platform/linux-generic/buffer/generic.c +++ b/platform/linux-generic/buffer/generic.c @@ -11,7 +11,7 @@ #include <odp_buffer_internal.h> #include <odp_buffer_inlines.h> #include <odp_debug_internal.h> -#include <odp_buffer_subsystem.h> +#include <subsystem/spec/buffer_subsystem.h>
#include <string.h> #include <stdio.h> diff --git a/platform/linux-generic/buffer/subsystem.c b/platform/linux-generic/buffer/subsystem.c index d47525cf..69ec9180 100644 --- a/platform/linux-generic/buffer/subsystem.c +++ b/platform/linux-generic/buffer/subsystem.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include <odp/api/buffer.h> -#include <odp_buffer_subsystem.h> +#include <subsystem/spec/buffer_subsystem.h> #include <odp_debug_internal.h> #include <odp_module.h>
commit 8c1cb083f8bacd0c1fe56a759591ff7e0633be37 Author: Kevin Wang kevin.wang@arm.com Date: Wed Nov 22 15:28:20 2017 +0800
linux-gen: packet: get pool_hdl from odp_buffer_hdr_t
In odp_packet_rem_data() and odp_packet_add_data(), pool_hdl is able to be gotten from odp_packet_hdr_t, don't need to get from pool_t indirectly.
Signed-off-by: Kevin Wang kevin.wang@arm.com Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Reviewed-by: Ola Liljedahl ola.Liljedahl@arm.com Reviewed-by: Brian Brooks brian.brooks@arm.com Reviewed-by: Yi He yi.he@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index c65d7011..853d3baa 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1345,13 +1345,12 @@ int odp_packet_add_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) odp_packet_t pkt = *pkt_ptr; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); uint32_t pktlen = pkt_hdr->frame_len; - pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; odp_packet_t newpkt;
if (offset > pktlen) return -1;
- newpkt = odp_packet_alloc(pool->pool_hdl, pktlen + len); + newpkt = odp_packet_alloc(pkt_hdr->buf_hdr.pool_hdl, pktlen + len);
if (newpkt == ODP_PACKET_INVALID) return -1; @@ -1375,13 +1374,12 @@ int odp_packet_rem_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) odp_packet_t pkt = *pkt_ptr; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); uint32_t pktlen = pkt_hdr->frame_len; - pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; odp_packet_t newpkt;
if (offset > pktlen || offset + len > pktlen) return -1;
- newpkt = odp_packet_alloc(pool->pool_hdl, pktlen - len); + newpkt = odp_packet_alloc(pkt_hdr->buf_hdr.pool_hdl, pktlen - len);
if (newpkt == ODP_PACKET_INVALID) return -1;
commit 0e8647378bfbe730101e5f089e134356dea00cda Author: Kevin Wang kevin.wang@arm.com Date: Wed Nov 22 15:21:28 2017 +0800
linux-gen: pool: rearrange pool_t to separate control and data plane
Separate the pool's control plane and data plane data structures. This avoids sharing control plane related data and dataplane related data on the same cache line.
Signed-off-by: Kevin Wang kevin.wang@arm.com Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Reviewed-by: Ola Liljedahl ola.Liljedahl@arm.com Reviewed-by: Brian Brooks brian.brooks@arm.com Reviewed-by: Yi He yi.he@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 5004e283..0ec12148 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -54,34 +54,33 @@ typedef struct pool_t { char name[ODP_POOL_NAME_LEN]; odp_pool_param_t params; odp_pool_t pool_hdl; - uint32_t pool_idx; - uint32_t ring_mask; odp_shm_t shm; odp_shm_t uarea_shm; - int reserved; uint32_t num; uint32_t align; + uint32_t shm_size; + uint32_t uarea_shm_size; + odp_shm_t ring_shm; + /* Used by DPDK zero-copy pktio */ + pool_destroy_cb_fn ext_destroy; + void *ext_desc; + + /* Below is for data plane */ + uint8_t *base_addr ODP_ALIGNED_CACHE; + uint8_t *uarea_base_addr; + pool_ring_t *ring; uint32_t headroom; uint32_t tailroom; uint32_t seg_len; uint32_t max_len; uint32_t uarea_size; uint32_t block_size; - uint32_t shm_size; - uint32_t uarea_shm_size; - uint8_t *base_addr; - uint8_t *uarea_base_addr; - - /* Used by DPDK zero-copy pktio */ + uint32_t pool_idx; + uint32_t ring_mask; + uint8_t reserved; uint8_t mem_from_huge_pages; - pool_destroy_cb_fn ext_destroy; - void *ext_desc;
pool_cache_t local_cache[ODP_THREAD_COUNT_MAX]; - - odp_shm_t ring_shm; - pool_ring_t *ring; - } pool_t;
typedef struct pool_table_t {
-----------------------------------------------------------------------
Summary of changes: doc/application-api-guide/Doxyfile | 1 + include/Makefile.am | 7 +++++ .../subsystem/spec/buffer_subsystem.h | 0 .../subsystem/spec/pool_subsystem.h | 0 .../subsystem/spec/queue_subsystem.h | 0 .../subsystem/spec/schedule_subsystem.h | 0 platform/linux-dpdk/Makefile.am | 4 --- platform/linux-dpdk/buffer/dpdk.c | 2 +- platform/linux-dpdk/include/odp_pool_internal.h | 2 +- platform/linux-generic/Makefile.am | 4 --- platform/linux-generic/buffer/generic.c | 2 +- platform/linux-generic/buffer/subsystem.c | 2 +- platform/linux-generic/include/odp_pool_internal.h | 31 +++++++++++----------- platform/linux-generic/odp_packet.c | 6 ++--- platform/linux-generic/pool/subsystem.c | 2 +- platform/linux-generic/queue/generic.c | 2 +- platform/linux-generic/queue/scalable.c | 2 +- platform/linux-generic/queue/subsystem.c | 2 +- platform/linux-generic/schedule/generic.c | 2 +- platform/linux-generic/schedule/iquery.c | 2 +- platform/linux-generic/schedule/scalable.c | 2 +- platform/linux-generic/schedule/sp.c | 2 +- platform/linux-generic/schedule/subsystem.c | 2 +- 23 files changed, 38 insertions(+), 41 deletions(-) rename platform/linux-generic/include/odp_buffer_subsystem.h => include/subsystem/spec/buffer_subsystem.h (100%) rename platform/linux-generic/include/odp_pool_subsystem.h => include/subsystem/spec/pool_subsystem.h (100%) rename platform/linux-generic/include/odp_queue_subsystem.h => include/subsystem/spec/queue_subsystem.h (100%) rename platform/linux-generic/include/odp_schedule_subsystem.h => include/subsystem/spec/schedule_subsystem.h (100%)
hooks/post-receive