X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=39d95874f22fe2277ddb56c1c643f2269d716374;hp=66b70ef8c52266e405bd6d1e14459d10e442cc39;hb=c6ae0a5b8123ea9af2ce70319081fbd5d65c8093;hpb=e9c047a0d8dfc32634b896e1600c6f1aa4174378

diff --git a/fio.h b/fio.h
index 66b70ef8..39d95874 100644
--- a/fio.h
+++ b/fio.h
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "list.h"
 #include "md5.h"
@@ -152,7 +153,6 @@ struct thread_data {
 	size_t orig_buffer_size;
 	volatile int terminate;
 	volatile int runstate;
-	volatile int old_runstate;
 	enum fio_ddir ddir;
 	unsigned int iomix;
 	unsigned int ioprio;
@@ -169,6 +169,7 @@ struct thread_data {
 	unsigned char use_thread;
 	unsigned char do_disk_util;
 	unsigned char override_sync;
+	unsigned char rand_repeatable;
 
 	unsigned int bs;
 	unsigned int min_bs;
@@ -191,7 +192,6 @@ struct thread_data {
 	unsigned int numjobs;
 	unsigned int iodepth;
 	os_cpu_mask_t cpumask;
-	unsigned int jobnum;
 	unsigned int iolog;
 	unsigned int read_iolog;
 	unsigned int write_iolog;
@@ -324,6 +324,9 @@ extern int exitall_on_terminate;
 extern int thread_number;
 extern int shm_id;
 extern int groupid;
+extern int terse_output;
+extern FILE *f_out;
+extern FILE *f_err;
 
 extern struct thread_data *threads;
 
@@ -439,4 +442,13 @@ static inline void fio_sem_up(volatile int volatile *sem)
 	(*sem)++;
 }
 
+/*
+ * If logging output to a file, stderr should go to both stderr and f_err
+ */
+#define log_err(args...)	do {		\
+	fprintf(f_err, ##args);			\
+	if (f_err != stderr)			\
+		fprintf(stderr, ##args);	\
+	} while (0)
+
 #endif