mem: remove dummy malloc library
The malloc library is now part of the EAL. Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com> Acked-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Neil Horman <nhorman@tuxdriver.com>
This commit is contained in:
Thomas Monjalon
parent
e32bbdb218
commit
5eaef15c19
@ -102,7 +102,6 @@ F: lib/librte_eal/common/include/rte_malloc.h
|
||||
F: lib/librte_eal/common/*malloc*
|
||||
F: lib/librte_eal/common/eal_common_mem*
|
||||
F: lib/librte_eal/common/eal_hugepages.h
|
||||
F: lib/librte_malloc/
|
||||
F: doc/guides/prog_guide/env_abstraction_layer.rst
|
||||
F: app/test/test_func_reentrancy.c
|
||||
F: app/test/test_malloc.c
|
||||
|
||||
@ -85,7 +85,7 @@ Each build directory contains include files, libraries, and applications:
|
||||
|
||||
librte_cmdline.a librte_lpm.a librte_mempool.a librte_ring.a
|
||||
|
||||
librte_eal.a librte_malloc.a librte_pmd_e1000.a librte_timer.a
|
||||
librte_eal.a librte_pmd_e1000.a librte_timer.a
|
||||
|
||||
|
||||
~/DEV/DPDK$ ls i686-native-linuxapp-gcc/include/
|
||||
|
||||
@ -115,7 +115,7 @@ The physical address of the reserved memory for that memory zone is also returne
|
||||
|
||||
.. note::
|
||||
|
||||
Memory reservations done using the APIs provided by the rte_malloc library are also backed by pages from the hugetlbfs filesystem.
|
||||
Memory reservations done using the APIs provided by rte_malloc are also backed by pages from the hugetlbfs filesystem.
|
||||
|
||||
Xen Dom0 support without hugetbls
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
@ -74,7 +74,6 @@ The lib directory contains::
|
||||
+-- librte_kni # Kernel NIC interface
|
||||
+-- librte_kvargs # Argument parsing library
|
||||
+-- librte_lpm # Longest prefix match library
|
||||
+-- librte_malloc # Malloc-like functions
|
||||
+-- librte_mbuf # Packet and control mbuf manipulation
|
||||
+-- librte_mempool # Memory pool manager (fixed sized objects)
|
||||
+-- librte_meter # QoS metering library
|
||||
|
||||
@ -73,7 +73,7 @@ Performance Insensitive API
|
||||
|
||||
Outside of the performance sensitive areas described in Section 25.1,
|
||||
the DPDK provides a thread-safe API for most other libraries.
|
||||
For example, malloc(librte_malloc) and memzone functions are safe for use in multi-threaded and multi-process environments.
|
||||
For example, malloc and memzone functions are safe for use in multi-threaded and multi-process environments.
|
||||
|
||||
The setup and configuration of the PMD is not performance sensitive, but is not thread safe either.
|
||||
It is possible that the multiple read/writes during PMD setup and configuration could be corrupted in a multi-thread environment.
|
||||
|
||||
@ -21,11 +21,6 @@ Deprecation Notices
|
||||
* The field mem_location of the rte_lpm structure is deprecated and should be
|
||||
removed as well as the macros RTE_LPM_HEAP and RTE_LPM_MEMZONE.
|
||||
|
||||
* librte_malloc library has been integrated into librte_eal. The 2.1 release
|
||||
creates a dummy/empty malloc library to fulfill binaries with dynamic linking
|
||||
dependencies on librte_malloc.so. Such dummy library will not be created from
|
||||
release 2.2 so binaries will need to be rebuilt.
|
||||
|
||||
* The following fields have been deprecated in rte_eth_stats:
|
||||
imissed, ibadcrc, ibadlen, imcasts, fdirmatch, fdirmiss,
|
||||
tx_pause_xon, rx_pause_xon, tx_pause_xoff, rx_pause_xoff
|
||||
|
||||
@ -32,6 +32,8 @@ ABI Changes
|
||||
* The mbuf structure was changed to support unified packet type.
|
||||
It was already done in 2.1 for CONFIG_RTE_NEXT_ABI.
|
||||
|
||||
* The dummy malloc library is removed. The content was moved into EAL in 2.1.
|
||||
|
||||
|
||||
Shared Library Versions
|
||||
-----------------------
|
||||
@ -53,7 +55,6 @@ The libraries prepended with a plus sign were incremented in this version.
|
||||
librte_kni.so.1
|
||||
librte_kvargs.so.1
|
||||
librte_lpm.so.1
|
||||
librte_malloc.so.1
|
||||
+ librte_mbuf.so.2
|
||||
librte_mempool.so.1
|
||||
librte_meter.so.1
|
||||
|
||||
@ -33,7 +33,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
|
||||
|
||||
DIRS-y += librte_compat
|
||||
DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
|
||||
DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_malloc
|
||||
DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring
|
||||
DIRS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += librte_mempool
|
||||
DIRS-$(CONFIG_RTE_LIBRTE_MBUF) += librte_mbuf
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
# BSD LICENSE
|
||||
#
|
||||
# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
|
||||
# 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 Intel Corporation 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_malloc.a
|
||||
|
||||
LIBABIVER := 1
|
||||
|
||||
CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
|
||||
|
||||
EXPORT_MAP := rte_malloc_version.map
|
||||
|
||||
# all source are stored in SRCS-y
|
||||
SRCS-$(CONFIG_RTE_LIBRTE_EAL) := rte_malloc_empty.c
|
||||
|
||||
# this lib needs eal
|
||||
DEPDIRS-$(CONFIG_RTE_LIBRTE_EAL) += lib/librte_eal
|
||||
|
||||
include $(RTE_SDK)/mk/rte.lib.mk
|
||||
@ -1,34 +0,0 @@
|
||||
/*-
|
||||
* BSD LICENSE
|
||||
*
|
||||
* Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
|
||||
* 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 Intel Corporation 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.
|
||||
*/
|
||||
|
||||
/* Empty file to be able to create a dummy library for deprecation policy */
|
||||
@ -1,3 +0,0 @@
|
||||
DPDK_2.0 {
|
||||
local: *;
|
||||
};
|
||||
@ -114,7 +114,6 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS) += -lrte_kvargs
|
||||
_LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF) += -lrte_mbuf
|
||||
_LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += -lrte_ip_frag
|
||||
_LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER) += -lethdev
|
||||
_LDLIBS-$(CONFIG_RTE_LIBRTE_MALLOC) += -lrte_malloc
|
||||
_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool
|
||||
_LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring
|
||||
_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrte_eal
|
||||
|
||||
Loading…
Reference in New Issue
Block a user