Merge branch 'offload-flags-fix' of https://github.com/vincentkfu/fio

[fio.git] / steadystate.h

diff --git a/steadystate.h b/steadystate.h
index f390b073eec564b015519d0626d0baeb981705b0..51472c4698c0cfd72233a62c34cd1226741138a8 100644 (file)
--- a/steadystate.h
+++ b/steadystate.h
@@ -1,15 +1,14 @@
 #ifndef FIO_STEADYSTATE_H
 #define FIO_STEADYSTATE_H
 
-#include "stat.h"
 #include "thread_options.h"
-#include "lib/ieee754.h"
 
+extern void steadystate_free(struct thread_data *);
 extern void steadystate_check(void);
 extern void steadystate_setup(void);
 extern int td_steadystate_init(struct thread_data *);
-extern unsigned long long steadystate_bw_mean(struct thread_stat *);
-extern unsigned long long steadystate_iops_mean(struct thread_stat *);
+extern uint64_t steadystate_bw_mean(struct thread_stat *);
+extern uint64_t steadystate_iops_mean(struct thread_stat *);
 
 extern bool steadystate_enabled;
 
@@ -29,31 +28,40 @@ struct steadystate_data {
        double deviation;
        double criterion;
 
-       unsigned long long sum_y;
-       unsigned long long sum_x;
-       unsigned long long sum_x_sq;
-       unsigned long long sum_xy;
-       unsigned long long oldest_y;
+       uint64_t sum_y;
+       uint64_t sum_x;
+       uint64_t sum_x_sq;
+       uint64_t sum_xy;
+       uint64_t oldest_y;
 
-       struct timeval prev_time;
-       unsigned long long prev_iops;
-       unsigned long long prev_bytes;
+       struct timespec prev_time;
+       uint64_t prev_iops;
+       uint64_t prev_bytes;
 };
 
 enum {
-       __FIO_SS_IOPS           = 1,
-       __FIO_SS_BW             = 2,
-       __FIO_SS_SLOPE          = 4,
-       __FIO_SS_ATTAINED       = 8,
-       __FIO_SS_RAMP_OVER      = 16,
-       __FIO_SS_DATA           = 32,
-       __FIO_SS_PCT            = 64,
-       __FIO_SS_BUFFER_FULL    = 128,
-
-       FIO_SS_IOPS             = __FIO_SS_IOPS,
-       FIO_SS_IOPS_SLOPE       = __FIO_SS_IOPS | __FIO_SS_SLOPE,
-       FIO_SS_BW               = __FIO_SS_BW,
-       FIO_SS_BW_SLOPE         = __FIO_SS_BW | __FIO_SS_SLOPE,
+       __FIO_SS_IOPS = 0,
+       __FIO_SS_BW,
+       __FIO_SS_SLOPE,
+       __FIO_SS_ATTAINED,
+       __FIO_SS_RAMP_OVER,
+       __FIO_SS_DATA,
+       __FIO_SS_PCT,
+       __FIO_SS_BUFFER_FULL,
+};
+
+enum {
+       FIO_SS_IOPS             = 1 << __FIO_SS_IOPS,
+       FIO_SS_BW               = 1 << __FIO_SS_BW,
+       FIO_SS_SLOPE            = 1 << __FIO_SS_SLOPE,
+       FIO_SS_ATTAINED         = 1 << __FIO_SS_ATTAINED,
+       FIO_SS_RAMP_OVER        = 1 << __FIO_SS_RAMP_OVER,
+       FIO_SS_DATA             = 1 << __FIO_SS_DATA,
+       FIO_SS_PCT              = 1 << __FIO_SS_PCT,
+       FIO_SS_BUFFER_FULL      = 1 << __FIO_SS_BUFFER_FULL,
+
+       FIO_SS_IOPS_SLOPE       = FIO_SS_IOPS | FIO_SS_SLOPE,
+       FIO_SS_BW_SLOPE         = FIO_SS_BW | FIO_SS_SLOPE,
 };
 
 #define STEADYSTATE_MSEC       1000