fix wrong malloc size for ignore_error buffer

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index 7f08d5f23b7be8662a656d66336f0d6735b1205e..9a684edb6a01185d9461b7224352211ff2f4b6e1 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -1457,6 +1457,7 @@ static void *thread_main(void *data)
        struct thread_data *td = fd->td;
        struct thread_options *o = &td->o;
        struct sk_out *sk_out = fd->sk_out;
+       uint64_t bytes_done[DDIR_RWDIR_CNT];
        int deadlock_loop_cnt;
        int clear_state;
        int ret;
@@ -1678,7 +1679,9 @@ static void *thread_main(void *data)
                                        sizeof(td->bw_sample_time));
        }
 
+       memset(bytes_done, 0, sizeof(bytes_done));
        clear_state = 0;
+
        while (keep_running(td)) {
                uint64_t verify_bytes;
 
@@ -1697,8 +1700,6 @@ static void *thread_main(void *data)
                if (td->o.verify_only && td_write(td))
                        verify_bytes = do_dry_run(td);
                else {
-                       uint64_t bytes_done[DDIR_RWDIR_CNT];
-
                        do_io(td, bytes_done);
 
                        if (!ddir_rw_sum(bytes_done)) {
@@ -1777,6 +1778,18 @@ static void *thread_main(void *data)
                        break;
        }
 
+       /*
+        * If td ended up with no I/O when it should have had,
+        * then something went wrong unless FIO_NOIO or FIO_DISKLESSIO.
+        * (Are we not missing other flags that can be ignored ?)
+        */
+       if ((td->o.size || td->o.io_size) && !ddir_rw_sum(bytes_done) &&
+           !(td_ioengine_flagged(td, FIO_NOIO) ||
+             td_ioengine_flagged(td, FIO_DISKLESSIO)))
+               log_err("%s: No I/O performed by %s, "
+                        "perhaps try --debug=io option for details?\n",
+                        td->o.name, td->io_ops->name);
+
        td_set_runstate(td, TD_FINISHING);
 
        update_rusage_stat(td);
@@ -1849,14 +1862,6 @@ err:
        return (void *) (uintptr_t) td->error;
 }
 
-static void dump_td_info(struct thread_data *td)
-{
-       log_err("fio: job '%s' (state=%d) hasn't exited in %lu seconds, it "
-               "appears to be stuck. Doing forceful exit of this job.\n",
-                       td->o.name, td->runstate,
-                       (unsigned long) time_since_now(&td->terminate_time));
-}
-
 /*
  * Run over the job map and reap the threads that have exited, if any.
  */
@@ -1941,7 +1946,11 @@ static void reap_threads(unsigned int *nr_running, uint64_t *t_rate,
                if (td->terminate &&
                    td->runstate < TD_FSYNCING &&
                    time_since_now(&td->terminate_time) >= FIO_REAP_TIMEOUT) {
-                       dump_td_info(td);
+                       log_err("fio: job '%s' (state=%d) hasn't exited in "
+                               "%lu seconds, it appears to be stuck. Doing "
+                               "forceful exit of this job.\n",
+                               td->o.name, td->runstate,
+                               (unsigned long) time_since_now(&td->terminate_time));
                        td_set_runstate(td, TD_REAPED);
                        goto reaped;
                }