ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env: rename default implementation to env_dpdk

Browse Source 
Change-Id: I6aa48861917547e7081951b6d953693e109b02e6
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-11-09 16:12:00 -07:00
parent 8eebe5e12d
commit 6bd65015d7
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONFIG
View File

@ -45,7 +45,7 @@ CONFIG_ADDRESS_SANITIZER?=n
# Directory that contains the desired SPDK environment library. # Directory that contains the desired SPDK environment library.
# By default, this is implemented using DPDK. # By default, this is implemented using DPDK.
CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk
# This directory should contain 'include' and 'lib' directories for your DPDK # This directory should contain 'include' and 'lib' directories for your DPDK
# installation. Alternatively you can specify this on the command line # installation. Alternatively you can specify this on the command line

4
PORTING.md
View File

@ -10,7 +10,7 @@ defined in [include/spdk/env.h](include/spdk/env.h).
SPDK includes a default implementation of the *env* library based SPDK includes a default implementation of the *env* library based
on the Data Plane Development Kit ([DPDK](http://dpdk.org/)). on the Data Plane Development Kit ([DPDK](http://dpdk.org/)).
This DPDK implementation can be found in `lib/env`. This DPDK implementation can be found in `lib/env_dpdk`.
DPDK is currently supported on Linux and FreeBSD only. DPDK is currently supported on Linux and FreeBSD only.
Users who want to use SPDK on other operating systems, or in Users who want to use SPDK on other operating systems, or in
@ -19,4 +19,4 @@ a new version of the *env* library. The new implementation can be
integrated into the SPDK build by updating the following line integrated into the SPDK build by updating the following line
in CONFIG: in CONFIG:
CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk

2
lib/Makefile
View File

@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y += bdev conf copy cunit event json jsonrpc \ DIRS-y += bdev conf copy cunit event json jsonrpc \
log env net rpc trace util nvme nvmf scsi ioat log env_dpdk net rpc trace util nvme nvmf scsi ioat
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
DIRS-y += iscsi DIRS-y += iscsi
endif endif

2
lib/env/Makefile → lib/env_dpdk/Makefile
View File

@ -36,6 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
C_SRCS = env.c pci.c vtophys.c C_SRCS = env.c pci.c vtophys.c
LIBNAME = env LIBNAME = env_dpdk
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

0
lib/env/env.c → lib/env_dpdk/env.c
View File

4
lib/env/env.mk → lib/env_dpdk/env.mk
View File

@ -68,5 +68,5 @@ endif
ENV_CFLAGS = $(DPDK_INC) ENV_CFLAGS = $(DPDK_INC)
ENV_CXXFLAGS = $(ENV_CFLAGS) ENV_CXXFLAGS = $(ENV_CFLAGS)
ENV_LIBS = $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a $(DPDK_LIB) ENV_LIBS = $(SPDK_ROOT_DIR)/lib/env_dpdk/libspdk_env_dpdk.a $(DPDK_LIB)
ENV_LINKER_ARGS = -Wl,--start-group -Wl,--whole-archive $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive ENV_LINKER_ARGS = -Wl,--start-group -Wl,--whole-archive $(SPDK_ROOT_DIR)/lib/env_dpdk/libspdk_env_dpdk.a $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive

0
lib/env/pci.c → lib/env_dpdk/pci.c
View File

0
lib/env/vtophys.c → lib/env_dpdk/vtophys.c
View File