Fix potential divide-by-zero in calc_iops()

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index f608c4e56aed8142ee24bb6e4cdf8ce9c6e57484..db045cb230338096c90d7ea2bb93fb13014f37cd 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -315,14 +315,19 @@ static void calc_iops(int unified_rw_rep, unsigned long mtime,
        int i;
 
        for (i = 0; i < DDIR_RWDIR_CNT; i++) {
        int i;
 
        for (i = 0; i < DDIR_RWDIR_CNT; i++) {

-               unsigned long long diff;
+               unsigned long long diff, this_iops;

 
                diff = io_iops[i] - prev_io_iops[i];
 
                diff = io_iops[i] - prev_io_iops[i];

+               if (mtime)
+                       this_iops = (diff * 1000) / mtime;
+               else
+                       this_iops = 0;
+

                if (unified_rw_rep) {
                        iops[i] = 0;
                if (unified_rw_rep) {
                        iops[i] = 0;

-                       iops[0] += (diff * 1000) / mtime;
+                       iops[0] += this_iops;

                } else
                } else

-                       iops[i] = (diff * 1000) / mtime;
+                       iops[i] = this_iops;

 
                prev_io_iops[i] = io_iops[i];
        }
 
                prev_io_iops[i] = io_iops[i];
        }