X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=b19101c20a4924892610bd78b0f6d645f3b93e9b;hb=fc966bef0afd0b6801509a9038951dce46f2ecc4;hp=9222c051651408bfcdb811883884afced52dc49a;hpb=7c9b1bce094d58c374b086bbb780c08265623ea4;p=fio.git

diff --git a/fio.h b/fio.h
index 9222c051..b19101c2 100644
--- a/fio.h
+++ b/fio.h
@@ -111,6 +111,13 @@ struct thread_stat {
 	unsigned long long io_bytes[2];
 	unsigned long runtime[2];
 	unsigned long total_run_time;
+
+	/*
+	 * IO Error related stats
+	 */
+	unsigned continue_on_error;
+	unsigned long total_err_count;
+	int first_error;
 };
 
 struct bssplit {
@@ -185,6 +192,7 @@ struct thread_options {
 	unsigned int thinktime_spin;
 	unsigned int thinktime_blocks;
 	unsigned int fsync_blocks;
+	unsigned int fdatasync_blocks;
 	unsigned int start_delay;
 	unsigned long long timeout;
 	unsigned long long ramp_time;
@@ -194,6 +202,7 @@ struct thread_options {
 	unsigned long long zone_size;
 	unsigned long long zone_skip;
 	enum fio_memtype mem_type;
+	unsigned int mem_align;
 
 	unsigned int stonewall;
 	unsigned int new_group;
@@ -228,11 +237,11 @@ struct thread_options {
 	char *exec_prerun;
 	char *exec_postrun;
 
-	unsigned int rate;
-	unsigned int ratemin;
+	unsigned int rate[2];
+	unsigned int ratemin[2];
 	unsigned int ratecycle;
-	unsigned int rate_iops;
-	unsigned int rate_iops_min;
+	unsigned int rate_iops[2];
+	unsigned int rate_iops_min[2];
 
 	char *ioscheduler;
 
@@ -241,6 +250,11 @@ struct thread_options {
 	 */
 	unsigned int cpuload;
 	unsigned int cpucycle;
+
+	/*
+	 * I/O Error handling
+	 */
+	unsigned int continue_on_error;
 };
 
 #define FIO_VERROR_SIZE	128
@@ -309,11 +323,11 @@ struct thread_data {
 	/*
 	 * Rate state
 	 */
-	unsigned long rate_usec_cycle;
-	long rate_pending_usleep;
-	unsigned long rate_bytes;
-	unsigned long rate_blocks;
-	struct timeval lastrate;
+	unsigned long rate_usec_cycle[2];
+	long rate_pending_usleep[2];
+	unsigned long rate_bytes[2];
+	unsigned long rate_blocks[2];
+	struct timeval lastrate[2];
 
 	unsigned long long total_io_size;
 
@@ -332,12 +346,10 @@ struct thread_data {
 
 	struct timeval start;	/* start of this loop */
 	struct timeval epoch;	/* time job was started */
-	struct timeval rw_end[2];
 	struct timeval last_issue;
 	struct timeval tv_cache;
 	unsigned int tv_cache_nr;
 	unsigned int tv_cache_mask;
-	unsigned int rw_end_set[2];
 	unsigned int ramp_time_over;
 
 	/*
@@ -371,6 +383,12 @@ struct thread_data {
 	 * For generating file sizes
 	 */
 	os_random_state_t file_size_state;
+
+	/*
+	 * Error counts
+	 */
+	unsigned int total_err_count;
+	int first_error;
 };
 
 /*
@@ -388,10 +406,13 @@ enum {
 			break;						\
 		int e = (err);						\
 		(td)->error = e;					\
-		snprintf(td->verror, sizeof(td->verror) - 1, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));	\
+		if (!(td)->first_error)					\
+			snprintf(td->verror, sizeof(td->verror) - 1, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));		\
 	} while (0)
 
 
+#define td_clear_error(td)		\
+	(td)->error = 0;
 #define td_verror(td, err, func)	\
 	__td_verror((td), (err), strerror((err)), (func))
 #define td_vmsg(td, err, msg, func)	\
@@ -415,12 +436,6 @@ extern int fio_gtod_cpu;
 
 extern struct thread_data *threads;
 
-#define td_read(td)		((td)->o.td_ddir & TD_DDIR_READ)
-#define td_write(td)		((td)->o.td_ddir & TD_DDIR_WRITE)
-#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)
-#define file_randommap(td, f)	(!(td)->o.norandommap && (f)->file_map)
-
 static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 {
 	assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
@@ -433,6 +448,15 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 
 #define MAX_JOBS	(1024)
 
+#define td_non_fatal_error(e)	((e) == EIO || (e) == EILSEQ)
+
+static inline void update_error_count(struct thread_data *td, int err)
+{
+	td->total_err_count++;
+	if (td->total_err_count == 1)
+		td->first_error = err;
+}
+
 static inline int should_fsync(struct thread_data *td)
 {
 	if (td->last_was_sync)
@@ -456,7 +480,6 @@ extern unsigned long time_since_now(struct timeval *);
 extern unsigned long mtime_since_genesis(void);
 extern void usec_spin(unsigned int);
 extern void usec_sleep(struct thread_data *, unsigned long);
-extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
 extern void fill_start_time(struct timeval *);
 extern void fio_gettime(struct timeval *, void *);
 extern void fio_gtod_init(void);
@@ -553,46 +576,89 @@ extern int load_blktrace(struct thread_data *, const char *);
 	}	\
 } while (0)
 
-static inline void fio_file_reset(struct fio_file *f)
+static inline int fio_fill_issue_time(struct thread_data *td)
 {
-	f->last_free_lookup = 0;
-	f->last_pos = f->file_offset;
-	if (f->file_map)
-		memset(f->file_map, 0, f->num_maps * sizeof(int));
+	if (td->o.read_iolog_file ||
+	    !td->o.disable_clat || !td->o.disable_slat || !td->o.disable_bw)
+		return 1;
+
+	return 0;
 }
 
-static inline void clear_error(struct thread_data *td)
+/*
+ * Cheesy number->string conversion, complete with carry rounding error.
+ */
+static inline char *num2str(unsigned long num, int maxlen, int base, int pow2)
 {
-	td->error = 0;
-	td->verror[0] = '\0';
+	char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' };
+	unsigned int thousand;
+	char *buf;
+	int i;
+
+	if (pow2)
+		thousand = 1024;
+	else
+		thousand = 1000;
+
+	buf = malloc(128);
+
+	for (i = 0; base > 1; i++)
+		base /= thousand;
+
+	do {
+		int len, carry = 0;
+
+		len = sprintf(buf, "%'lu", num);
+		if (len <= maxlen) {
+			if (i >= 1) {
+				buf[len] = postfix[i];
+				buf[len + 1] = '\0';
+			}
+			return buf;
+		}
+
+		if ((num % thousand) >= (thousand / 2))
+			carry = 1;
+
+		num /= thousand;
+		num += carry;
+		i++;
+	} while (i <= 5);
+
+	return buf;
 }
 
-#ifdef FIO_INC_DEBUG
-static inline void dprint_io_u(struct io_u *io_u, const char *p)
+static inline int __should_check_rate(struct thread_data *td,
+				      enum fio_ddir ddir)
 {
-	struct fio_file *f = io_u->file;
+	struct thread_options *o = &td->o;
 
-	dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
-					(unsigned long long) io_u->offset,
-					io_u->buflen, io_u->ddir);
-	if (fio_debug & (1 << FD_IO)) {
-		if (f)
-			log_info("/%s", f->file_name);
+	/*
+	 * If some rate setting was given, we need to check it
+	 */
+	if (o->rate[ddir] || o->ratemin[ddir] || o->rate_iops[ddir] ||
+	    o->rate_iops_min[ddir])
+		return 1;
 
-		log_info("\n");
-	}
+	return 0;
 }
-#else
-#define dprint_io_u(io_u, p)
-#endif
 
-static inline int fio_fill_issue_time(struct thread_data *td)
+static inline int should_check_rate(struct thread_data *td,
+				    unsigned long *bytes_done)
 {
-	if (td->o.read_iolog_file ||
-	    !td->o.disable_clat || !td->o.disable_slat || !td->o.disable_bw)
-		return 1;
+	int ret = 0;
 
-	return 0;
+	if (bytes_done[0])
+		ret |= __should_check_rate(td, 0);
+	if (bytes_done[1])
+		ret |= __should_check_rate(td, 1);
+
+	return ret;
+}
+
+static inline int is_power_of_2(unsigned int val)
+{
+	return (val != 0 && ((val & (val - 1)) == 0));
 }
 
 #endif