X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=2e43473f0ab5ba34d45e35e7c45cbd17086358be;hb=10927316a4bd0e2ceba98e62c062e352c0e312fe;hp=e97caf18bc1bdbea46751be177639bd66cd44919;hpb=546a9142511875524850ac92776184fd9fb7196e;p=fio.git

diff --git a/fio.h b/fio.h
index e97caf18..2e43473f 100644
--- a/fio.h
+++ b/fio.h
@@ -12,16 +12,13 @@
 #include <unistd.h>
 #include <string.h>
 #include <getopt.h>
+#include <inttypes.h>
+#include <assert.h>
 
 #include "compiler/compiler.h"
 #include "list.h"
 #include "fifo.h"
 #include "rbtree.h"
-#include "md5.h"
-#include "crc64.h"
-#include "crc32.h"
-#include "crc16.h"
-#include "crc7.h"
 #include "arch/arch.h"
 #include "os/os.h"
 #include "mutex.h"
@@ -199,23 +196,51 @@ enum {
 	VERIFY_CRC32,			/* crc32 sum data blocks */
 	VERIFY_CRC16,			/* crc16 sum data blocks */
 	VERIFY_CRC7,			/* crc7 sum data blocks */
+	VERIFY_SHA256,			/* sha256 sum data blocks */
+	VERIFY_SHA512,			/* sha512 sum data blocks */
+	VERIFY_META,			/* block_num, timestamp etc. */
+	VERIFY_PATTERN,			/* verify a specific pattern */
 	VERIFY_NULL,			/* pretend to verify */
 };
 
 /*
- * A header structure associated with each checksummed data block
+ * A header structure associated with each checksummed data block. It is
+ * followed by a checksum specific header that contains the verification
+ * data.
  */
 struct verify_header {
 	unsigned int fio_magic;
 	unsigned int len;
 	unsigned int verify_type;
-	union {
-		char md5_digest[MD5_HASH_WORDS * 4];
-		unsigned long long crc64;
-		unsigned long crc32;
-		unsigned short crc16;
-		unsigned char crc7;
-	};
+};
+
+struct vhdr_md5 {
+	uint32_t md5_digest[16];
+};
+struct vhdr_sha512 {
+	uint8_t sha512[128];
+};
+struct vhdr_sha256 {
+	uint8_t sha256[128];
+};
+struct vhdr_crc64 {
+	uint64_t crc64;
+};
+struct vhdr_crc32 {
+	uint32_t crc32;
+};
+struct vhdr_crc16 {
+	uint16_t crc16;
+};
+struct vhdr_crc7 {
+	uint8_t crc7;
+};
+struct vhdr_meta {
+	uint64_t offset;
+	unsigned char thread;
+	unsigned short numberio;
+	unsigned long time_sec;
+	unsigned long time_usec;
 };
 
 struct group_run_stats {
@@ -253,6 +278,7 @@ enum fio_ioengine_flags {
 	FIO_NOEXTEND	= 1 << 3,	/* engine can't extend file */
 	FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
 	FIO_UNIDIR	= 1 << 5,	/* engine is uni-directional */
+	FIO_NOIO	= 1 << 6,	/* thread does only pseudo IO */
 };
 
 enum fio_file_flags {
@@ -346,6 +372,7 @@ struct thread_stat {
 	unsigned long usr_time;
 	unsigned long sys_time;
 	unsigned long ctx;
+	unsigned long minf, majf;
 
 	/*
 	 * IO depth and latency stats
@@ -394,9 +421,13 @@ struct thread_options {
 	unsigned int end_fsync;
 	unsigned int sync_io;
 	unsigned int verify;
+	unsigned int do_verify;
 	unsigned int verifysort;
-	unsigned int header_interval;
-	unsigned int header_offset;
+	unsigned int verify_interval;
+	unsigned int verify_offset;
+	unsigned int verify_pattern;
+	unsigned int verify_pattern_bytes;
+	unsigned int verify_fatal;
 	unsigned int use_thread;
 	unsigned int unlink;
 	unsigned int do_disk_util;
@@ -491,6 +522,7 @@ struct thread_data {
 	volatile int terminate;
 	volatile int runstate;
 	unsigned int ioprio;
+	unsigned int ioprio_set;
 	unsigned int last_was_sync;
 
 	char *mmapfile;
@@ -599,6 +631,15 @@ enum {
 	FIO_FSERVICE_RR		= 2,
 };
 
+/*
+ * when should interactive ETA output be generated
+ */
+enum {
+	FIO_ETA_AUTO,
+	FIO_ETA_ALWAYS,
+	FIO_ETA_NEVER,
+};
+
 /*
  * 30 second per-io_u timeout, with 5 second intervals to avoid resetting
  * the timer on each queue operation.
@@ -632,6 +673,8 @@ extern FILE *f_err;
 extern int temp_stall_ts;
 extern unsigned long long mlock_size;
 extern unsigned long page_mask, page_size;
+extern int read_only;
+extern int eta_print;
 
 extern struct thread_data *threads;
 
@@ -640,6 +683,11 @@ extern struct thread_data *threads;
 #define td_rw(td)		(((td)->o.td_ddir & TD_DDIR_RW) == TD_DDIR_RW)
 #define td_random(td)		((td)->o.td_ddir & TD_DDIR_RAND)
 
+static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
+{
+	assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
+}
+
 #define BLOCKS_PER_MAP		(8 * sizeof(long))
 #define TO_MAP_BLOCK(td, f, b)	((b) - ((f)->file_offset / (td)->o.rw_min_bs))
 #define RAND_MAP_IDX(td, f, b)	(TO_MAP_BLOCK(td, f, b) / BLOCKS_PER_MAP)
@@ -729,8 +777,8 @@ extern void add_agg_sample(unsigned long, enum fio_ddir);
 /*
  * Time functions
  */
-extern unsigned long utime_since(struct timeval *, struct timeval *);
-extern unsigned long utime_since_now(struct timeval *);
+extern unsigned long long utime_since(struct timeval *, struct timeval *);
+extern unsigned long 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 *);