Note process vs thread in output

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/eta.c b/eta.c
index 960bf4d1b9f0e53e2a1515541ae3174e7a17e87a..3c2316284909c88867c5981db71b93918e1ffef6 100644 (file)
--- 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 7110e87dfac36cfeec1cac0b87a8eb3018eac68b..6222a4185c7105973b4080669e34a37303a7f281 100644 (file)
--- 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 b085cd1e03d6f593c25eaca266cc2f8d066f3ade..a60be104c249a1028339577ef3c52afb7a77f98d 100644 (file)
--- 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 bca8424a9e49348c05b99a272c9d96789b469559..2129882f5309ccdaea91fe737e8f01132ed2b3e1 100644 (file)
--- 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;