Support for setting rated based on IOPS

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 4d628b9f522383880c5fde1dd34d91ff179eedf1..478ef28aa7e2461365f2c30775e62949eb811400 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -37,7 +37,8 @@
 #include "fio.h"
 #include "os.h"
 
-static unsigned long page_mask;
+unsigned long page_mask;
+unsigned long page_size;
 #define ALIGN(buf)     \
        (char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
 
@@ -102,13 +103,14 @@ static void sig_handler(int sig)
 static int check_min_rate(struct thread_data *td, struct timeval *now)
 {
        unsigned long long bytes = 0;
+       unsigned long iops = 0;
        unsigned long spent;
        unsigned long rate;
 
        /*
         * No minimum rate set, always ok
         */
-       if (!td->ratemin)
+       if (!td->ratemin && !td->rate_iops_min)
                return 0;
 
        /*
@@ -117,32 +119,55 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
        if (mtime_since(&td->start, now) < 2000)
                return 0;
 
-       if (td_read(td))
+       if (td_read(td)) {
+               iops += td->io_blocks[DDIR_READ];
                bytes += td->this_io_bytes[DDIR_READ];
-       if (td_write(td))
+       }
+       if (td_write(td)) {
+               iops += td->io_blocks[DDIR_WRITE];
                bytes += td->this_io_bytes[DDIR_WRITE];
+       }
 
        /*
         * if rate blocks is set, sample is running
         */
-       if (td->rate_bytes) {
+       if (td->rate_bytes || td->rate_blocks) {
                spent = mtime_since(&td->lastrate, now);
                if (spent < td->ratecycle)
                        return 0;
 
-               if (bytes < td->rate_bytes) {
-                       fprintf(f_out, "%s: min rate %u not met\n", td->name, td->ratemin);
-                       return 1;
+               if (td->rate) {
+                       /*
+                        * check bandwidth specified rate
+                        */
+                       if (bytes < td->rate_bytes) {
+                               log_err("%s: min rate %u not met\n", td->name, td->ratemin);
+                               return 1;
+                       } else {
+                               rate = (bytes - td->rate_bytes) / spent;
+                               if (rate < td->ratemin || bytes < td->rate_bytes) {
+                                       log_err("%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
+                                       return 1;
+                               }
+                       }
                } else {
-                       rate = (bytes - td->rate_bytes) / spent;
-                       if (rate < td->ratemin || bytes < td->rate_bytes) {
-                               fprintf(f_out, "%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
+                       /*
+                        * checks iops specified rate
+                        */
+                       if (iops < td->rate_iops) {
+                               log_err("%s: min iops rate %u not met\n", td->name, td->rate_iops);
                                return 1;
+                       } else {
+                               rate = (iops - td->rate_blocks) / spent;
+                               if (rate < td->rate_iops_min || iops < td->rate_blocks) {
+                                       log_err("%s: min iops rate %u not met, got %lu\n", td->name, td->rate_iops_min, rate);
+                               }
                        }
                }
        }
 
        td->rate_bytes = bytes;
+       td->rate_blocks = iops;
        memcpy(&td->lastrate, now, sizeof(*now));
        return 0;
 }
@@ -263,6 +288,8 @@ static void do_verify(struct thread_data *td)
         * read from disk.
         */
        for_each_file(td, f, i) {
+               if (!(f->flags & FIO_FILE_OPEN))
+                       continue;
                if (fio_io_sync(td, f))
                        break;
                if (file_invalidate_cache(td, f))
@@ -520,8 +547,12 @@ static void do_io(struct thread_data *td)
 
                if (should_fsync(td) && td->end_fsync) {
                        td_set_runstate(td, TD_FSYNCING);
-                       for_each_file(td, f, i)
+
+                       for_each_file(td, f, i) {
+                               if (!(f->flags & FIO_FILE_OPEN))
+                                       continue;
                                fio_io_sync(td, f);
+                       }
                }
        } else
                cleanup_pending_aio(td);
@@ -659,6 +690,7 @@ static int clear_io_state(struct thread_data *td)
        td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
        td->zone_bytes = 0;
        td->rate_bytes = 0;
+       td->rate_blocks = 0;
 
        td->last_was_sync = 0;
 
@@ -719,9 +751,6 @@ static void *thread_main(void *data)
                goto err_sem;
        }
 
-       if (init_random_state(td))
-               goto err_sem;
-
        if (td->ioscheduler && switch_ioscheduler(td))
                goto err_sem;
 
@@ -1152,6 +1181,7 @@ int main(int argc, char *argv[])
                return 1;
        }
 
+       page_size = ps;
        page_mask = ps - 1;
 
        if (write_bw_log) {