[PATCH v3 3/3] mempool: introduce stack mempool driver
From: Shreyansh Jain <hidden>
Date: 2017-03-31 05:29:56
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
Moved from lib/librte_mempool, stack mempool handler is an independent
driver.
Shared builds would now require to link in librte_mempool_stack for
"stack" mempool handler.
Signed-off-by: Shreyansh Jain <redacted>
---
v3:
* fix shared build issue
MAINTAINERS | 1 +
config/common_base | 1 +
drivers/mempool/Makefile | 2 +
drivers/mempool/stack/Makefile | 51 ++++++++++++++++++++++
.../mempool/stack}/rte_mempool_stack.c | 0
.../mempool/stack/rte_mempool_stack_version.map | 4 ++
lib/librte_mempool/Makefile | 1 -
mk/rte.app.mk | 1 +
8 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 drivers/mempool/stack/Makefile
rename {lib/librte_mempool => drivers/mempool/stack}/rte_mempool_stack.c (100%)
create mode 100644 drivers/mempool/stack/rte_mempool_stack_version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 403d0dd..bd402d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS@@ -211,6 +211,7 @@ Core Libraries Memory pool M: Olivier Matz <olivier.matz@6wind.com> F: lib/librte_mempool/ +F: drivers/mempool/stack F: drivers/mempool/ring F: doc/guides/prog_guide/mempool_lib.rst F: test/test/test_mempool*
diff --git a/config/common_base b/config/common_base
index 9acd557..41191c8 100644
--- a/config/common_base
+++ b/config/common_base@@ -464,6 +464,7 @@ CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n # Compile Mempool drivers # CONFIG_RTE_DRIVER_MEMPOOL_RING=y +CONFIG_RTE_DRIVER_MEMPOOL_STACK=y # # Compile librte_mbuf
diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile
index 6a8a1da..0c6c45c 100644
--- a/drivers/mempool/Makefile
+++ b/drivers/mempool/Makefile@@ -35,5 +35,7 @@ core-libs := librte_eal librte_mempool librte_ring DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring DEPDIRS-ring = $(core-libs) +DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack +DEPDIRS-stack = $(core-libs) include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile
new file mode 100644
index 0000000..8f3125c
--- /dev/null
+++ b/drivers/mempool/stack/Makefile@@ -0,0 +1,51 @@ +# BSD LICENSE +# +# Copyright(c) 2017 NXP. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of NXP nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_mempool_stack.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +# Headers +CFLAGS += -I$(RTE_SDK)/lib/librte_mempool + +EXPORT_MAP := rte_mempool_stack_version.map + +LIBABIVER := 1 + +SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += rte_mempool_stack.c + +include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_mempool/rte_mempool_stack.c b/drivers/mempool/stack/rte_mempool_stack.c
similarity index 100%
rename from lib/librte_mempool/rte_mempool_stack.c
rename to drivers/mempool/stack/rte_mempool_stack.c
diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
new file mode 100644
index 0000000..8591cc0
--- /dev/null
+++ b/drivers/mempool/stack/rte_mempool_stack_version.map@@ -0,0 +1,4 @@ +DPDK_17.05 { + + local: *; +};
diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile
index efd4383..7b5bdfe 100644
--- a/lib/librte_mempool/Makefile
+++ b/lib/librte_mempool/Makefile@@ -43,7 +43,6 @@ LIBABIVER := 2 # all source are stored in SRCS-y SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_stack.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 5ebb6ec..336e448 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk@@ -102,6 +102,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) # plugins (link only if static libraries) _LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += -lrte_mempool_ring +_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet _LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lrte_pmd_bnx2x -lz
--
2.7.4