X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=f0b4e6a1d72630c64f4768fe99da6b64527ef730;hb=9b031dc82192e884c1d6da9c86f047ecb9ef5c3a;hp=cb78f255822cc49367e3aba81f5bb1b9464be31f;hpb=02bcaa8c31feb93c61b701d143a7eea3efd2124d;p=fio.git

diff --git a/fio.h b/fio.h
index cb78f255..f0b4e6a1 100644
--- a/fio.h
+++ b/fio.h
@@ -18,6 +18,12 @@
 #include "arch.h"
 #include "os.h"
 
+enum fio_ddir {
+	DDIR_READ = 0,
+	DDIR_WRITE,
+	DDIR_SYNC,
+};
+
 struct io_stat {
 	unsigned long val;
 	unsigned long val_sq;
@@ -29,7 +35,7 @@ struct io_stat {
 struct io_sample {
 	unsigned long time;
 	unsigned long val;
-	unsigned int ddir;
+	enum fio_ddir ddir;
 };
 
 struct io_log {
@@ -43,7 +49,7 @@ struct io_piece {
 	struct fio_file *file;
 	unsigned long long offset;
 	unsigned int len;
-	int ddir;
+	enum fio_ddir ddir;
 };
 
 /*
@@ -71,7 +77,7 @@ struct io_u {
 	unsigned int resid;
 	unsigned int error;
 
-	unsigned char ddir;
+	enum fio_ddir ddir;
 
 	/*
 	 * io engine private data
@@ -111,12 +117,6 @@ struct group_run_stats {
 	unsigned long long agg[2];
 };
 
-enum fio_ddir {
-	DDIR_READ = 0,
-	DDIR_WRITE,
-	DDIR_SYNC,
-};
-
 /*
  * What type of allocation to use for io buffers
  */
@@ -160,6 +160,8 @@ struct fio_file {
 
 	unsigned long *file_map;
 	unsigned int num_maps;
+
+	unsigned int unlink;
 };
 
 /*
@@ -308,6 +310,7 @@ struct thread_data {
 
 	struct timeval start;	/* start of this loop */
 	struct timeval epoch;	/* time job was started */
+	struct timeval end_time;/* time job ended */
 
 	/*
 	 * fio system usage accounting
@@ -357,6 +360,7 @@ extern int terse_output;
 extern FILE *f_out;
 extern FILE *f_err;
 extern int temp_stall_ts;
+extern unsigned long long mlock_size;
 
 extern struct thread_data *threads;
 
@@ -436,9 +440,9 @@ 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, struct timeval *);
+extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long);
+extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long);
+extern void add_bw_sample(struct thread_data *, enum fio_ddir, struct timeval *);
 extern void show_run_stats(void);
 extern void init_disk_util(struct thread_data *);
 extern void update_rusage_stat(struct thread_data *);
@@ -452,6 +456,7 @@ extern int setup_rate(struct thread_data *);
  * Time functions
  */
 extern unsigned long utime_since(struct timeval *, struct timeval *);
+extern unsigned long utime_since_now(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 *);