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>
2016-08-10 10:21:45 -07:00 · 2016-08-10 10:21:45 -07:00 · a30b5532cb
commit a30b5532cb
parent 25749728b6
31 changed files with 37 additions and 36 deletions
--- a/app/iscsi_tgt/Makefile
+++ b/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 \
--- a/app/nvmf_tgt/Makefile
+++ b/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 \
--- a/autotest.sh
+++ b/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
--- a/examples/ioat/perf/Makefile
+++ b/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)

--- a/examples/ioat/verify/Makefile
+++ b/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)

--- a/examples/nvme/arbitration/Makefile
+++ b/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)

--- a/examples/nvme/fio_plugin/Makefile
+++ b/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)

--- a/examples/nvme/hello_world/Makefile
+++ b/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)

--- a/examples/nvme/identify/Makefile
+++ b/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)

--- a/examples/nvme/nvme_manage/Makefile
+++ b/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)

--- a/examples/nvme/perf/Makefile
+++ b/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)

--- a/examples/nvme/reserve/Makefile
+++ b/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)

--- a/include/spdk/vtophys.h
+++ b/include/spdk/vtophys.h
@ -32,11 +32,11 @@
 */

 /** \file
- * Virtual to physical address translation
+ * Encapsulated third-party dependencies
 */

-#ifndef SPDK_VTOPHYS_H
-#define SPDK_VTOPHYS_H
+#ifndef SPDK_ENV_H
+#define SPDK_ENV_H

 #ifdef __cplusplus
 extern "C" {
--- a/lib/Makefile
+++ b/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
--- a/lib/copy/ioat/copy_engine_ioat.c
+++ b/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"
--- a/lib/memory/Makefile
+++ b/lib/memory/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
--- a/lib/memory/vtophys.c
+++ b/lib/memory/vtophys.c
@ -37,10 +37,11 @@
 #include <string.h>
 #include <pthread.h>

-#include "rte_config.h"
-#include "rte_eal.h"
-#include "rte_eal_memconfig.h"
-#include "spdk/vtophys.h"
+#include <rte_config.h>
+#include <rte_eal.h>
+#include <rte_eal_memconfig.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.
--- a/lib/ioat/ioat_impl.h
+++ b/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>

--- a/lib/nvme/nvme_impl.h
+++ b/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>
--- a/test/lib/Makefile
+++ b/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)

--- a/test/lib/bdev/bdevio/Makefile
+++ b/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
--- a/test/lib/bdev/bdevperf/Makefile
+++ b/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
--- a/test/lib/memory/.gitignore
+++ b/test/lib/memory/.gitignore
--- a/test/lib/memory/Makefile
+++ b/test/lib/memory/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)

--- a/test/lib/memory/vtophys.c
+++ b/test/lib/memory/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",
--- a/test/lib/memory/memory.sh
+++ b/test/lib/memory/memory.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
--- a/test/lib/nvme/aer/Makefile
+++ b/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)

--- a/test/lib/nvme/e2edp/Makefile
+++ b/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)

--- a/test/lib/nvme/overhead/Makefile
+++ b/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)

--- a/test/lib/nvme/reset/Makefile
+++ b/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)

--- a/test/lib/nvme/sgl/Makefile
+++ b/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)