projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't stack allocate file name
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 7110e87dfac36cfeec1cac0b87a8eb3018eac68b..4d628b9f522383880c5fde1dd34d91ff179eedf1 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 groupid = 0;
int thread_number = 0;
+int nr_process = 0;
+int nr_thread = 0;
int shm_id = 0;
int temp_stall_ts;
int shm_id = 0;
int temp_stall_ts;
@@
-253,7
+255,8
@@
static void do_verify(struct thread_data *td)
{
struct fio_file *f;
struct io_u *io_u;
{
struct fio_file *f;
struct io_u *io_u;
- int ret, i, min_events;
+ int ret, min_events;
+ unsigned int i;
/*
* sync io first and invalidate cache, to make sure we really
/*
* sync io first and invalidate cache, to make sure we really
@@
-377,7
+380,8
@@
static void do_io(struct thread_data *td)
{
struct timeval s;
unsigned long usec;
{
struct timeval s;
unsigned long usec;
- int i, ret = 0;
+ unsigned int i;
+ int ret = 0;
td_set_runstate(td, TD_RUNNING);
td_set_runstate(td, TD_RUNNING);
@@
-648,7
+652,8
@@
static int switch_ioscheduler(struct thread_data *td)
static int clear_io_state(struct thread_data *td)
{
struct fio_file *f;
static int clear_io_state(struct thread_data *td)
{
struct fio_file *f;
- int i, ret;
+ unsigned int i;
+ int ret;
td->ts.stat_io_bytes[0] = td->ts.stat_io_bytes[1] = 0;
td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
td->ts.stat_io_bytes[0] = td->ts.stat_io_bytes[1] = 0;
td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
@@
-951,7
+956,15
@@
static void run_threads(void)
return;
if (!terse_output) {
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);
}
fflush(stdout);
}