memory: Rename to env

The new env library will wrap all third-party library
calls and be easily swappable with alternate implementations
at build time. For now, it's just the memory library
renamed.

Change-Id: I26a70933289f8137107208ba75f7520fd7a33da0
Signed-off-by: Ben Walker <benjamin.walker@intel.com>

app/iscsi_tgt/Makefile

@@ -57,7 +57,7 @@ SPDK_LIBS = \
 	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
 	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	$(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
 	$(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \
 	$(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \

app/nvmf_tgt/Makefile

@@ -53,7 +53,7 @@ SPDK_LIBS = \
 	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
 	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	$(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	$(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
 	$(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \
 	$(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \

autotest.sh

@@ -75,7 +75,7 @@ time test/lib/bdev/blockdev.sh
 time test/lib/event/event.sh
 time test/lib/nvme/nvme.sh
 time test/lib/nvmf/nvmf.sh
-time test/lib/memory/memory.sh
+time test/lib/env/vtophys.sh
 time test/lib/ioat/ioat.sh
 time test/lib/json/json.sh
 time test/lib/jsonrpc/jsonrpc.sh

examples/ioat/perf/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/ioat/verify/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/nvme/arbitration/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/nvme/fio_plugin/Makefile

@@ -46,8 +46,8 @@ LDFLAGS += -shared -rdynamic
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/nvme/hello_world/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/nvme/identify/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/nvme/nvme_manage/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/nvme/perf/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

examples/nvme/reserve/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

include/spdk/env.h

@@ -32,11 +32,11 @@
  */
 
 /** \file
- * Virtual to physical address translation
+ * Encapsulated third-party dependencies
  */
 
-#ifndef SPDK_VTOPHYS_H
+#ifndef SPDK_ENV_H
-#define SPDK_VTOPHYS_H
+#define SPDK_ENV_H
 
 #ifdef __cplusplus
 extern "C" {

lib/Makefile

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

lib/copy/ioat/copy_engine_ioat.c

@@ -41,7 +41,7 @@
 #include <rte_lcore.h>
 
 #include "spdk/copy_engine.h"
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 #include "spdk/conf.h"
 #include "spdk/log.h"
 #include "spdk/event.h"

lib/env/Makefile

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

lib/env/vtophys.c

@@ -37,10 +37,11 @@
 #include <string.h>
 #include <pthread.h>
 
-#include "rte_config.h"
+#include <rte_config.h>
-#include "rte_eal.h"
+#include <rte_eal.h>
-#include "rte_eal_memconfig.h"
+#include <rte_eal_memconfig.h>
-#include "spdk/vtophys.h"
+
+#include "spdk/env.h"
 
 /* x86-64 userspace virtual addresses use only the low 47 bits [0..46],
  * which is enough to cover 128 TB.

lib/ioat/ioat_impl.h

@@ -12,7 +12,7 @@
 
 #include "spdk/assert.h"
 #include "spdk/pci.h"
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 
 #include <rte_pci.h>
 

lib/nvme/nvme_impl.h

@@ -45,7 +45,7 @@
 #ifndef __NVME_IMPL_H__
 #define __NVME_IMPL_H__
 
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 #include "spdk/pci.h"
 #include "spdk/nvme_spec.h"
 #include <assert.h>

test/lib/Makefile

@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = bdev event log iscsi json jsonrpc nvme nvmf memory scsi ioat util
+DIRS-y = bdev env event log iscsi json jsonrpc nvme nvmf scsi ioat util
 
 .PHONY: all clean $(DIRS-y)
 

test/lib/bdev/bdevio/Makefile

@@ -48,7 +48,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
 	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	     $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
 	     $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
 	     $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a

test/lib/bdev/bdevperf/Makefile

@@ -48,7 +48,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
 	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	     $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
 	     $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
 	     $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a

test/lib/env/Makefile

@@ -40,7 +40,7 @@ C_SRCS = vtophys.c
 
 CFLAGS += $(DPDK_INC)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

test/lib/env/vtophys.c

@@ -40,7 +40,7 @@
 #include <rte_mempool.h>
 #include <rte_malloc.h>
 
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 
 static const char *ealargs[] = {
 	"vtophys",

test/lib/env/vtophys.sh

@@ -6,10 +6,10 @@ testdir=$(readlink -f $(dirname $0))
 rootdir="$testdir/../../.."
 source $rootdir/scripts/autotest_common.sh
 
-timing_enter memory
+timing_enter env
 
 timing_enter vtophys
 $testdir/vtophys
 timing_exit vtophys
 
-timing_exit memory
+timing_exit env

test/lib/nvme/aer/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

test/lib/nvme/e2edp/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

test/lib/nvme/overhead/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

test/lib/nvme/reset/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 

test/lib/nvme/sgl/Makefile

@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)