X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=backend.c;h=76e456f1295da2d827269c27716ef63cbd33af43;hb=f1867a7f9e588acf67cf8fa96eab8a6e2fdedcf6;hp=00fc29a4b15452778b38f4d9a0c3bee6a574e8ba;hpb=a41fc5291d25a02adfcca11915d41a645eaed502;p=fio.git diff --git a/backend.c b/backend.c index 00fc29a4..76e456f1 100644 --- a/backend.c +++ b/backend.c @@ -53,7 +53,7 @@ static struct fio_sem *startup_sem; static struct flist_head *cgroup_list; static struct cgroup_mnt *cgroup_mnt; static int exit_value; -static volatile int fio_abort; +static volatile bool fio_abort; static unsigned int nr_process = 0; static unsigned int nr_thread = 0; @@ -2216,18 +2216,19 @@ static void run_threads(struct sk_out *sk_out) struct buf_output out; buf_output_init(&out); - log_buf(&out, "Starting "); + __log_buf(&out, "Starting "); if (nr_thread) - log_buf(&out, "%d thread%s", nr_thread, + __log_buf(&out, "%d thread%s", nr_thread, nr_thread > 1 ? "s" : ""); if (nr_process) { if (nr_thread) - log_buf(&out, " and "); - log_buf(&out, "%d process%s", nr_process, + __log_buf(&out, " and "); + __log_buf(&out, "%d process%s", nr_process, nr_process > 1 ? "es" : ""); } - log_buf(&out, "\n"); + __log_buf(&out, "\n"); log_info_buf(out.buf, out.buflen); + buf_output_free(&out); } todo = thread_number; @@ -2370,7 +2371,7 @@ reap: if (fio_sem_down_timeout(startup_sem, 10000)) { log_err("fio: job startup hung? exiting.\n"); fio_terminate_threads(TERMINATE_ALL); - fio_abort = 1; + fio_abort = true; nr_started--; free(fd); break;