From 317b95d07d4921d2594a1be6e014c9c2d062fe75 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 2 Apr 2007 21:36:44 +0200 Subject: [PATCH 1/1] Move os/arch/compiler headers into directories Signed-off-by: Jens Axboe --- arch-alpha.h => arch/arch-alpha.h | 0 arch-ia64.h => arch/arch-ia64.h | 0 arch-ppc.h => arch/arch-ppc.h | 0 arch-s390.h => arch/arch-s390.h | 0 arch-x86.h => arch/arch-x86.h | 0 arch-x86_64.h => arch/arch-x86_64.h | 0 arch.h => arch/arch.h | 0 compiler-gcc3.h => compiler/compiler-gcc3.h | 0 compiler-gcc4.h => compiler/compiler-gcc4.h | 0 compiler.h => compiler/compiler.h | 0 engines/cpu.c | 1 - engines/guasi.c | 1 - engines/libaio.c | 1 - engines/mmap.c | 1 - engines/net.c | 1 - engines/null.c | 1 - engines/posixaio.c | 1 - engines/sg.c | 1 - engines/skeleton_external.c | 1 - engines/splice.c | 1 - engines/sync.c | 1 - engines/syslet-rw.c | 1 - eta.c | 1 - filesetup.c | 1 - fio.c | 1 - fio.h | 6 +++--- gettime.c | 1 - io_u.c | 1 - ioengines.c | 1 - memory.c | 1 - os-freebsd.h => os/os-freebsd.h | 0 os-linux.h => os/os-linux.h | 0 os-solaris.h => os/os-solaris.h | 0 os.h => os/os.h | 0 verify.c | 1 - 35 files changed, 3 insertions(+), 23 deletions(-) rename arch-alpha.h => arch/arch-alpha.h (100%) rename arch-ia64.h => arch/arch-ia64.h (100%) rename arch-ppc.h => arch/arch-ppc.h (100%) rename arch-s390.h => arch/arch-s390.h (100%) rename arch-x86.h => arch/arch-x86.h (100%) rename arch-x86_64.h => arch/arch-x86_64.h (100%) rename arch.h => arch/arch.h (100%) rename compiler-gcc3.h => compiler/compiler-gcc3.h (100%) rename compiler-gcc4.h => compiler/compiler-gcc4.h (100%) rename compiler.h => compiler/compiler.h (100%) rename os-freebsd.h => os/os-freebsd.h (100%) rename os-linux.h => os/os-linux.h (100%) rename os-solaris.h => os/os-solaris.h (100%) rename os.h => os/os.h (100%) diff --git a/arch-alpha.h b/arch/arch-alpha.h similarity index 100% rename from arch-alpha.h rename to arch/arch-alpha.h diff --git a/arch-ia64.h b/arch/arch-ia64.h similarity index 100% rename from arch-ia64.h rename to arch/arch-ia64.h diff --git a/arch-ppc.h b/arch/arch-ppc.h similarity index 100% rename from arch-ppc.h rename to arch/arch-ppc.h diff --git a/arch-s390.h b/arch/arch-s390.h similarity index 100% rename from arch-s390.h rename to arch/arch-s390.h diff --git a/arch-x86.h b/arch/arch-x86.h similarity index 100% rename from arch-x86.h rename to arch/arch-x86.h diff --git a/arch-x86_64.h b/arch/arch-x86_64.h similarity index 100% rename from arch-x86_64.h rename to arch/arch-x86_64.h diff --git a/arch.h b/arch/arch.h similarity index 100% rename from arch.h rename to arch/arch.h diff --git a/compiler-gcc3.h b/compiler/compiler-gcc3.h similarity index 100% rename from compiler-gcc3.h rename to compiler/compiler-gcc3.h diff --git a/compiler-gcc4.h b/compiler/compiler-gcc4.h similarity index 100% rename from compiler-gcc4.h rename to compiler/compiler-gcc4.h diff --git a/compiler.h b/compiler/compiler.h similarity index 100% rename from compiler.h rename to compiler/compiler.h diff --git a/engines/cpu.c b/engines/cpu.c index 9fac418b..cfdf281d 100644 --- a/engines/cpu.c +++ b/engines/cpu.c @@ -6,7 +6,6 @@ * */ #include "../fio.h" -#include "../os.h" static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u) { diff --git a/engines/guasi.c b/engines/guasi.c index d67699af..1d3c77f6 100644 --- a/engines/guasi.c +++ b/engines/guasi.c @@ -20,7 +20,6 @@ #include #include "../fio.h" -#include "../os.h" #ifdef FIO_HAVE_GUASI diff --git a/engines/libaio.c b/engines/libaio.c index 7c44927a..871c5a47 100644 --- a/engines/libaio.c +++ b/engines/libaio.c @@ -11,7 +11,6 @@ #include #include "../fio.h" -#include "../os.h" #ifdef FIO_HAVE_LIBAIO diff --git a/engines/mmap.c b/engines/mmap.c index da690694..95ad1d84 100644 --- a/engines/mmap.c +++ b/engines/mmap.c @@ -13,7 +13,6 @@ #include #include "../fio.h" -#include "../os.h" static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u) { diff --git a/engines/net.c b/engines/net.c index 66f1e607..4de86c12 100644 --- a/engines/net.c +++ b/engines/net.c @@ -15,7 +15,6 @@ #include #include "../fio.h" -#include "../os.h" struct netio_data { int listenfd; diff --git a/engines/null.c b/engines/null.c index 724feca7..70d1fa78 100644 --- a/engines/null.c +++ b/engines/null.c @@ -12,7 +12,6 @@ #include #include "../fio.h" -#include "../os.h" struct null_data { struct io_u **io_us; diff --git a/engines/posixaio.c b/engines/posixaio.c index 4aa7420c..88ed4026 100644 --- a/engines/posixaio.c +++ b/engines/posixaio.c @@ -11,7 +11,6 @@ #include #include "../fio.h" -#include "../os.h" #ifdef FIO_HAVE_POSIXAIO diff --git a/engines/sg.c b/engines/sg.c index 8856c6f9..cc50d6b9 100644 --- a/engines/sg.c +++ b/engines/sg.c @@ -12,7 +12,6 @@ #include #include "../fio.h" -#include "../os.h" #ifdef FIO_HAVE_SGIO diff --git a/engines/skeleton_external.c b/engines/skeleton_external.c index 4c0c926c..9000accf 100644 --- a/engines/skeleton_external.c +++ b/engines/skeleton_external.c @@ -13,7 +13,6 @@ #include #include "../fio.h" -#include "../os.h" /* * The core of the module is identical to the ones included with fio, diff --git a/engines/splice.c b/engines/splice.c index 6d843538..b92da4a8 100644 --- a/engines/splice.c +++ b/engines/splice.c @@ -13,7 +13,6 @@ #include #include "../fio.h" -#include "../os.h" #ifdef FIO_HAVE_SPLICE diff --git a/engines/sync.c b/engines/sync.c index a1372827..ee8e3c36 100644 --- a/engines/sync.c +++ b/engines/sync.c @@ -12,7 +12,6 @@ #include #include "../fio.h" -#include "../os.h" static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u) { diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c index d225cc41..7e407d78 100644 --- a/engines/syslet-rw.c +++ b/engines/syslet-rw.c @@ -13,7 +13,6 @@ #include #include "../fio.h" -#include "../os.h" #ifdef FIO_HAVE_SYSLET diff --git a/eta.c b/eta.c index a48cadae..31028dd8 100644 --- a/eta.c +++ b/eta.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" static char run_str[MAX_JOBS + 1]; diff --git a/filesetup.c b/filesetup.c index 78264d3d..c99d5b36 100644 --- a/filesetup.c +++ b/filesetup.c @@ -8,7 +8,6 @@ #include #include "fio.h" -#include "os.h" static int extend_file(struct thread_data *td, struct fio_file *f) { diff --git a/fio.c b/fio.c index 125cf6fb..a945b856 100644 --- a/fio.c +++ b/fio.c @@ -35,7 +35,6 @@ #include #include "fio.h" -#include "os.h" unsigned long page_mask; unsigned long page_size; diff --git a/fio.h b/fio.h index a62971d1..6b708059 100644 --- a/fio.h +++ b/fio.h @@ -13,13 +13,13 @@ #include #include -#include "compiler.h" +#include "compiler/compiler.h" #include "list.h" #include "rbtree.h" #include "md5.h" #include "crc32.h" -#include "arch.h" -#include "os.h" +#include "arch/arch.h" +#include "os/os.h" #include "mutex.h" #ifdef FIO_HAVE_SYSLET diff --git a/gettime.c b/gettime.c index 4f6ec955..136c02c1 100644 --- a/gettime.c +++ b/gettime.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" #include "hash.h" diff --git a/io_u.c b/io_u.c index b48c99da..1ae63789 100644 --- a/io_u.c +++ b/io_u.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" /* * Change this define to play with the timeout handling diff --git a/ioengines.c b/ioengines.c index 3cfa773a..998c13ee 100644 --- a/ioengines.c +++ b/ioengines.c @@ -17,7 +17,6 @@ #include #include "fio.h" -#include "os.h" static LIST_HEAD(engine_list); diff --git a/memory.c b/memory.c index 8d6f9557..b5a71d53 100644 --- a/memory.c +++ b/memory.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" static void *pinned_mem; diff --git a/os-freebsd.h b/os/os-freebsd.h similarity index 100% rename from os-freebsd.h rename to os/os-freebsd.h diff --git a/os-linux.h b/os/os-linux.h similarity index 100% rename from os-linux.h rename to os/os-linux.h diff --git a/os-solaris.h b/os/os-solaris.h similarity index 100% rename from os-solaris.h rename to os/os-solaris.h diff --git a/os.h b/os/os.h similarity index 100% rename from os.h rename to os/os.h diff --git a/verify.c b/verify.c index 47335107..46e610d7 100644 --- a/verify.c +++ b/verify.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" static void fill_random_bytes(struct thread_data *td, unsigned char *p, unsigned int len) -- 2.25.1