[PATCH] Shorten the file names, stupid to prefix everything with fio-
diff --git a/Makefile b/Makefile
index 16c8413..684e8e0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
all: depend $(PROGS) $(SCRIPTS)
-fio: fio.o fio-io.o fio-ini.o fio-stat.o fio-log.o fio-time.o md5.o crc32.o
+fio: fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -laio -lm -lrt
clean:
diff --git a/fio-log.h b/fio-log.h
deleted file mode 100644
index 99bb9f7..0000000
--- a/fio-log.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef FIO_LOG_H
-#define FIO_LOG_H
-
-extern int read_iolog_get(struct thread_data *, struct io_u *);
-extern void write_iolog_put(struct thread_data *, struct io_u *);
-extern int init_iolog(struct thread_data *td);
-extern void log_io_piece(struct thread_data *, struct io_u *);
-extern void prune_io_piece_log(struct thread_data *);
-extern void write_iolog_close(struct thread_data *);
-
-#endif
diff --git a/fio-stat.h b/fio-stat.h
deleted file mode 100644
index b1ce677..0000000
--- a/fio-stat.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef FIO_STAT_H
-#define FIO_STAT_H
-
-extern void add_clat_sample(struct thread_data *, int, unsigned long);
-extern void add_slat_sample(struct thread_data *, int, unsigned long);
-extern void add_bw_sample(struct thread_data *, int);
-extern void show_run_stats(void);
-extern void init_disk_util(struct thread_data *);
-extern void update_rusage_stat(struct thread_data *);
-extern void update_io_ticks(void);
-extern void disk_util_timer_arm(void);
-#endif
diff --git a/fio-time.h b/fio-time.h
deleted file mode 100644
index 4be3c4f..0000000
--- a/fio-time.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef FIO_TIME_H
-#define FIO_TIME_H
-
-extern unsigned long utime_since(struct timeval *, struct timeval *);
-extern unsigned long mtime_since(struct timeval *, struct timeval *);
-extern unsigned long mtime_since_now(struct timeval *);
-extern unsigned long time_since_now(struct timeval *);
-extern void usec_sleep(struct thread_data *, unsigned long);
-
-extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
-
-#endif
diff --git a/fio.c b/fio.c
index 1eeb1cc..8ac4452 100644
--- a/fio.c
+++ b/fio.c
@@ -34,10 +34,6 @@
#include "fio.h"
#include "os.h"
-#include "fio-time.h"
-#include "fio-stat.h"
-#include "fio-log.h"
-
#define MASK (4095)
#define ALIGN(buf) (char *) (((unsigned long) (buf) + MASK) & ~(MASK))
diff --git a/fio.h b/fio.h
index 58fabbd..045fd01 100644
--- a/fio.h
+++ b/fio.h
@@ -353,4 +353,36 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
+/*
+ * Log exports
+ */
+extern int read_iolog_get(struct thread_data *, struct io_u *);
+extern void write_iolog_put(struct thread_data *, struct io_u *);
+extern int init_iolog(struct thread_data *td);
+extern void log_io_piece(struct thread_data *, struct io_u *);
+extern void prune_io_piece_log(struct thread_data *);
+extern void write_iolog_close(struct thread_data *);
+
+/*
+ * Logging
+ */
+extern void add_clat_sample(struct thread_data *, int, unsigned long);
+extern void add_slat_sample(struct thread_data *, int, unsigned long);
+extern void add_bw_sample(struct thread_data *, int);
+extern void show_run_stats(void);
+extern void init_disk_util(struct thread_data *);
+extern void update_rusage_stat(struct thread_data *);
+extern void update_io_ticks(void);
+extern void disk_util_timer_arm(void);
+
+/*
+ * Time functions
+ */
+extern unsigned long utime_since(struct timeval *, struct timeval *);
+extern unsigned long mtime_since(struct timeval *, struct timeval *);
+extern unsigned long mtime_since_now(struct timeval *);
+extern unsigned long time_since_now(struct timeval *);
+extern void usec_sleep(struct thread_data *, unsigned long);
+extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
+
#endif
diff --git a/fio-ini.c b/init.c
similarity index 100%
rename from fio-ini.c
rename to init.c
diff --git a/fio-io.c b/ioengines.c
similarity index 100%
rename from fio-io.c
rename to ioengines.c
diff --git a/fio-log.c b/log.c
similarity index 100%
rename from fio-log.c
rename to log.c
diff --git a/fio-stat.c b/stat.c
similarity index 99%
rename from fio-stat.c
rename to stat.c
index 70c653d..5452716 100644
--- a/fio-stat.c
+++ b/stat.c
@@ -7,7 +7,6 @@
#include <math.h>
#include "fio.h"
-#include "fio-time.h"
static struct itimerval itimer;
static LIST_HEAD(disk_list);
diff --git a/fio-time.c b/time.c
similarity index 100%
rename from fio-time.c
rename to time.c