X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=steadystate.h;h=20ccd3035f11d67ca751d78be6135be85517d6e0;hp=5342b2cd283844b9cd63bb860582e38303eeef67;hb=51b4c81e5ff1316d5654a8d5ed0fe56deffb2093;hpb=84784e07d285601946e42e8cbad2603bcc1905c6

diff --git a/steadystate.h b/steadystate.h
index 5342b2cd..20ccd303 100644
--- a/steadystate.h
+++ b/steadystate.h
@@ -1,68 +1,61 @@
 #ifndef FIO_STEADYSTATE_H
 #define FIO_STEADYSTATE_H
 
+#include "stat.h"
 #include "thread_options.h"
+#include "lib/ieee754.h"
 
 extern void steadystate_check(void);
 extern void steadystate_setup(void);
-extern void steadystate_alloc(struct thread_data *);
+extern int td_steadystate_init(struct thread_data *);
+extern uint64_t steadystate_bw_mean(struct thread_stat *);
+extern uint64_t steadystate_iops_mean(struct thread_stat *);
 
 extern bool steadystate_enabled;
 
-/*
- * For steady state detection
- */
 struct steadystate_data {
 	double limit;
 	unsigned long long dur;
 	unsigned long long ramp_time;
-	bool check_iops;
-	bool check_slope;
-	bool pct;
 
-	int attained;
-	int last_in_group;
-	int ramp_time_over;
+	uint32_t state;
 
 	unsigned int head;
 	unsigned int tail;
-	unsigned long *iops_data;
-	unsigned long *bw_data;
+	uint64_t *iops_data;
+	uint64_t *bw_data;
 
 	double slope;
-	double criterion;
 	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;
+	uint64_t prev_iops;
+	uint64_t prev_bytes;
 };
 
 enum {
-	FIO_STEADYSTATE_IOPS	= 0,
-	FIO_STEADYSTATE_IOPS_SLOPE,
-	FIO_STEADYSTATE_BW,
-	FIO_STEADYSTATE_BW_SLOPE,
+	__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,
 };
 
 #define STEADYSTATE_MSEC	1000
 
-static inline bool steadystate_check_slope(struct thread_options *o)
-{
-	return o->ss == FIO_STEADYSTATE_IOPS_SLOPE ||
-		o->ss == FIO_STEADYSTATE_BW_SLOPE;
-}
-
-static inline bool steadystate_check_iops(struct thread_options *o)
-{
-	return o->ss == FIO_STEADYSTATE_IOPS ||
-		o->ss == FIO_STEADYSTATE_IOPS_SLOPE;
-}
-
 #endif