X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=backend.c;h=dec0d55b0dbf3382cad2bfdfcfad9d4683d912a9;hb=71deafc693ad77947f5c3f72e7247eefcb97bd63;hp=094cf7100d3f8f0e4af0c07fe41c80b67ebc586a;hpb=20e37e4a63ea7edb528c8a443b738a0a67c2406e;p=fio.git diff --git a/backend.c b/backend.c index 094cf710..dec0d55b 100644 --- a/backend.c +++ b/backend.c @@ -540,7 +540,7 @@ sync_done: *ret = ret2; break; default: - assert(ret < 0); + assert(*ret < 0); td_verror(td, -(*ret), "td_io_queue"); break; } @@ -951,7 +951,7 @@ reap: } if (!in_ramp_time(td) && td->o.latency_target) lat_target_check(td); - + if (td->o.thinktime) { unsigned long long b; @@ -1638,16 +1638,8 @@ static void *thread_main(void *data) td->ts.io_bytes[DDIR_TRIM] = td->io_bytes[DDIR_TRIM]; if (td->o.verify_state_save && !(td->flags & TD_F_VSTATE_SAVED) && - (td->o.verify != VERIFY_NONE && td_write(td))) { - struct all_io_list *state; - size_t sz; - - state = get_all_io_list(td->thread_number, &sz); - if (state) { - __verify_save_state(state, "local"); - free(state); - } - } + (td->o.verify != VERIFY_NONE && td_write(td))) + verify_save_state(td->thread_number); fio_unpin_memory(td); @@ -1897,7 +1889,7 @@ void check_trigger_file(void) if (nr_clients) fio_clients_send_trigger(trigger_remote_cmd); else { - verify_save_state(); + verify_save_state(IO_LIST_ALL); fio_terminate_threads(TERMINATE_ALL); exec_trigger(trigger_cmd); }