projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5853e5a
)
[PATCH] Improve run_str[] updates and printing
author
Jens Axboe
<axboe@suse.de>
Thu, 8 Jun 2006 12:46:24 +0000
(14:46 +0200)
committer
Jens Axboe
<axboe@suse.de>
Thu, 8 Jun 2006 12:46:24 +0000
(14:46 +0200)
fio.c
patch
|
blob
|
blame
|
history
fio.h
patch
|
blob
|
blame
|
history
diff --git
a/fio.c
b/fio.c
index 44463350c2acf31dae7d0017d19f7397d4a8148d..cc71a08955a66f4f16c9510426aad5a3106cbf3e 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-513,7
+513,6
@@
static struct io_u *get_io_u(struct thread_data *td)
static inline void td_set_runstate(struct thread_data *td, int runstate)
{
static inline void td_set_runstate(struct thread_data *td, int runstate)
{
- td->old_runstate = td->runstate;
td->runstate = runstate;
}
td->runstate = runstate;
}
@@
-1421,9
+1420,6
@@
static void check_str_update(struct thread_data *td)
{
char c = run_str[td->thread_number - 1];
{
char c = run_str[td->thread_number - 1];
- if (td->runstate == td->old_runstate)
- return;
-
switch (td->runstate) {
case TD_REAPED:
c = '_';
switch (td->runstate) {
case TD_REAPED:
c = '_';
@@
-1469,7
+1465,6
@@
static void check_str_update(struct thread_data *td)
}
run_str[td->thread_number - 1] = c;
}
run_str[td->thread_number - 1] = c;
- td->old_runstate = td->runstate;
}
static void eta_to_str(char *str, int eta_sec)
}
static void eta_to_str(char *str, int eta_sec)
@@
-1614,6
+1609,9
@@
static void print_thread_status(void)
eta_to_str(eta_str, eta_sec);
}
eta_to_str(eta_str, eta_sec);
}
+ if (!nr_running)
+ return;
+
printf("Threads now running (%d)", nr_running);
if (m_rate || t_rate)
printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
printf("Threads now running (%d)", nr_running);
if (m_rate || t_rate)
printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
diff --git
a/fio.h
b/fio.h
index 1bc72a6f2adf9168531e8fc90c3b5f15e7a2e559..671cb22f88609da3aed675be5c818b2de51ee101 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-153,7
+153,6
@@
struct thread_data {
size_t orig_buffer_size;
volatile int terminate;
volatile int runstate;
size_t orig_buffer_size;
volatile int terminate;
volatile int runstate;
- volatile int old_runstate;
enum fio_ddir ddir;
unsigned int iomix;
unsigned int ioprio;
enum fio_ddir ddir;
unsigned int iomix;
unsigned int ioprio;