X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=fio.h;h=5bf8c43d3f9b0736422cf9fa3bb9973eaeafd81a;hb=0ad920e7f85db1fdc26649be6bc7e584e8c7fdc9;hp=12cf3c9a686b4a389cacd4da13736d0a0d0d8bf8;hpb=07739b57f09886b41323c605b0dbda7d2c12522b;p=fio.git

diff --git a/fio.h b/fio.h
index 12cf3c9a..5bf8c43d 100644
--- a/fio.h
+++ b/fio.h
@@ -212,9 +212,16 @@ 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_RAWIO	= 1 << 2,	/* some sort of direct/raw io */
-	FIO_DISKLESSIO	= 1 << 3,	/* no disk involved */
+	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,	/* file is open */
+	FIO_FILE_UNLINK		= 1 << 1,	/* unlink on close */
+	FIO_FILE_CLOSING	= 1 << 2,	/* file being closed */
 };
 
 /*
@@ -222,6 +229,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
 	 */
@@ -229,7 +238,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;
@@ -244,8 +253,8 @@ struct fio_file {
 	unsigned int num_maps;
 	unsigned int last_free_lookup;
 
-	unsigned int unlink;
-	unsigned int open;
+	int references;
+	enum fio_file_flags flags;
 };
 
 /*
@@ -291,7 +300,7 @@ struct thread_stat {
 	 */
 	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;
+	unsigned long total_io_u[2];
 
 	unsigned long long io_bytes[2];
 	unsigned long runtime[2];
@@ -307,12 +316,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;
@@ -472,6 +481,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;
 };
 
 /*
@@ -506,6 +522,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;
@@ -638,6 +655,9 @@ extern int __must_check open_files(struct thread_data *);
 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 *);
+extern void get_file(struct fio_file *);
+extern void put_file(struct thread_data *, struct fio_file *);
 
 /*
  * ETA/status stuff
@@ -691,6 +711,7 @@ 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
@@ -753,7 +774,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)->open_files; (i)++, (f)++)
+	for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++)
 
 #define fio_assert(td, cond)	do {	\
 	if (!(cond)) {			\