From 7fb6d4530b2018064f8011f7ff9e4f673002f615 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 10 Apr 2013 20:48:31 +0200 Subject: [PATCH] Move rbtree to lib/ That's where it was moved in gfio, one further step towards unifying the branches. Signed-off-by: Jens Axboe --- Makefile | 2 +- fio.h | 2 +- iolog.h | 2 +- rbtree.c => lib/rbtree.c | 0 rbtree.h => lib/rbtree.h | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename rbtree.c => lib/rbtree.c (100%) rename rbtree.h => lib/rbtree.h (100%) diff --git a/Makefile b/Makefile index a5322a9c..13a6b8a3 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ SCRIPTS = fio_generate_plots SOURCE := gettime.c fio.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 \ - rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \ + lib/rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \ lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \ engines/mmap.c engines/sync.c engines/null.c engines/net.c \ memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \ diff --git a/fio.h b/fio.h index 55603cb9..e55413a9 100644 --- a/fio.h +++ b/fio.h @@ -20,7 +20,6 @@ struct thread_data; #include "thread_options.h" #include "flist.h" #include "fifo.h" -#include "rbtree.h" #include "arch/arch.h" #include "os/os.h" #include "mutex.h" @@ -37,6 +36,7 @@ struct thread_data; #include "gettime.h" #include "lib/getopt.h" #include "lib/rand.h" +#include "lib/rbtree.h" #include "server.h" #include "stat.h" #include "flow.h" diff --git a/iolog.h b/iolog.h index 6a53de25..3d140a20 100644 --- a/iolog.h +++ b/iolog.h @@ -1,7 +1,7 @@ #ifndef FIO_IOLOG_H #define FIO_IOLOG_H -#include "rbtree.h" +#include "lib/rbtree.h" #include "lib/ieee754.h" /* diff --git a/rbtree.c b/lib/rbtree.c similarity index 100% rename from rbtree.c rename to lib/rbtree.c diff --git a/rbtree.h b/lib/rbtree.h similarity index 100% rename from rbtree.h rename to lib/rbtree.h -- 2.25.1