From 984f30c9756b50c1507b287c71243e2c06efff16 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 30 Nov 2015 19:40:58 -0700 Subject: [PATCH] Move conditional lib files to oslib/ Signed-off-by: Jens Axboe --- Makefile | 30 +++++++++++++----------------- blktrace.c | 2 +- engines/mtd.c | 2 +- init.c | 2 +- os/os-windows.h | 2 +- os/os.h | 4 ++-- {lib => oslib}/getopt_long.c | 0 {lib => oslib}/inet_aton.c | 0 {lib => oslib}/inet_aton.h | 0 {lib => oslib}/libmtd.c | 0 {lib => oslib}/libmtd.h | 0 {lib => oslib}/libmtd_common.h | 0 {lib => oslib}/libmtd_int.h | 0 {lib => oslib}/libmtd_legacy.c | 0 {lib => oslib}/libmtd_xalloc.h | 0 {lib => oslib}/linux-dev-lookup.c | 0 {lib => oslib}/linux-dev-lookup.h | 0 {lib => oslib}/strcasestr.c | 0 {lib => oslib}/strcasestr.h | 0 {lib => oslib}/strlcat.c | 0 {lib => oslib}/strlcat.h | 0 {lib => oslib}/strsep.c | 0 {lib => oslib}/strsep.h | 0 t/btrace2fio.c | 2 +- 24 files changed, 20 insertions(+), 24 deletions(-) rename {lib => oslib}/getopt_long.c (100%) rename {lib => oslib}/inet_aton.c (100%) rename {lib => oslib}/inet_aton.h (100%) rename {lib => oslib}/libmtd.c (100%) rename {lib => oslib}/libmtd.h (100%) rename {lib => oslib}/libmtd_common.h (100%) rename {lib => oslib}/libmtd_int.h (100%) rename {lib => oslib}/libmtd_legacy.c (100%) rename {lib => oslib}/libmtd_xalloc.h (100%) rename {lib => oslib}/linux-dev-lookup.c (100%) rename {lib => oslib}/linux-dev-lookup.h (100%) rename {lib => oslib}/strcasestr.c (100%) rename {lib => oslib}/strcasestr.h (100%) rename {lib => oslib}/strlcat.c (100%) rename {lib => oslib}/strlcat.h (100%) rename {lib => oslib}/strsep.c (100%) rename {lib => oslib}/strsep.h (100%) diff --git a/Makefile b/Makefile index 066b240c..d5a2095f 100644 --- a/Makefile +++ b/Makefile @@ -36,11 +36,8 @@ ifdef CONFIG_GFIO PROGS += gfio endif -SOURCE := lib/rbtree.c lib/rand.c lib/num2str.c lib/ieee754.c \ - lib/strntol.c lib/prio_tree.c lib/zipf.c lib/axmap.c \ - lib/pattern.c lib/lfsr.c lib/flist_sort.c lib/hweight.c \ - lib/getrusage.c lib/tp.c lib/bloom.c lib/gauss.c \ - lib/mountcheck.c lib/output_buffer.c lib/memalign.c \ +SOURCE := $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) \ + $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/lib/*.c)) \ gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \ eta.c verify.c memory.c io_u.c parse.c mutex.c options.c \ smalloc.c filehash.c profile.c debug.c engines/cpu.c \ @@ -48,8 +45,7 @@ SOURCE := lib/rbtree.c lib/rand.c lib/num2str.c lib/ieee754.c \ server.c client.c iolog.c backend.c libfio.c flow.c cconv.c \ gettime-thread.c helpers.c json.c idletime.c td_error.c \ profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \ - workqueue.c \ - $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) + workqueue.c ifdef CONFIG_LIBHDFS HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE) @@ -101,19 +97,19 @@ ifdef CONFIG_RBD SOURCE += engines/rbd.c endif ifndef CONFIG_STRSEP - SOURCE += lib/strsep.c + SOURCE += oslib/strsep.c endif ifndef CONFIG_STRCASESTR - SOURCE += lib/strcasestr.c + SOURCE += oslib/strcasestr.c endif ifndef CONFIG_STRLCAT - SOURCE += lib/strlcat.c + SOURCE += oslib/strlcat.c endif ifndef CONFIG_GETOPT_LONG_ONLY - SOURCE += lib/getopt_long.c + SOURCE += oslib/getopt_long.c endif ifndef CONFIG_INET_ATON - SOURCE += lib/inet_aton.c + SOURCE += oslib/inet_aton.c endif ifdef CONFIG_GFAPI SOURCE += engines/glusterfs.c @@ -125,19 +121,19 @@ ifdef CONFIG_GFAPI endif ifdef CONFIG_MTD SOURCE += engines/mtd.c - SOURCE += lib/libmtd.c - SOURCE += lib/libmtd_legacy.c + SOURCE += oslib/libmtd.c + SOURCE += oslib/libmtd_legacy.c endif ifeq ($(CONFIG_TARGET_OS), Linux) SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \ - engines/binject.c lib/linux-dev-lookup.c + engines/binject.c oslib/linux-dev-lookup.c LIBS += -lpthread -ldl LDFLAGS += -rdynamic endif ifeq ($(CONFIG_TARGET_OS), Android) SOURCE += diskutil.c fifo.c blktrace.c trim.c profiles/tiobench.c \ - lib/linux-dev-lookup.c + oslib/linux-dev-lookup.c LIBS += -ldl LDFLAGS += -rdynamic endif @@ -217,7 +213,7 @@ T_LFSR_TEST_PROGS = t/lfsr-test ifeq ($(CONFIG_TARGET_OS), Linux) T_BTRACE_FIO_OBJS = t/btrace2fio.o -T_BTRACE_FIO_OBJS += fifo.o lib/flist_sort.o t/log.o lib/linux-dev-lookup.o +T_BTRACE_FIO_OBJS += fifo.o lib/flist_sort.o t/log.o oslib/linux-dev-lookup.o T_BTRACE_FIO_PROGS = t/fio-btrace2fio endif diff --git a/blktrace.c b/blktrace.c index 562e126b..deb8b2d6 100644 --- a/blktrace.c +++ b/blktrace.c @@ -11,7 +11,7 @@ #include "flist.h" #include "fio.h" #include "blktrace_api.h" -#include "lib/linux-dev-lookup.h" +#include "oslib/linux-dev-lookup.h" #define TRACE_FIFO_SIZE 8192 diff --git a/engines/mtd.c b/engines/mtd.c index 9381089a..7b92c836 100644 --- a/engines/mtd.c +++ b/engines/mtd.c @@ -14,7 +14,7 @@ #include "../fio.h" #include "../verify.h" -#include "../lib/libmtd.h" +#include "../oslib/libmtd.h" libmtd_t desc; diff --git a/init.c b/init.c index b7945cf3..353cc2b1 100644 --- a/init.c +++ b/init.c @@ -27,7 +27,7 @@ #include "filelock.h" #include "lib/getopt.h" -#include "lib/strcasestr.h" +#include "oslib/strcasestr.h" #include "crc/test.h" diff --git a/os/os-windows.h b/os/os-windows.h index ad1c3dfc..159c086a 100644 --- a/os/os-windows.h +++ b/os/os-windows.h @@ -16,7 +16,7 @@ #include "../file.h" #include "../log.h" #include "../lib/hweight.h" -#include "../lib/strcasestr.h" +#include "../oslib/strcasestr.h" #include "windows/posix.h" diff --git a/os/os.h b/os/os.h index 8e0b8e8f..c46d8a3d 100644 --- a/os/os.h +++ b/os/os.h @@ -65,11 +65,11 @@ typedef struct aiocb os_aiocb_t; #endif #ifndef CONFIG_STRSEP -#include "../lib/strsep.h" +#include "../oslib/strsep.h" #endif #ifndef CONFIG_STRLCAT -#include "../lib/strlcat.h" +#include "../oslib/strlcat.h" #endif #ifdef MSG_DONTWAIT diff --git a/lib/getopt_long.c b/oslib/getopt_long.c similarity index 100% rename from lib/getopt_long.c rename to oslib/getopt_long.c diff --git a/lib/inet_aton.c b/oslib/inet_aton.c similarity index 100% rename from lib/inet_aton.c rename to oslib/inet_aton.c diff --git a/lib/inet_aton.h b/oslib/inet_aton.h similarity index 100% rename from lib/inet_aton.h rename to oslib/inet_aton.h diff --git a/lib/libmtd.c b/oslib/libmtd.c similarity index 100% rename from lib/libmtd.c rename to oslib/libmtd.c diff --git a/lib/libmtd.h b/oslib/libmtd.h similarity index 100% rename from lib/libmtd.h rename to oslib/libmtd.h diff --git a/lib/libmtd_common.h b/oslib/libmtd_common.h similarity index 100% rename from lib/libmtd_common.h rename to oslib/libmtd_common.h diff --git a/lib/libmtd_int.h b/oslib/libmtd_int.h similarity index 100% rename from lib/libmtd_int.h rename to oslib/libmtd_int.h diff --git a/lib/libmtd_legacy.c b/oslib/libmtd_legacy.c similarity index 100% rename from lib/libmtd_legacy.c rename to oslib/libmtd_legacy.c diff --git a/lib/libmtd_xalloc.h b/oslib/libmtd_xalloc.h similarity index 100% rename from lib/libmtd_xalloc.h rename to oslib/libmtd_xalloc.h diff --git a/lib/linux-dev-lookup.c b/oslib/linux-dev-lookup.c similarity index 100% rename from lib/linux-dev-lookup.c rename to oslib/linux-dev-lookup.c diff --git a/lib/linux-dev-lookup.h b/oslib/linux-dev-lookup.h similarity index 100% rename from lib/linux-dev-lookup.h rename to oslib/linux-dev-lookup.h diff --git a/lib/strcasestr.c b/oslib/strcasestr.c similarity index 100% rename from lib/strcasestr.c rename to oslib/strcasestr.c diff --git a/lib/strcasestr.h b/oslib/strcasestr.h similarity index 100% rename from lib/strcasestr.h rename to oslib/strcasestr.h diff --git a/lib/strlcat.c b/oslib/strlcat.c similarity index 100% rename from lib/strlcat.c rename to oslib/strlcat.c diff --git a/lib/strlcat.h b/oslib/strlcat.h similarity index 100% rename from lib/strlcat.h rename to oslib/strlcat.h diff --git a/lib/strsep.c b/oslib/strsep.c similarity index 100% rename from lib/strsep.c rename to oslib/strsep.c diff --git a/lib/strsep.h b/oslib/strsep.h similarity index 100% rename from lib/strsep.h rename to oslib/strsep.h diff --git a/t/btrace2fio.c b/t/btrace2fio.c index 04b6abed..c589ceaf 100644 --- a/t/btrace2fio.c +++ b/t/btrace2fio.c @@ -12,7 +12,7 @@ #include "../blktrace_api.h" #include "../os/os.h" #include "../log.h" -#include "../lib/linux-dev-lookup.h" +#include "../oslib/linux-dev-lookup.h" #define TRACE_FIFO_SIZE 8192 -- 2.25.1