X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=faa06a4f4c280a687e76fc545f2ccb25f775c128;hb=c11883f748f8f192fc6b4b0ec25add8781a8f4a8;hp=f8b8e389800dcac3975788657241db2101dde7e1;hpb=b46928282e0a890f49250e79b81af773a2b7108f;p=fio.git

diff --git a/fio.h b/fio.h
index f8b8e389..faa06a4f 100644
--- a/fio.h
+++ b/fio.h
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "list.h"
 #include "md5.h"
@@ -63,7 +64,7 @@ struct io_u {
 	struct timeval start_time;
 	struct timeval issue_time;
 
-	char *buf;
+	void *buf;
 	unsigned int buflen;
 	unsigned long long offset;
 
@@ -187,25 +188,28 @@ struct thread_data {
 	unsigned int ioprio;
 	unsigned int last_was_sync;
 
-	unsigned char sequential;
-	unsigned char odirect;
-	unsigned char invalidate_cache;
-	unsigned char create_serialize;
-	unsigned char create_fsync;
-	unsigned char end_fsync;
-	unsigned char sync_io;
-	unsigned char verify;
-	unsigned char use_thread;
-	unsigned char unlink;
-	unsigned char do_disk_util;
-	unsigned char override_sync;
-	unsigned char rand_repeatable;
-	unsigned char write_lat_log;
-	unsigned char write_bw_log;
-
-	unsigned int bs;
-	unsigned int min_bs;
-	unsigned int max_bs;
+	unsigned int sequential;
+	unsigned int odirect;
+	unsigned int invalidate_cache;
+	unsigned int create_serialize;
+	unsigned int create_fsync;
+	unsigned int end_fsync;
+	unsigned int sync_io;
+	unsigned int verify;
+	unsigned int use_thread;
+	unsigned int unlink;
+	unsigned int do_disk_util;
+	unsigned int override_sync;
+	unsigned int rand_repeatable;
+	unsigned int write_lat_log;
+	unsigned int write_bw_log;
+	unsigned int norandommap;
+	unsigned int bs_unaligned;
+
+	unsigned int bs[2];
+	unsigned int min_bs[2];
+	unsigned int max_bs[2];
+	unsigned int rw_min_bs;
 	unsigned int thinktime;
 	unsigned int fsync_blocks;
 	unsigned int start_delay;
@@ -344,7 +348,6 @@ struct thread_data {
 #define td_verror(td, err)	__td_verror((td), (err), strerror((err)))
 #define td_vmsg(td, err, msg)	__td_verror((td), (err), (msg))
 
-extern int rate_quit;
 extern int exitall_on_terminate;
 extern int thread_number;
 extern int shm_id;
@@ -352,7 +355,6 @@ extern int groupid;
 extern int terse_output;
 extern FILE *f_out;
 extern FILE *f_err;
-extern char *fio_inst_prefix;
 extern int temp_stall_ts;
 
 extern struct thread_data *threads;
@@ -362,7 +364,7 @@ extern struct thread_data *threads;
 #define td_rw(td)		((td)->iomix != 0)
 
 #define BLOCKS_PER_MAP		(8 * sizeof(long))
-#define TO_MAP_BLOCK(td, f, b)	((b) - ((f)->file_offset / (td)->min_bs))
+#define TO_MAP_BLOCK(td, f, b)	((b) - ((f)->file_offset / (td)->rw_min_bs))
 #define RAND_MAP_IDX(td, f, b)	(TO_MAP_BLOCK(td, f, b) / BLOCKS_PER_MAP)
 #define RAND_MAP_BIT(td, f, b)	(TO_MAP_BLOCK(td, f, b) & (BLOCKS_PER_MAP - 1))
 
@@ -415,6 +417,9 @@ struct io_completion_data {
 #ifndef min
 #define min(a, b)	((a) < (b) ? (a) : (b))
 #endif
+#ifndef max
+#define max(a, b)	((a) > (b) ? (a) : (b))
+#endif
 
 /*
  * Log exports
@@ -452,7 +457,8 @@ extern unsigned long time_since_now(struct timeval *);
 extern unsigned long mtime_since_genesis(void);
 extern void __usec_sleep(unsigned int);
 extern void usec_sleep(struct thread_data *, unsigned long);
-extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
+extern void rate_throttle(struct thread_data *, unsigned long, unsigned int, int);
+extern void fill_start_time(struct timeval *);
 
 /*
  * Init functions
@@ -465,6 +471,7 @@ extern int init_random_state(struct thread_data *);
  */
 extern void close_files(struct thread_data *);
 extern int setup_files(struct thread_data *);
+extern int open_files(struct thread_data *);
 extern int file_invalidate_cache(struct thread_data *, struct fio_file *);
 
 /*
@@ -558,6 +565,7 @@ static inline void fio_sem_up(volatile int *sem)
 	} while (0)
 
 struct ioengine_ops {
+	struct list_head list;
 	char name[16];
 	int version;
 	int flags;
@@ -576,12 +584,16 @@ struct ioengine_ops {
 #define FIO_IOOPS_VERSION	3
 
 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
+extern int register_ioengine(struct ioengine_ops *);
+extern void unregister_ioengine(struct ioengine_ops *);
 extern void close_ioengine(struct thread_data *);
 
 /*
  * 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)++)