Makefile: break long line

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index cb917cef99af8c4be0e301992f2f97bc2e291000..43e1a61aad8abbf217da11125ac6818defaaa2c8 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -23,8 +23,19 @@
  */
 
 #include <string.h>
+#include <sys/types.h>
+#include <signal.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",
@@ -55,13 +66,16 @@ static const char *fio_arch_strings[arch_nr] = {
 
 static void reset_io_counters(struct thread_data *td)
 {
-       td->stat_io_bytes[0] = td->stat_io_bytes[1] = 0;
-       td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
-       td->stat_io_blocks[0] = td->stat_io_blocks[1] = 0;
-       td->this_io_blocks[0] = td->this_io_blocks[1] = 0;
+       int ddir;
+       for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
+               td->stat_io_bytes[ddir] = 0;
+               td->this_io_bytes[ddir] = 0;
+               td->stat_io_blocks[ddir] = 0;
+               td->this_io_blocks[ddir] = 0;
+               td->rate_bytes[ddir] = 0;
+               td->rate_blocks[ddir] = 0;
+       }
        td->zone_bytes = 0;
-       td->rate_bytes[0] = td->rate_bytes[1] = 0;
-       td->rate_blocks[0] = td->rate_blocks[1] = 0;
 
        td->last_was_sync = 0;
 
@@ -96,16 +110,15 @@ void reset_all_stats(struct thread_data *td)
 
        reset_io_counters(td);
 
-       for (i = 0; i < 2; i++) {
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                td->io_bytes[i] = 0;
                td->io_blocks[i] = 0;
                td->io_issues[i] = 0;
                td->ts.total_io_u[i] = 0;
+               td->ts.runtime[i] = 0;
        }
 
        fio_gettime(&tv, NULL);
-       td->ts.runtime[0] = 0;
-       td->ts.runtime[1] = 0;
        memcpy(&td->epoch, &tv, sizeof(tv));
        memcpy(&td->start, &tv, sizeof(tv));
 }