X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=965d7d9c7a4c0804396e91c149a3165381b7bff7;hb=4a88752ad8e0b67ef9499262998d221559d6dac1;hp=c8c8b7abdd46db6e4743b2262f9047bffc7cceed;hpb=ba9c7219eefcc04e84a4fb4970f4b5caeaf48aa6;p=fio.git

diff --git a/fio.h b/fio.h
index c8c8b7ab..965d7d9c 100644
--- a/fio.h
+++ b/fio.h
@@ -14,13 +14,10 @@
 #include <inttypes.h>
 #include <assert.h>
 
-struct thread_data;
-
 #include "compiler/compiler.h"
 #include "thread_options.h"
 #include "flist.h"
 #include "fifo.h"
-#include "lib/rbtree.h"
 #include "arch/arch.h"
 #include "os/os.h"
 #include "mutex.h"
@@ -37,6 +34,7 @@ struct thread_data;
 #include "gettime.h"
 #include "lib/getopt.h"
 #include "lib/rand.h"
+#include "lib/rbtree.h"
 #include "client.h"
 #include "server.h"
 #include "stat.h"
@@ -83,6 +81,7 @@ enum {
 	FIO_RAND_FILE_SIZE_OFF,
 	FIO_RAND_TRIM_OFF,
 	FIO_RAND_BUF_OFF,
+	FIO_RAND_SEQ_RAND_OFF,
 	FIO_RAND_NR_OFFS,
 };
 
@@ -257,6 +256,14 @@ struct thread_data {
 	enum fio_ddir rwmix_ddir;
 	unsigned int ddir_seq_nr;
 
+	/*
+	 * rand/seq mixed workload state
+	 */
+	union {
+		os_random_state_t seq_rand_state;
+		struct frand_state __seq_rand_state;
+	};
+
 	/*
 	 * IO history logs for verification. We use a tree for sorting,
 	 * if we are overwriting. Otherwise just use a fifo.
@@ -323,9 +330,9 @@ enum {
 
 #define __td_verror(td, err, msg, func)					\
 	do {								\
+		int e = (err);						\
 		if ((td)->error)					\
 			break;						\
-		int e = (err);						\
 		(td)->error = e;					\
 		if (!(td)->first_error)					\
 			snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));		\
@@ -364,6 +371,7 @@ extern int terse_version;
 extern int is_backend;
 extern int nr_clients;
 extern int log_syslog;
+extern int status_interval;
 extern const char fio_version_string[];
 
 extern struct thread_data *threads;
@@ -375,41 +383,6 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 
 #define REAL_MAX_JOBS		2048
 
-static inline enum error_type_bit td_error_type(enum fio_ddir ddir, int err)
-{
-	if (err == EILSEQ)
-		return ERROR_TYPE_VERIFY_BIT;
-	if (ddir == DDIR_READ)
-		return ERROR_TYPE_READ_BIT;
-	return ERROR_TYPE_WRITE_BIT;
-}
-
-static int __NON_FATAL_ERR[] = {EIO, EILSEQ};
-static inline int td_non_fatal_error(struct thread_data *td,
-				     enum error_type_bit etype, int err)
-{
-	int i;
-	if (!td->o.ignore_error[etype]) {
-		td->o.ignore_error[etype] = __NON_FATAL_ERR;
-		td->o.ignore_error_nr[etype] = sizeof(__NON_FATAL_ERR)
-			/ sizeof(int);
-	}
-
-	if (!(td->o.continue_on_error & (1 << etype)))
-		return 0;
-	for (i = 0; i < td->o.ignore_error_nr[etype]; i++)
-		if (td->o.ignore_error[etype][i] == err)
-			return 1;
-	return 0;
-}
-
-static inline void update_error_count(struct thread_data *td, int err)
-{
-	td->total_err_count++;
-	if (td->total_err_count == 1)
-		td->first_error = err;
-}
-
 static inline int should_fsync(struct thread_data *td)
 {
 	if (td->last_was_sync)
@@ -445,8 +418,8 @@ extern void add_job_opts(const char **, int);
 extern char *num2str(unsigned long, int, int, int, int);
 extern int ioengine_load(struct thread_data *);
 
-extern unsigned long page_mask;
-extern unsigned long page_size;
+extern uintptr_t page_mask;
+extern uintptr_t page_size;
 extern int initialize_fio(char *envp[]);
 
 #define FIO_GETOPT_JOB		0x89000000
@@ -506,13 +479,6 @@ extern int is_blktrace(const char *);
 extern int load_blktrace(struct thread_data *, const char *);
 #endif
 
-/*
- * Mark unused variables passed to ops functions as unused, to silence gcc
- */
-#define fio_unused	__attribute((__unused__))
-#define fio_init	__attribute__((constructor))
-#define fio_exit	__attribute__((destructor))
-
 #define for_each_td(td, i)	\
 	for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)	\
@@ -578,6 +544,14 @@ static inline unsigned int td_max_bs(struct thread_data *td)
 	return max(td->o.max_bs[DDIR_TRIM], max_bs);
 }
 
+static inline unsigned int td_min_bs(struct thread_data *td)
+{
+	unsigned int min_bs;
+
+	min_bs = min(td->o.min_bs[DDIR_READ], td->o.min_bs[DDIR_WRITE]);
+	return min(td->o.min_bs[DDIR_TRIM], min_bs);
+}
+
 static inline int is_power_of_2(unsigned int val)
 {
 	return (val != 0 && ((val & (val - 1)) == 0));