From 9cedf16704b71cec33138bb4cf524d3fc9ad338a Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 12 Mar 2007 11:29:30 +0100 Subject: [PATCH] Note process vs thread in output Signed-off-by: Jens Axboe --- eta.c | 2 +- fio.c | 12 +++++++++++- fio.h | 1 + init.c | 5 +++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/eta.c b/eta.c index 960bf4d1..3c231628 100644 --- a/eta.c +++ b/eta.c @@ -269,7 +269,7 @@ void print_thread_status(void) if (!nr_running && !nr_pending) return; - printf("Threads: %d", nr_running); + printf("Jobs: %d", nr_running); if (m_rate || t_rate) printf(", CR=%d/%d KiB/s", t_rate, m_rate); if (eta_sec != INT_MAX && nr_running) { diff --git a/fio.c b/fio.c index 7110e87d..6222a418 100644 --- a/fio.c +++ b/fio.c @@ -43,6 +43,8 @@ static unsigned long page_mask; int groupid = 0; int thread_number = 0; +int nr_process = 0; +int nr_thread = 0; int shm_id = 0; int temp_stall_ts; @@ -951,7 +953,15 @@ static void run_threads(void) return; if (!terse_output) { - printf("Starting %d thread%s\n", thread_number, thread_number > 1 ? "s" : ""); + printf("Starting "); + if (nr_thread) + printf("%d thread%s", nr_thread, nr_thread > 1 ? "s" : ""); + if (nr_process) { + if (nr_thread) + printf(" and "); + printf("%d process%s", nr_process, nr_process > 1 ? "es" : ""); + } + printf("\n"); fflush(stdout); } diff --git a/fio.h b/fio.h index b085cd1e..a60be104 100644 --- a/fio.h +++ b/fio.h @@ -507,6 +507,7 @@ enum { extern int exitall_on_terminate; extern int thread_number; +extern int nr_process, nr_thread; extern int shm_id; extern int groupid; extern int terse_output; diff --git a/init.c b/init.c index bca8424a..2129882f 100644 --- a/init.c +++ b/init.c @@ -816,6 +816,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) return 1; } + if (td->use_thread) + nr_thread++; + else + nr_process++; + if (td->odirect) td->io_ops->flags |= FIO_RAWIO; -- 2.25.1