X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=89d7bf94d1c72b9ca160d0b2c4c6f21fbc9296b3;hb=8914a9d83c67a2ead861ac997a1d4b06d02639bc;hp=e997fbe52f3c6ae900a5909f8c1bd44452f4b26d;hpb=aea47d444b02bd7c622f82bb73151fd7136a499f;p=fio.git

diff --git a/fio.h b/fio.h
index e997fbe5..89d7bf94 100644
--- a/fio.h
+++ b/fio.h
@@ -7,6 +7,9 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <semaphore.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include "list.h"
 #include "md5.h"
@@ -94,13 +97,14 @@ struct verify_header {
 struct group_run_stats {
 	unsigned long long max_run[2], min_run[2];
 	unsigned long long max_bw[2], min_bw[2];
-	unsigned long long io_mb[2];
+	unsigned long long io_kb[2];
 	unsigned long long agg[2];
 };
 
 struct thread_data {
+	char name[64];
 	char file_name[256];
-	char directory[256];
+	char *directory;
 	char verror[80];
 	pthread_t thread;
 	int thread_number;
@@ -134,6 +138,7 @@ struct thread_data {
 	unsigned int bw_avg_time;
 	unsigned int create_serialize;
 	unsigned int create_fsync;
+	unsigned int end_fsync;
 	unsigned int loops;
 	unsigned long long file_size;
 	unsigned long long real_file_size;
@@ -150,8 +155,19 @@ struct thread_data {
 	os_cpu_mask_t cpumask;
 	unsigned int jobnum;
 	unsigned int iolog;
+	unsigned int read_iolog;
+	unsigned int write_iolog;
+	unsigned int rwmixcycle;
+	unsigned int rwmixread;
+	unsigned int nice;
 
-	char iolog_file[256];
+	char *iolog_file;
+	void *iolog_buf;
+	FILE *iolog_f;
+
+	char *sysfs_root;
+
+	char *ioscheduler;
 
 	struct drand48_data bsrange_state;
 	struct drand48_data verify_state;
@@ -221,6 +237,16 @@ struct thread_data {
 	unsigned int do_disk_util;
 	unsigned int override_sync;
 
+	struct drand48_data rwmix_state;
+	struct timeval rwmix_switch;
+	int rwmix_ddir;
+
+	/*
+	 * Pre-run and post-run shell
+	 */
+	char *exec_prerun;
+	char *exec_postrun;
+
 	struct list_head io_hist_list;
 	struct list_head io_log_list;
 };
@@ -232,10 +258,6 @@ struct thread_data {
 		snprintf(td->verror, sizeof(td->verror) - 1, "file:%s:%d, error=%s", __FILE__, __LINE__, strerror(e));	\
 	} while (0)
 
-extern int parse_jobs_ini(char *);
-extern int parse_options(int, char **);
-extern void finish_log(struct thread_data *, struct io_log *, const char *);
-extern int init_random_state(struct thread_data *);
 extern struct io_u *__get_io_u(struct thread_data *);
 extern void put_io_u(struct thread_data *, struct io_u *);
 
@@ -278,6 +300,7 @@ enum {
 	FIO_LIBAIO	= 1 << 2,
 	FIO_POSIXAIO	= 1 << 3,
 	FIO_SGIO	= 1 << 4,
+	FIO_SPLICEIO	= 1 << 5 | FIO_SYNCIO,
 };
 
 #define td_read(td)		((td)->ddir == DDIR_READ)
@@ -327,4 +350,45 @@ struct io_completion_data {
 #define min(a, b)	((a) < (b) ? (a) : (b))
 #endif
 
+/*
+ * Log exports
+ */
+extern int read_iolog_get(struct thread_data *, struct io_u *);
+extern void write_iolog_put(struct thread_data *, struct io_u *);
+extern int init_iolog(struct thread_data *td);
+extern void log_io_piece(struct thread_data *, struct io_u *);
+extern void prune_io_piece_log(struct thread_data *);
+extern void write_iolog_close(struct thread_data *);
+
+/*
+ * Logging
+ */
+extern void add_clat_sample(struct thread_data *, int, unsigned long);
+extern void add_slat_sample(struct thread_data *, int, unsigned long);
+extern void add_bw_sample(struct thread_data *, int);
+extern void show_run_stats(void);
+extern void init_disk_util(struct thread_data *);
+extern void update_rusage_stat(struct thread_data *);
+extern void update_io_ticks(void);
+extern void disk_util_timer_arm(void);
+extern void setup_log(struct io_log **);
+extern void finish_log(struct thread_data *, struct io_log *, const char *);
+extern int setup_rate(struct thread_data *);
+
+/*
+ * Time functions
+ */
+extern unsigned long utime_since(struct timeval *, struct timeval *);
+extern unsigned long mtime_since(struct timeval *, struct timeval *);
+extern unsigned long mtime_since_now(struct timeval *);
+extern unsigned long time_since_now(struct timeval *);
+extern void usec_sleep(struct thread_data *, unsigned long);
+extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
+
+/*
+ * Init functions
+ */
+extern int parse_options(int, char **);
+extern int init_random_state(struct thread_data *);
+
 #endif