From: Jens Axboe <axboe@suse.de>
Date: Fri, 2 Jun 2006 08:53:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://router/data/git/fio
X-Git-Tag: fio-1.4~1
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=a12fc0225482bd1580a332312f2a60f73a9ebc28

Merge branch 'master' of ssh://router/data/git/fio

Conflicts:

	fio.h
---

a12fc0225482bd1580a332312f2a60f73a9ebc28
diff --cc fio.h
index a75d3b2d,01c8b9ba..107f7671
--- a/fio.h
+++ b/fio.h
@@@ -150,12 -150,12 +150,16 @@@ struct thread_data 
  	unsigned int iodepth;
  	os_cpu_mask_t cpumask;
  	unsigned int jobnum;
 +	unsigned int iolog;
+ 	unsigned int read_iolog;
+ 	unsigned int write_iolog;
 +	unsigned int rwmixcycle;
 +	unsigned int rwmixread;
 +	unsigned int nice;
  
  	char iolog_file[256];
+ 	void *iolog_buf;
+ 	FILE *iolog_f;
  
  	struct drand48_data bsrange_state;
  	struct drand48_data verify_state;