Move variables to backend, fix up line spaces
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/backend.c b/backend.c
index 821e978..efb17b3 100644
--- a/backend.c
+++ b/backend.c
@@ -58,6 +58,14 @@
struct io_log *agg_io_log[2];
+int groupid = 0;
+unsigned int thread_number = 0;
+unsigned int nr_process = 0;
+unsigned int nr_thread = 0;
+int shm_id = 0;
+int temp_stall_ts;
+unsigned long done_secs = 0;
+
#define PAGE_ALIGN(buf) \
(char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
@@ -285,6 +293,7 @@
return 0;
}
+
static inline void __update_tv_cache(struct thread_data *td)
{
fio_gettime(&td->tv_cache, NULL);
@@ -354,8 +363,6 @@
return 0;
}
-
-
/*
* The main verify engine. Runs over the writes we previously submitted,
* reads the blocks back in, and checks the crc/md5 of the data.
@@ -1302,8 +1309,6 @@
fio_terminate_threads(TERMINATE_ALL);
}
-
-
/*
* Main function for kicking off and reaping jobs, as needed.
*/
@@ -1579,7 +1584,6 @@
return 0;
}
-
int fio_backend(void)
{
struct thread_data *td;
@@ -1634,5 +1638,3 @@
fio_mutex_remove(writeout_mutex);
return exit_value;
}
-
-
diff --git a/fio.c b/fio.c
index f0a8ee2..5a99318 100644
--- a/fio.c
+++ b/fio.c
@@ -51,23 +51,6 @@
unsigned long page_mask;
unsigned long page_size;
-int groupid = 0;
-unsigned int thread_number = 0;
-unsigned int nr_process = 0;
-unsigned int nr_thread = 0;
-int shm_id = 0;
-int temp_stall_ts;
-unsigned long done_secs = 0;
-
-/*
- * Just expose an empty list, if the OS does not support disk util stats
- */
-#ifndef FIO_HAVE_DISK_UTIL
-FLIST_HEAD(disk_list);
-#endif
-
-unsigned long arch_flags = 0;
-
static int endian_check(void)
{
union {
diff --git a/libfio.c b/libfio.c
index cb917ce..76a36a6 100644
--- a/libfio.c
+++ b/libfio.c
@@ -25,6 +25,15 @@
#include <string.h>
#include "fio.h"
+/*
+ * Just expose an empty list, if the OS does not support disk util stats
+ */
+#ifndef FIO_HAVE_DISK_UTIL
+FLIST_HEAD(disk_list);
+#endif
+
+unsigned long arch_flags = 0;
+
static const char *fio_os_strings[os_nr] = {
"Invalid",
"Linux",