X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=ff59b467ba70dcf478959da266f681ec2495c9e7;hp=4af6a74339468ea32000680abd16dc8c4bf54809;hb=a4f4fdd7c9e46a50bc33ecef44d9f06036580ad4;hpb=ec94ec567cae47f91fa31a18250c2a7a0029d2ad

diff --git a/fio.h b/fio.h
index 4af6a743..ff59b467 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"
@@ -17,34 +18,63 @@
 #include "arch.h"
 #include "os.h"
 
+#include "syslet.h"
+
+enum fio_ddir {
+	DDIR_READ = 0,
+	DDIR_WRITE,
+	DDIR_SYNC,
+};
+
+/*
+ * Use for maintaining statistics
+ */
 struct io_stat {
-	unsigned long val;
-	unsigned long val_sq;
 	unsigned long max_val;
 	unsigned long min_val;
 	unsigned long samples;
+
+	double mean;
+	double S;
 };
 
+/*
+ * A single data sample
+ */
 struct io_sample {
 	unsigned long time;
 	unsigned long val;
-	unsigned int ddir;
+	enum fio_ddir ddir;
 };
 
+/*
+ * Dynamically growing data sample log
+ */
 struct io_log {
 	unsigned long nr_samples;
 	unsigned long max_samples;
 	struct io_sample *log;
 };
 
+/*
+ * When logging io actions, this matches a single sent io_u
+ */
 struct io_piece {
 	struct list_head list;
 	struct fio_file *file;
 	unsigned long long offset;
-	unsigned int len;
-	int ddir;
+	unsigned long len;
+	enum fio_ddir ddir;
 };
 
+#ifdef FIO_HAVE_SYSLET
+struct syslet_req {
+	struct syslet_uatom atom;
+	unsigned long cmd;
+	long ret;
+};
+#endif
+
 /*
  * The io unit
  */
@@ -58,21 +88,41 @@ struct io_u {
 #endif
 #ifdef FIO_HAVE_SGIO
 		struct sg_io_hdr hdr;
+#endif
+#ifdef FIO_HAVE_SYSLET
+		struct syslet_req rw_atom;
+		struct syslet_req seek_atom;
 #endif
 	};
 	struct timeval start_time;
 	struct timeval issue_time;
 
-	char *buf;
-	unsigned int buflen;
+	/*
+	 * Allocated/set buffer and length
+	 */
+	void *buf;
+	unsigned long buflen;
 	unsigned long long offset;
-	unsigned int index;
+
+	/*
+	 * IO engine state, may be different from above when we get
+	 * partial transfers / residual data counts
+	 */
+	void *xfer_buf;
+	unsigned long xfer_buflen;
 
 	unsigned int resid;
 	unsigned int error;
 
-	unsigned char seen;
-	unsigned char ddir;
+	enum fio_ddir ddir;
+
+	/*
+	 * io engine private data
+	 */
+	union {
+		unsigned int index;
+		unsigned int seen;
+	};
 
 	struct fio_file *file;
 
@@ -82,11 +132,14 @@ struct io_u {
 #define FIO_HDR_MAGIC	0xf00baaef
 
 enum {
-	VERIFY_NONE = 0,
-	VERIFY_MD5,
-	VERIFY_CRC32,
+	VERIFY_NONE = 0,		/* no verification */
+	VERIFY_MD5,			/* md5 sum data blocks */
+	VERIFY_CRC32,			/* crc32 sum data blocks */
 };
 
+/*
+ * A header structure associated with each checksummed data block
+ */
 struct verify_header {
 	unsigned int fio_magic;
 	unsigned int len;
@@ -104,43 +157,46 @@ struct group_run_stats {
 	unsigned long long agg[2];
 };
 
-enum fio_ddir {
-	DDIR_READ = 0,
-	DDIR_WRITE,
-};
-
 /*
  * What type of allocation to use for io buffers
  */
 enum fio_memtype {
 	MEM_MALLOC = 0,	/* ordinary malloc */
 	MEM_SHM,	/* use shared memory segments */
+	MEM_SHMHUGE,	/* use shared memory segments with huge pages */
 	MEM_MMAP,	/* use anonynomous mmap */
+	MEM_MMAPHUGE,	/* memory mapped huge file */
 };
 
 /*
  * The type of object we are working on
  */
 enum fio_filetype {
-	FIO_TYPE_FILE = 1,
-	FIO_TYPE_BD,
-	FIO_TYPE_CHAR,
+	FIO_TYPE_FILE = 1,		/* plain file */
+	FIO_TYPE_BD,			/* block device */
+	FIO_TYPE_CHAR,			/* character device */
 };
 
 enum fio_ioengine_flags {
-	FIO_SYNCIO	= 1 << 0,
-	FIO_CPUIO	= 1 << 1,
-	FIO_MMAPIO	= 1 << 2,
-	FIO_RAWIO	= 1 << 3,
+	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_NETIO	= 1 << 4,	/* networked io */
+	FIO_NULLIO	= 1 << 5,	/* no real data transfer (cpu/null) */
 };
 
+/*
+ * Each thread_data structure has a number of files associated with it,
+ * this structure holds state information for a single file.
+ */
 struct fio_file {
 	/*
 	 * A file may not be a file descriptor, let the io engine decide
 	 */
 	union {
 		unsigned long file_data;
-		int fd;
+		long fd;
 	};
 	char *file_name;
 	void *mmap;
@@ -148,19 +204,31 @@ struct fio_file {
 	unsigned long long real_file_size;
 	unsigned long long file_offset;
 	unsigned long long last_pos;
+	unsigned long long last_completed_pos;
 
+	/*
+	 * block map for random io
+	 */
 	unsigned long *file_map;
 	unsigned int num_maps;
+	unsigned int last_free_lookup;
 
-	int fileno;
+	unsigned int unlink;
 };
 
+/*
+ * How many depth levels to log
+ */
+#define FIO_IO_U_MAP_NR	8
+
 /*
  * This describes a single thread/process executing a fio job.
  */
 struct thread_data {
-	char name[32];
+	char *description;
+	char *name;
 	char *directory;
+	char *filename;
 	char verror[80];
 	pthread_t thread;
 	int thread_number;
@@ -168,6 +236,7 @@ struct thread_data {
 	enum fio_filetype filetype;
 	struct fio_file *files;
 	unsigned int nr_files;
+	unsigned int nr_uniq_files;
 	unsigned int next_file;
 	int error;
 	pid_t pid;
@@ -178,27 +247,33 @@ struct thread_data {
 	enum fio_ddir ddir;
 	unsigned int iomix;
 	unsigned int ioprio;
-
-	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 last_was_sync;
+
+	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 hugepage_size;
+	unsigned int rw_min_bs;
 	unsigned int thinktime;
+	unsigned int thinktime_blocks;
 	unsigned int fsync_blocks;
 	unsigned int start_delay;
 	unsigned long timeout;
@@ -208,18 +283,21 @@ struct thread_data {
 	unsigned long long zone_size;
 	unsigned long long zone_skip;
 	enum fio_memtype mem_type;
+	char *mmapfile;
+	int mmapfd;
 	unsigned int stonewall;
 	unsigned int numjobs;
 	unsigned int iodepth;
 	os_cpu_mask_t cpumask;
 	unsigned int iolog;
 	unsigned int read_iolog;
-	unsigned int write_iolog;
 	unsigned int rwmixcycle;
 	unsigned int rwmixread;
+	unsigned int rwmixwrite;
 	unsigned int nice;
 
-	char *iolog_file;
+	char *read_iolog_file;
+	char *write_iolog_file;
 	void *iolog_buf;
 	FILE *iolog_f;
 
@@ -241,6 +319,8 @@ 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 long total_io_u;
 	struct list_head io_u_freelist;
 	struct list_head io_u_busylist;
 
@@ -294,6 +374,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
@@ -335,10 +416,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 struct io_u *__get_io_u(struct thread_data *);
-extern void put_io_u(struct thread_data *, struct io_u *);
-
-extern int rate_quit;
 extern int exitall_on_terminate;
 extern int thread_number;
 extern int shm_id;
@@ -346,8 +423,8 @@ 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 unsigned long long mlock_size;
 
 extern struct thread_data *threads;
 
@@ -356,12 +433,27 @@ 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))
 
 #define MAX_JOBS	(1024)
 
+static inline int should_fsync(struct thread_data *td)
+{
+	if (td->last_was_sync)
+		return 0;
+	if (td->odirect)
+		return 0;
+	if (td_write(td) || td_rw(td) || td->override_sync)
+		return 1;
+
+	return 0;
+}
+
+/*
+ * Disk utils as read in /sys/block/<dev>/stat
+ */
 struct disk_util_stat {
 	unsigned ios[2];
 	unsigned merges[2];
@@ -371,6 +463,9 @@ struct disk_util_stat {
 	unsigned time_in_queue;
 };
 
+/*
+ * Per-device disk util management
+ */
 struct disk_util {
 	struct list_head list;
 
@@ -385,11 +480,15 @@ struct disk_util {
 	struct timeval time;
 };
 
+/*
+ * Used for passing io_u completion data
+ */
 struct io_completion_data {
 	int nr;				/* input */
 
 	int error;			/* output */
 	unsigned long bytes_done[2];	/* output */
+	struct timeval time;		/* output */
 };
 
 #define DISK_UTIL_MSEC	(250)
@@ -397,6 +496,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
@@ -411,9 +513,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);
+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 *);
@@ -421,20 +523,26 @@ extern void update_io_ticks(void);
 extern void disk_util_timer_arm(void);
 extern void setup_log(struct io_log **);
 extern void finish_log(struct thread_data *, struct io_log *, const char *);
+extern void __finish_log(struct io_log *, const char *);
 extern int setup_rate(struct thread_data *);
+extern struct io_log *agg_io_log[2];
+extern int write_bw_log;
+extern void add_agg_sample(unsigned long, enum fio_ddir);
 
 /*
  * Time functions
  */
-extern void time_init(void);
 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 *);
 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 *);
+extern void fio_gettime(struct timeval *, void *);
 
 /*
  * Init functions
@@ -447,6 +555,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 *);
 
 /*
@@ -479,6 +588,33 @@ extern void populate_verify_io_u(struct thread_data *, struct io_u *);
 extern int get_next_verify(struct thread_data *td, struct io_u *);
 extern int do_io_u_verify(struct thread_data *, struct io_u **);
 
+/*
+ * Memory helpers
+ */
+extern int fio_pin_memory(void);
+extern void fio_unpin_memory(void);
+extern int allocate_io_mem(struct thread_data *);
+extern void free_io_mem(struct thread_data *);
+
+/*
+ * io unit handling
+ */
+#define queue_full(td)	list_empty(&(td)->io_u_freelist)
+extern struct io_u *__get_io_u(struct thread_data *);
+extern struct io_u *get_io_u(struct thread_data *, struct fio_file *);
+extern void put_io_u(struct thread_data *, struct io_u *);
+extern void ios_completed(struct thread_data *, struct io_completion_data *);
+extern void io_completed(struct thread_data *, struct io_u *, struct io_completion_data *);
+
+/*
+ * io engine entry points
+ */
+extern int td_io_init(struct thread_data *);
+extern int td_io_prep(struct thread_data *, struct io_u *);
+extern int td_io_queue(struct thread_data *, struct io_u *);
+extern int td_io_sync(struct thread_data *, struct fio_file *);
+extern int td_io_getevents(struct thread_data *, int, int, struct timespec *);
+
 /*
  * 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.
@@ -513,6 +649,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;
@@ -524,24 +661,37 @@ 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 (*sync)(struct thread_data *, struct fio_file *);
 	void *data;
 	void *dlhandle;
 };
 
-#define FIO_IOOPS_VERSION	2
+#define FIO_IOOPS_VERSION	3
 
-extern struct ioengine_ops *load_ioengine(struct thread_data *, char *);
+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)++)
 #define for_each_file(td, f, i)	\
 	for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->nr_files; (i)++, (f)++)
 
+#define fio_assert(td, cond)	do {	\
+	if (!(cond)) {			\
+		int *__foo = NULL;	\
+		fprintf(stderr, "file:%s:%d, assert %s failed\n", __FILE__, __LINE__, #cond);	\
+		(td)->runstate = TD_EXITED;	\
+		(td)->error = EFAULT;		\
+		*__foo = 0;			\
+	}	\
+} while (0)
+
 #endif