Use log_info() throughout

[fio.git] / log.c

diff --git a/log.c b/log.c
index 513128d69b273bf1a3c0e21194b4dfa93aa2c5d7..50caf3d4bed0036d452306187b97c31817ae2b48 100644 (file)
--- a/log.c
+++ b/log.c
@@ -39,7 +39,7 @@ void prune_io_piece_log(struct thread_data *td)
 }
 
 /*
- * log a succesful write, so we can unwind the log for verify
+ * log a successful write, so we can unwind the log for verify
  */
 void log_io_piece(struct thread_data *td, struct io_u *io_u)
 {
@@ -172,7 +172,7 @@ int init_iolog(struct thread_data *td)
 {
        int ret = 0;
 
-       if (td->io_ops->flags & FIO_CPUIO)
+       if (td->io_ops->flags & FIO_DISKLESSIO)
                return 0;
 
        if (td->read_iolog_file)
@@ -187,6 +187,7 @@ int setup_rate(struct thread_data *td)
 {
        unsigned long long rate;
        int nr_reads_per_msec;
+       unsigned int bs;
 
        if (!td->rate)
                return 0;
@@ -196,8 +197,15 @@ int setup_rate(struct thread_data *td)
                return -1;
        }
 
+       if (td_rw(td))
+               bs = td->rw_min_bs;
+       else if (td_read(td))
+               bs = td->min_bs[DDIR_READ];
+       else
+               bs = td->min_bs[DDIR_WRITE];
+
        rate = td->rate;
-       nr_reads_per_msec = (rate * 1024 * 1000) / td->min_bs[DDIR_READ];
+       nr_reads_per_msec = (rate * 1024 * 1000) / bs;
        if (!nr_reads_per_msec) {
                log_err("rate lower than supported\n");
                return -1;