X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=libfio.c;h=a52014ce6bd3afebcf8e5bc4adecea1fcc0794cd;hb=051b5785bc47ab216fa3db9dceb6184073dcc88a;hp=1a8917768b86eeabe8ffefa8e0bc9675c51162c3;hpb=4a6f4ee73e84bc92123fc1667f9aa14b3f4034f7;p=fio.git diff --git a/libfio.c b/libfio.c index 1a891776..a52014ce 100644 --- a/libfio.c +++ b/libfio.c @@ -94,6 +94,7 @@ static void reset_io_counters(struct thread_data *td, int all) td->rate_next_io_time[ddir] = 0; td->last_usec[ddir] = 0; } + td->bytes_verified = 0; } td->zone_bytes = 0; @@ -239,13 +240,11 @@ void fio_mark_td_terminate(struct thread_data *td) void fio_terminate_threads(unsigned int group_id, unsigned int terminate) { - struct thread_data *td; pid_t pid = getpid(); - int i; dprint(FD_PROCESS, "terminate group_id=%d\n", group_id); - for_each_td(td, i) { + for_each_td(td) { if ((terminate == TERMINATE_GROUP && group_id == TERMINATE_ALL) || (terminate == TERMINATE_GROUP && group_id == td->groupid) || (terminate == TERMINATE_STONEWALL && td->runstate >= TD_RUNNING) || @@ -273,22 +272,20 @@ void fio_terminate_threads(unsigned int group_id, unsigned int terminate) ops->terminate(td); } } - } + } end_for_each(); } int fio_running_or_pending_io_threads(void) { - struct thread_data *td; - int i; int nr_io_threads = 0; - for_each_td(td, i) { + for_each_td(td) { if (td->io_ops_init && td_ioengine_flagged(td, FIO_NOIO)) continue; nr_io_threads++; if (td->runstate < TD_EXITED) return 1; - } + } end_for_each(); if (!nr_io_threads) return -1; /* we only had cpuio threads to begin with */