From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 21 Aug 2012 13:34:13 +0000 (+0200)
Subject: Merge branch 'master' into gfio
X-Git-Tag: fio-2.1~57^2~66
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=c2e9cc4d20c1db1c81276fdaadb56b8b0085d0d8

Merge branch 'master' into gfio

Conflicts:
	eta.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

c2e9cc4d20c1db1c81276fdaadb56b8b0085d0d8
diff --cc backend.c
index dcc6fba0,e41e8f1b..f20857a0
--- a/backend.c
+++ b/backend.c
@@@ -1668,14 -1657,14 +1668,14 @@@ int fio_backend(void
  		return 0;
  
  	if (write_bw_log) {
 -		setup_log(&agg_io_log[DDIR_READ], 0);
 -		setup_log(&agg_io_log[DDIR_WRITE], 0);
 +		setup_log(&agg_io_log[DDIR_READ], 0, IO_LOG_TYPE_BW);
 +		setup_log(&agg_io_log[DDIR_WRITE], 0, IO_LOG_TYPE_BW);
  	}
  
- 	startup_mutex = fio_mutex_init(0);
+ 	startup_mutex = fio_mutex_init(FIO_MUTEX_LOCKED);
  	if (startup_mutex == NULL)
  		return 1;
- 	writeout_mutex = fio_mutex_init(1);
+ 	writeout_mutex = fio_mutex_init(FIO_MUTEX_UNLOCKED);
  	if (writeout_mutex == NULL)
  		return 1;
  
diff --cc eta.c
index 34afe0ca,552845d8..e1050b52
--- a/eta.c
+++ b/eta.c
@@@ -285,14 -285,18 +285,18 @@@ int calc_thread_status(struct jobs_eta 
  		    || td->runstate == TD_FSYNCING
  		    || td->runstate == TD_PRE_READING) {
  			je->nr_running++;
- 			je->t_rate[0] += td->o.rate[0];
- 			je->t_rate[1] += td->o.rate[1];
- 			je->m_rate[0] += td->o.ratemin[0];
- 			je->m_rate[1] += td->o.ratemin[1];
- 			je->t_iops[0] += td->o.rate_iops[0];
- 			je->t_iops[1] += td->o.rate_iops[1];
- 			je->m_iops[0] += td->o.rate_iops_min[0];
- 			je->m_iops[1] += td->o.rate_iops_min[1];
+ 			if (td_read(td)) {
 -				je->t_rate += td->o.rate[DDIR_READ];
 -				je->t_iops += td->o.rate_iops[DDIR_READ];
 -				je->m_rate += td->o.ratemin[DDIR_READ];
 -				je->m_iops += td->o.rate_iops_min[DDIR_READ];
++				je->t_rate[0] += td->o.rate[DDIR_READ];
++				je->t_iops[0] += td->o.rate_iops[DDIR_READ];
++				je->m_rate[0] += td->o.ratemin[DDIR_READ];
++				je->m_iops[0] += td->o.rate_iops_min[DDIR_READ];
+ 			}
+ 			if (td_write(td)) {
 -				je->t_rate += td->o.rate[DDIR_WRITE];
 -				je->t_iops += td->o.rate_iops[DDIR_WRITE];
 -				je->m_rate += td->o.ratemin[DDIR_WRITE];
 -				je->m_iops += td->o.rate_iops_min[DDIR_WRITE];
++				je->t_rate[1] += td->o.rate[DDIR_WRITE];
++				je->t_iops[1] += td->o.rate_iops[DDIR_WRITE];
++				je->m_rate[1] += td->o.ratemin[DDIR_WRITE];
++				je->m_iops[1] += td->o.rate_iops_min[DDIR_WRITE];
+ 			}
  			je->files_open += td->nr_open_files;
  		} else if (td->runstate == TD_RAMP) {
  			je->nr_running++;