X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=f2e3adf26273b2cfa3dfaa0a48bdcb00a826f565;hp=01c8b9baa566fab534ab042a637e62fc6b2d74f9;hb=80b9feb08908e0493825043f807fcbea4591e09b;hpb=843a741389226f5f2d0ce8636cd57532be9b7e4d

diff --git a/fio.h b/fio.h
index 01c8b9ba..f2e3adf2 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;
@@ -150,13 +154,21 @@ struct thread_data {
 	unsigned int iodepth;
 	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;
 
@@ -225,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;
 };
@@ -332,4 +354,36 @@ 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);
+
+/*
+ * 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);
+
 #endif