server: properly configure port without argument

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index ab0d6a49f63b453224a854925405373895d24e33..04963cd8b1680e6cb7062e8eb0696eba579310a9 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -16,10 +16,6 @@
 
 struct thread_data;
 
-#define FIO_MAJOR      1
-#define FIO_MINOR      99
-#define FIO_PATCH      0
-
 #include "compiler/compiler.h"
 #include "flist.h"
 #include "fifo.h"
@@ -139,6 +135,7 @@ struct thread_options {
        unsigned int use_os_rand;
        unsigned int write_lat_log;
        unsigned int write_bw_log;
+       unsigned int write_iops_log;
        unsigned int norandommap;
        unsigned int softrandommap;
        unsigned int bs_unaligned;
@@ -157,6 +154,7 @@ struct thread_options {
        unsigned long long ramp_time;
        unsigned int overwrite;
        unsigned int bw_avg_time;
+       unsigned int iops_avg_time;
        unsigned int loops;
        unsigned long long zone_size;
        unsigned long long zone_skip;
@@ -203,6 +201,7 @@ struct thread_options {
        char *write_iolog_file;
        char *bw_log_file;
        char *lat_log_file;
+       char *iops_log_file;
        char *replay_redirect;
 
        /*
@@ -265,9 +264,13 @@ struct thread_data {
        struct io_log *clat_log;
        struct io_log *lat_log;
        struct io_log *bw_log;
+       struct io_log *iops_log;
 
        uint64_t stat_io_bytes[2];
-       struct timeval stat_sample_time[2];
+       struct timeval bw_sample_time;
+
+       uint64_t stat_io_blocks[2];
+       struct timeval iops_sample_time;
 
        struct rusage ru_start;
        struct rusage ru_end;
@@ -365,6 +368,7 @@ struct thread_data {
 
        unsigned long io_issues[2];
        unsigned long long io_blocks[2];
+       unsigned long long this_io_blocks[2];
        unsigned long long io_bytes[2];
        unsigned long long io_skip_bytes;
        unsigned long long this_io_bytes[2];
@@ -697,4 +701,7 @@ static inline void td_io_u_free_notify(struct thread_data *td)
                pthread_cond_signal(&td->free_cond);
 }
 
+extern const char *fio_get_arch_string(int);
+extern const char *fio_get_os_string(int);
+
 #endif