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 1236f1ad2bba56b5e49ff62df247e52143b48985 (commit) via 63cf12a26e81ee83aa51595165646532fbb84d52 (commit) via e8488637bcfe690d07be8c83e16ed29a28b4491f (commit) via 9e8c3d68cf14498219545f8fca553071830bd903 (commit) via ac4c8da5127de0507a5873defa5cddf8d0490048 (commit) via 81ebc5ec2a0e61ee2d0ebbaa2c02dab35b06b824 (commit) from d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f (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 1236f1ad2bba56b5e49ff62df247e52143b48985 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Mon Oct 23 16:24:09 2017 +0300
linux-gen: pktio: remove duplicate pktio_ops subsystem implementation
Remove duplicate pktio_ops subsystem implementation
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index c99cfaa1..e2a0249d 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -251,7 +251,7 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/odp_name_table.c \ odp_packet.c \ pktio/dpdk.c \ - pktio/subsystem.c \ + ../linux-generic/pktio/subsystem.c \ odp_packet_flags.c \ ../linux-generic/odp_packet_io.c \ ../linux-generic/pktio/loopback.c \ diff --git a/platform/linux-dpdk/pktio/subsystem.c b/platform/linux-dpdk/pktio/subsystem.c deleted file mode 100644 index ab99db0d..00000000 --- a/platform/linux-dpdk/pktio/subsystem.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2017, ARM Limited. All rights reserved. - * - * Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <config.h> - -#include <odp_debug_internal.h> -#include <odp_packet_io_internal.h> - -#define SUBSYSTEM_VERSION 0x00010000UL -ODP_SUBSYSTEM_DEFINE(pktio_ops, "packet IO operations", SUBSYSTEM_VERSION); - -/* Instantiate init and term functions */ -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, init_global, ODP_ERR) -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, init_local, ODP_ERR) -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) - -/* Temporary variable to enable link modules, - * will remove in Makefile scheme changes. - */ -#ifdef ODP_PKTIO_DPDK -extern int enable_link_dpdk_pktio_ops; -#endif -extern int enable_link_loopback_pktio_ops; - -ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) -{ - odp_subsystem_constructor(pktio_ops); - - /* Further initialization per subsystem */ -#ifdef ODP_PKTIO_DPDK - enable_link_dpdk_pktio_ops = 1; -#endif - enable_link_loopback_pktio_ops = 1; -} diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index d26c152c..a3b36c14 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
+#include <config.h> + #include <odp_debug_internal.h> #include <odp_packet_io_internal.h>
commit 63cf12a26e81ee83aa51595165646532fbb84d52 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Mon Oct 23 15:55:28 2017 +0300
linux-gen: pktio: socket: build SOCKET_MMAP pktio based on configuration option
Build SOCKET_MMAP pktio based on configuration option
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7a2a11e2..c1d3509d 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -100,3 +100,6 @@ AC_DEFINE([ODP_PKTIO_TAP], [1],
AC_DEFINE([ODP_PKTIO_SOCKET], [1], [Define to 1 to enable SOCKET packet I/O support]) + +AC_DEFINE([ODP_PKTIO_SOCKET_MMAP], [1], + [Define to 1 to enable SOCKET_MMAP packet I/O support]) diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 3b62979d..67d2b920 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -7,6 +7,8 @@
#include "config.h"
+#ifdef ODP_PKTIO_SOCKET_MMAP + #include <odp_posix_extensions.h>
#include <odp_packet_io_internal.h> @@ -777,3 +779,5 @@ ODP_MODULE_CONSTRUCTOR(socket_mmap_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_socket_mmap_pktio_ops = 0; + +#endif /* ODP_PKTIO_SOCKET_MMAP */ diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index b65ea1db..d26c152c 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -36,7 +36,9 @@ extern int enable_link_pcap_pktio_ops; #ifdef ODP_PKTIO_SOCKET extern int enable_link_socket_pktio_ops; #endif +#ifdef ODP_PKTIO_SOCKET_MMAP extern int enable_link_socket_mmap_pktio_ops; +#endif #ifdef ODP_PKTIO_TAP extern int enable_link_tap_pktio_ops; #endif @@ -63,7 +65,9 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #ifdef ODP_PKTIO_SOCKET enable_link_socket_pktio_ops = 1; #endif +#ifdef ODP_PKTIO_SOCKET_MMAP enable_link_socket_mmap_pktio_ops = 1; +#endif #ifdef ODP_PKTIO_TAP enable_link_tap_pktio_ops = 1; #endif
commit e8488637bcfe690d07be8c83e16ed29a28b4491f Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Mon Oct 23 15:34:39 2017 +0300
linux-gen: pktio: socket: build SOCKET pktio based on configuration option
Build SOCKET pktio based on configuration option
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 2cc16a04..7a2a11e2 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -97,3 +97,6 @@ AC_DEFINE([ODP_PKTIO_IPC], [1],
AC_DEFINE([ODP_PKTIO_TAP], [1], [Define to 1 to enable TAP packet I/O support]) + +AC_DEFINE([ODP_PKTIO_SOCKET], [1], + [Define to 1 to enable SOCKET packet I/O support]) diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 238cd67f..7481f4f7 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -7,6 +7,8 @@
#include "config.h"
+#ifdef ODP_PKTIO_SOCKET + #include <odp_posix_extensions.h>
#include <sys/socket.h> @@ -570,3 +572,5 @@ ODP_MODULE_CONSTRUCTOR(socket_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_socket_pktio_ops = 0; + +#endif /* ODP_PKTIO_SOCKET */ diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index 76b8a928..b65ea1db 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -33,7 +33,9 @@ extern int enable_link_netmap_pktio_ops; #ifdef HAVE_PCAP extern int enable_link_pcap_pktio_ops; #endif +#ifdef ODP_PKTIO_SOCKET extern int enable_link_socket_pktio_ops; +#endif extern int enable_link_socket_mmap_pktio_ops; #ifdef ODP_PKTIO_TAP extern int enable_link_tap_pktio_ops; @@ -58,7 +60,9 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #ifdef HAVE_PCAP enable_link_pcap_pktio_ops = 1; #endif +#ifdef ODP_PKTIO_SOCKET enable_link_socket_pktio_ops = 1; +#endif enable_link_socket_mmap_pktio_ops = 1; #ifdef ODP_PKTIO_TAP enable_link_tap_pktio_ops = 1;
commit 9e8c3d68cf14498219545f8fca553071830bd903 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Mon Oct 23 14:59:56 2017 +0300
linux-gen: pktio: tap: build TAP pktio based on configuration option
Build TAP pktio based on configuration option
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 9c35a996..2cc16a04 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -94,3 +94,6 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile ########################################################################## AC_DEFINE([ODP_PKTIO_IPC], [1], [Define to 1 to enable IPC packet I/O support]) + +AC_DEFINE([ODP_PKTIO_TAP], [1], + [Define to 1 to enable TAP packet I/O support]) diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index 2ad85624..76b8a928 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -35,7 +35,9 @@ extern int enable_link_pcap_pktio_ops; #endif extern int enable_link_socket_pktio_ops; extern int enable_link_socket_mmap_pktio_ops; +#ifdef ODP_PKTIO_TAP extern int enable_link_tap_pktio_ops; +#endif
ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) { @@ -58,5 +60,7 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #endif enable_link_socket_pktio_ops = 1; enable_link_socket_mmap_pktio_ops = 1; +#ifdef ODP_PKTIO_TAP enable_link_tap_pktio_ops = 1; +#endif } diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index e256eec3..fffc4c82 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -6,6 +6,8 @@
#include "config.h"
+#ifdef ODP_PKTIO_TAP + /** * @file * @@ -423,3 +425,5 @@ ODP_MODULE_CONSTRUCTOR(tap_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_tap_pktio_ops = 0; + +#endif /* ODP_PKTIO_TAP */
commit ac4c8da5127de0507a5873defa5cddf8d0490048 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Mon Oct 23 14:43:08 2017 +0300
linux-gen: pktio: ipc: build ipc pktio based on configuration option
Build ipc pktio based on configuration option
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 85d35f25..9c35a996 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -88,3 +88,9 @@ m4_include([platform/linux-generic/m4/odp_schedule.m4])
AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/include/odp/api/plat/static_inline.h]) + +########################################################################## +# Enable default pktios build +########################################################################## +AC_DEFINE([ODP_PKTIO_IPC], [1], + [Define to 1 to enable IPC packet I/O support]) diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 6505d787..5ab95740 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -6,6 +6,8 @@
#include "config.h"
+#ifdef ODP_PKTIO_IPC + #include <odp_debug_internal.h> #include <odp_packet_io_internal.h> #include <odp/api/system_info.h> @@ -826,3 +828,5 @@ ODP_MODULE_CONSTRUCTOR(ipc_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_ipc_pktio_ops = 0; + +#endif /* ODP_PKTIO_IPC */ diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index fbcf22d7..2ad85624 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -23,7 +23,9 @@ ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) #ifdef ODP_PKTIO_DPDK extern int enable_link_dpdk_pktio_ops; #endif +#ifdef ODP_PKTIO_IPC extern int enable_link_ipc_pktio_ops; +#endif extern int enable_link_loopback_pktio_ops; #ifdef ODP_NETMAP extern int enable_link_netmap_pktio_ops; @@ -44,7 +46,9 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #ifdef ODP_PKTIO_DPDK enable_link_dpdk_pktio_ops = 1; #endif +#ifdef ODP_PKTIO_IPC enable_link_ipc_pktio_ops = 1; +#endif enable_link_loopback_pktio_ops = 1; #ifdef ODP_NETMAP enable_link_netmap_pktio_ops = 1;
commit 81ebc5ec2a0e61ee2d0ebbaa2c02dab35b06b824 Author: Bogdan Pricope bogdan.pricope@linaro.org Date: Mon Oct 23 14:21:37 2017 +0300
linux-dpdk: pktio: dpdk: build dpdk pktio based on configuration option
Build dpdk pktio based on configuration option
Signed-off-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Honnappa Nagarahalli honnappa.nagarahalli@arm.com Signed-off-by: Yi He yi.he@linaro.org
diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index b08136bc..16fdeade 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -158,3 +158,9 @@ AC_SUBST([DPDK_LIBS])
AC_CONFIG_FILES([platform/linux-dpdk/Makefile platform/linux-dpdk/include/odp/api/plat/static_inline.h]) + +########################################################################## +# Enable dpdk pktio build +########################################################################## +AC_DEFINE([ODP_PKTIO_DPDK], [1], + [Define to 1 to enable DPDK packet I/O support]) diff --git a/platform/linux-dpdk/pktio/dpdk.c b/platform/linux-dpdk/pktio/dpdk.c index 1248c130..a6e2573e 100644 --- a/platform/linux-dpdk/pktio/dpdk.c +++ b/platform/linux-dpdk/pktio/dpdk.c @@ -6,6 +6,8 @@
#include <config.h>
+#ifdef ODP_PKTIO_DPDK + #include <odp_posix_extensions.h> #include <stdio.h> #include <errno.h> @@ -760,3 +762,4 @@ ODP_MODULE_CONSTRUCTOR(dpdk_pktio_ops) */ int enable_link_dpdk_pktio_ops = 0;
+#endif /* ODP_PKTIO_DPDK */ diff --git a/platform/linux-dpdk/pktio/subsystem.c b/platform/linux-dpdk/pktio/subsystem.c index 985ae782..ab99db0d 100644 --- a/platform/linux-dpdk/pktio/subsystem.c +++ b/platform/linux-dpdk/pktio/subsystem.c @@ -22,7 +22,9 @@ ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) /* Temporary variable to enable link modules, * will remove in Makefile scheme changes. */ +#ifdef ODP_PKTIO_DPDK extern int enable_link_dpdk_pktio_ops; +#endif extern int enable_link_loopback_pktio_ops;
ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) @@ -30,6 +32,8 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) odp_subsystem_constructor(pktio_ops);
/* Further initialization per subsystem */ +#ifdef ODP_PKTIO_DPDK enable_link_dpdk_pktio_ops = 1; +#endif enable_link_loopback_pktio_ops = 1; }
-----------------------------------------------------------------------
Summary of changes: platform/linux-dpdk/Makefile.am | 2 +- platform/linux-dpdk/m4/configure.m4 | 6 +++++ platform/linux-dpdk/pktio/dpdk.c | 3 +++ platform/linux-dpdk/pktio/subsystem.c | 35 ------------------------------ platform/linux-generic/m4/configure.m4 | 15 +++++++++++++ platform/linux-generic/pktio/ipc.c | 4 ++++ platform/linux-generic/pktio/socket.c | 4 ++++ platform/linux-generic/pktio/socket_mmap.c | 4 ++++ platform/linux-generic/pktio/subsystem.c | 18 +++++++++++++++ platform/linux-generic/pktio/tap.c | 4 ++++ 10 files changed, 59 insertions(+), 36 deletions(-) delete mode 100644 platform/linux-dpdk/pktio/subsystem.c
hooks/post-receive
-
git＠git-us.linaro.org