X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=e451f95599cdea980d9c102506b393aae2341920;hp=faa0cfb7427a5549bc31119d5808fd222dfd968e;hb=f11bd94d50d5995a64682f74b5f0f7509bf2c550;hpb=4db4e3d7a52c4561e10af27650a6518e49ecfa7a

diff --git a/fio.h b/fio.h
index faa0cfb7..e451f955 100644
--- a/fio.h
+++ b/fio.h
@@ -17,6 +17,7 @@
 #include "crc32.h"
 #include "arch.h"
 #include "os.h"
+#include "mutex.h"
 
 #ifdef FIO_HAVE_SYSLET
 #include "syslet.h"
@@ -34,7 +35,7 @@ enum td_ddir {
 	TD_DDIR_RAND		= 1 << 2,
 	TD_DDIR_RW		= TD_DDIR_READ | TD_DDIR_WRITE,
 	TD_DDIR_RANDREAD	= TD_DDIR_READ | TD_DDIR_RAND,
-	TD_DDIR_RANDWRITE	= TD_DDIR_WRITE | TD_DDIR_READ,
+	TD_DDIR_RANDWRITE	= TD_DDIR_WRITE | TD_DDIR_RAND,
 	TD_DDIR_RANDRW		= TD_DDIR_RW | TD_DDIR_RAND,
 };
 
@@ -211,11 +212,15 @@ enum fio_filetype {
 
 enum fio_ioengine_flags {
 	FIO_SYNCIO	= 1 << 0,	/* io engine has synchronous ->queue */
-	FIO_CPUIO	= 1 << 1,	/* cpu burner, doesn't do real io */
-	FIO_MMAPIO	= 1 << 2,	/* uses memory mapped io */
-	FIO_RAWIO	= 1 << 3,	/* some sort of direct/raw io */
-	FIO_DISKLESSIO	= 1 << 4,	/* no disk involved */
-	FIO_SELFOPEN	= 1 << 5,       /* opens its own devices */
+	FIO_RAWIO	= 1 << 1,	/* some sort of direct/raw io */
+	FIO_DISKLESSIO	= 1 << 2,	/* no disk involved */
+	FIO_NOEXTEND	= 1 << 3,	/* engine can't extend file */
+	FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
+};
+
+enum fio_file_flags {
+	FIO_FILE_OPEN		= 1 << 0,
+	FIO_FILE_UNLINK		= 1 << 1,
 };
 
 /*
@@ -223,6 +228,8 @@ enum fio_ioengine_flags {
  * this structure holds state information for a single file.
  */
 struct fio_file {
+	enum fio_filetype filetype;
+
 	/*
 	 * A file may not be a file descriptor, let the io engine decide
 	 */
@@ -230,7 +237,7 @@ struct fio_file {
 		unsigned long file_data;
 		int fd;
 	};
-	char *file_name;
+	const char *file_name;
 	void *mmap;
 	unsigned long long file_size;
 	unsigned long long real_file_size;
@@ -245,10 +252,24 @@ struct fio_file {
 	unsigned int num_maps;
 	unsigned int last_free_lookup;
 
-	unsigned int unlink;
+	enum fio_file_flags flags;
 };
 
+/*
+ * How many depth levels to log
+ */
+#define FIO_IO_U_MAP_NR	8
+#define FIO_IO_U_LAT_NR 12
+
 struct thread_stat {
+	char *name;
+	char *verror;
+	int error;
+	int groupid;
+	pid_t pid;
+	char *description;
+	int members;
+
 	struct io_log *slat_log;
 	struct io_log *clat_log;
 	struct io_log *bw_log;
@@ -271,13 +292,18 @@ struct thread_stat {
 	unsigned long usr_time;
 	unsigned long sys_time;
 	unsigned long ctx;
-};
 
-/*
- * How many depth levels to log
- */
-#define FIO_IO_U_MAP_NR	8
-#define FIO_IO_U_LAT_NR 12
+	/*
+	 * IO depth and latency stats
+	 */
+	unsigned int io_u_map[FIO_IO_U_MAP_NR];
+	unsigned int io_u_lat[FIO_IO_U_LAT_NR];
+	unsigned long total_io_u[2];
+
+	unsigned long long io_bytes[2];
+	unsigned long runtime[2];
+	unsigned long total_run_time;
+};
 
 /*
  * This describes a single thread/process executing a fio job.
@@ -288,12 +314,12 @@ struct thread_data {
 	char *name;
 	char *directory;
 	char *filename;
+	char *ioengine;
 	char verror[128];
 	pthread_t thread;
 	int thread_number;
 	int groupid;
 	struct thread_stat ts;
-	enum fio_filetype filetype;
 	struct fio_file *files;
 	unsigned int nr_files;
 	unsigned int nr_open_files;
@@ -361,6 +387,8 @@ struct thread_data {
 	unsigned int rwmixwrite;
 	unsigned int nice;
 	unsigned int file_service_type;
+	unsigned int group_reporting;
+	unsigned int open_files;
 
 	char *read_iolog_file;
 	char *write_iolog_file;
@@ -385,9 +413,6 @@ struct thread_data {
 	 * Current IO depth and list of free and busy io_u's.
 	 */
 	unsigned int cur_depth;
-	unsigned int io_u_map[FIO_IO_U_MAP_NR];
-	unsigned int io_u_lat[FIO_IO_U_LAT_NR];
-	unsigned long total_io_u;
 	struct list_head io_u_freelist;
 	struct list_head io_u_busylist;
 	struct list_head io_u_requeues;
@@ -404,7 +429,6 @@ struct thread_data {
 	unsigned long rate_bytes;
 	struct timeval lastrate;
 
-	unsigned long runtime[2];		/* msec */
 	unsigned long long io_size;
 	unsigned long long total_file_size;
 	unsigned long long start_offset;
@@ -415,7 +439,7 @@ struct thread_data {
 	unsigned long long io_bytes[2];
 	unsigned long long this_io_bytes[2];
 	unsigned long long zone_bytes;
-	volatile int mutex;
+	struct fio_sem *mutex;
 
 	/*
 	 * State for random io, a bitmap of blocks done vs not done
@@ -430,7 +454,6 @@ struct thread_data {
 
 	struct timeval start;	/* start of this loop */
 	struct timeval epoch;	/* time job was started */
-	struct timeval end_time;/* time job ended */
 
 	/*
 	 * read/write mixed workload state
@@ -456,6 +479,13 @@ struct thread_data {
 	 */
 	struct timeval timeout_end;
 	struct itimerval timer;
+
+	/*
+	 * for fileservice, how often to switch to a new file
+	 */
+	unsigned int file_service_nr;
+	unsigned int file_service_left;
+	struct fio_file *file_service_file;
 };
 
 /*
@@ -490,6 +520,7 @@ enum {
 
 extern int exitall_on_terminate;
 extern int thread_number;
+extern int nr_process, nr_thread;
 extern int shm_id;
 extern int groupid;
 extern int terse_output;
@@ -619,9 +650,10 @@ extern int __must_check init_random_state(struct thread_data *);
 extern void close_files(struct thread_data *);
 extern int __must_check setup_files(struct thread_data *);
 extern int __must_check open_files(struct thread_data *);
-extern int open_file(struct thread_data *, struct fio_file *, int, int);
-extern void close_file(struct thread_data *, struct fio_file *);
 extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
+extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
+extern void generic_close_file(struct thread_data *, struct fio_file *);
+extern void add_file(struct thread_data *, const char *);
 
 /*
  * ETA/status stuff
@@ -672,8 +704,10 @@ extern void requeue_io_u(struct thread_data *, struct io_u **);
 extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *);
 extern long __must_check io_u_queued_complete(struct thread_data *, int);
 extern void io_u_queued(struct thread_data *, struct io_u *);
+extern void io_u_log_error(struct thread_data *, struct io_u *);
 extern void io_u_init_timeout(void);
 extern void io_u_set_timeout(struct thread_data *);
+extern void io_u_mark_depth(struct thread_data *, struct io_u *);
 
 /*
  * io engine entry points
@@ -684,30 +718,8 @@ extern int __must_check td_io_queue(struct thread_data *, struct io_u *);
 extern int __must_check td_io_sync(struct thread_data *, struct fio_file *);
 extern int __must_check td_io_getevents(struct thread_data *, int, int, struct timespec *);
 extern int __must_check td_io_commit(struct thread_data *);
-
-/*
- * This is a pretty crappy semaphore implementation, but with the use that fio
- * has (just signalling start/go conditions), it doesn't have to be better.
- * Naturally this would not work for any type of contended semaphore or
- * for real locking.
- */
-static inline void fio_sem_init(volatile int *sem, int val)
-{
-	*sem = val;
-}
-
-static inline void fio_sem_down(volatile int *sem)
-{
-	while (*sem == 0)
-		usleep(10000);
-
-	(*sem)--;
-}
-
-static inline void fio_sem_up(volatile int *sem)
-{
-	(*sem)++;
-}
+extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
+extern void td_io_close_file(struct thread_data *, struct fio_file *);
 
 /*
  * If logging output to a file, stderr should go to both stderr and f_err
@@ -735,12 +747,13 @@ struct ioengine_ops {
 	struct io_u *(*event)(struct thread_data *, int);
 	int (*cancel)(struct thread_data *, struct io_u *);
 	void (*cleanup)(struct thread_data *);
+	int (*open_file)(struct thread_data *, struct fio_file *);
+	void (*close_file)(struct thread_data *, struct fio_file *);
 	void *data;
 	void *dlhandle;
-	unsigned long priv;
 };
 
-#define FIO_IOOPS_VERSION	5
+#define FIO_IOOPS_VERSION	6
 
 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
 extern void register_ioengine(struct ioengine_ops *);
@@ -757,7 +770,7 @@ extern void close_ioengine(struct thread_data *);
 #define for_each_td(td, i)	\
 	for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)	\
-	for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->nr_files; (i)++, (f)++)
+	for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++)
 
 #define fio_assert(td, cond)	do {	\
 	if (!(cond)) {			\