Note process vs thread in output
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/eta.c b/eta.c
index 960bf4d..3c23162 100644
--- a/eta.c
+++ b/eta.c
@@ -269,7 +269,7 @@
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 7110e87..6222a41 100644
--- a/fio.c
+++ b/fio.c
@@ -43,6 +43,8 @@
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 @@
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 b085cd1..a60be10 100644
--- a/fio.h
+++ b/fio.h
@@ -507,6 +507,7 @@
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 bca8424..2129882 100644
--- a/init.c
+++ b/init.c
@@ -816,6 +816,11 @@
return 1;
}
+ if (td->use_thread)
+ nr_thread++;
+ else
+ nr_process++;
+
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;