Restore type checking in calc_thread_status()

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 970a67dfd0ac8d6672758b99d528f32526f26e4e..286b45ee3837f5e613ffe53120b3ef7045c94a9a 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -177,12 +177,27 @@ static unsigned long thread_eta(struct thread_data *td)
                bytes_total = td->fill_device_size;
        }
 
-       if (td->o.zone_size && td->o.zone_skip && bytes_total) {
+       /*
+        * If io_size is set, bytes_total is an exact value that does not need
+        * adjustment.
+        */
+       if (td->o.zone_size && td->o.zone_skip && bytes_total &&
+           !fio_option_is_set(&td->o, io_size)) {
                unsigned int nr_zones;
                uint64_t zone_bytes;
 
-               zone_bytes = bytes_total + td->o.zone_size + td->o.zone_skip;
-               nr_zones = (zone_bytes - 1) / (td->o.zone_size + td->o.zone_skip);
+               /*
+                * Calculate the upper bound of the number of zones that will
+                * be processed, including skipped bytes between zones. If this
+                * is larger than total_io_size (e.g. when --io_size or --size
+                * specify a small value), use the lower bound to avoid
+                * adjustments to a negative value that would result in a very
+                * large bytes_total and an incorrect eta.
+                */
+               zone_bytes = td->o.zone_size + td->o.zone_skip;
+               nr_zones = (bytes_total + zone_bytes - 1) / zone_bytes;
+               if (bytes_total < nr_zones * td->o.zone_skip)
+                       nr_zones = bytes_total / zone_bytes;
                bytes_total -= nr_zones * td->o.zone_skip;
        }
 
@@ -718,6 +733,9 @@ void print_thread_status(void)
 
 void print_status_init(int thr_number)
 {
+       compiletime_assert(sizeof(struct jobs_eta) ==
+                          sizeof(struct jobs_eta_packed), "jobs_eta");
+
        DRD_IGNORE_VAR(__run_str);
        __run_str[thr_number] = 'P';
        update_condensed_str(__run_str, run_str);