From 90a87d4ba3acb26cb54e9b15adf9f39aea02818b Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 18 Apr 2007 09:02:32 +0200 Subject: [PATCH] Have the job set ->terminate when runtime is exceeded Then we don't have to do a seperate check for time_based exit. Signed-off-by: Jens Axboe --- fio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fio.c b/fio.c index 6f4fddae..565b3d22 100644 --- a/fio.c +++ b/fio.c @@ -308,6 +308,7 @@ static void do_verify(struct thread_data *td) if (runtime_exceeded(td, &io_u->start_time)) { put_io_u(td, io_u); + td->terminate = 1; break; } @@ -438,6 +439,7 @@ static void do_io(struct thread_data *td) if (runtime_exceeded(td, &s)) { put_io_u(td, io_u); + td->terminate = 1; break; } @@ -751,7 +753,6 @@ static void *thread_main(void *data) unsigned long long runtime[2]; struct thread_data *td = data; unsigned long elapsed; - struct timeval t; int clear_state; if (!td->o.use_thread) @@ -861,10 +862,6 @@ static void *thread_main(void *data) if (td->error || td->terminate) break; - fio_gettime(&t, NULL); - if (runtime_exceeded(td, &t)) - break; - if (td->o.verify == VERIFY_NONE) continue; -- 2.25.1