projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fio: make gui status update in timely fashion
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 5b912eb7166c81b1cb310e42a5c61701ecb6e9c0..0833d3412450a6ddd788369cf2c064f41918ef34 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-7,6
+7,8
@@
#include "fio.h"
#include "fio.h"
+void (*update_thread_status)(char *status_message) = NULL;
+
static char run_str[REAL_MAX_JOBS + 1];
/*
static char run_str[REAL_MAX_JOBS + 1];
/*
@@
-230,7
+232,7
@@
static void calc_iops(unsigned long mtime, unsigned long long *io_iops,
* Print status of the jobs we know about. This includes rate estimates,
* ETA, thread state, etc.
*/
* Print status of the jobs we know about. This includes rate estimates,
* ETA, thread state, etc.
*/
-int calc_thread_status(struct jobs_eta *je)
+int calc_thread_status(struct jobs_eta *je
, int force
)
{
struct thread_data *td;
int i;
{
struct thread_data *td;
int i;
@@
-245,11
+247,13
@@
int calc_thread_status(struct jobs_eta *je)
static struct timeval rate_prev_time, disp_prev_time;
int i2p = 0;
static struct timeval rate_prev_time, disp_prev_time;
int i2p = 0;
- if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
- return 0;
+ if (!force) {
+ if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
+ return 0;
- if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
- return 0;
+ if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
+ return 0;
+ }
if (!rate_io_bytes[0] && !rate_io_bytes[1])
fill_start_time(&rate_prev_time);
if (!rate_io_bytes[0] && !rate_io_bytes[1])
fill_start_time(&rate_prev_time);
@@
-332,7
+336,7
@@
int calc_thread_status(struct jobs_eta *je)
/*
* Allow a little slack, the target is to print it every 1000 msecs
*/
/*
* Allow a little slack, the target is to print it every 1000 msecs
*/
- if (disp_time < 900)
+ if (
!force &&
disp_time < 900)
return 0;
calc_rate(disp_time, io_bytes, disp_io_bytes, je->rate);
return 0;
calc_rate(disp_time, io_bytes, disp_io_bytes, je->rate);
@@
-340,7
+344,7
@@
int calc_thread_status(struct jobs_eta *je)
memcpy(&disp_prev_time, &now, sizeof(now));
memcpy(&disp_prev_time, &now, sizeof(now));
- if (!je->nr_running && !je->nr_pending)
+ if (!
force && !
je->nr_running && !je->nr_pending)
return 0;
je->nr_threads = thread_number;
return 0;
je->nr_threads = thread_number;
@@
-409,19
+413,27
@@
void display_thread_status(struct jobs_eta *je)
}
p += sprintf(p, "\r");
}
p += sprintf(p, "\r");
- printf("%s", output);
- fflush(stdout);
+ if (update_thread_status) {
+ update_thread_status(output);
+ } else {
+ printf("%s", output);
+ fflush(stdout);
+ }
}
void print_thread_status(void)
{
struct jobs_eta *je;
}
void print_thread_status(void)
{
struct jobs_eta *je;
+ size_t size;
- je = malloc(sizeof(*je) + thread_number * sizeof(char));
+ if (!thread_number)
+ return;
- memset(je, 0, sizeof(*je) + thread_number * sizeof(char));
+ size = sizeof(*je) + thread_number * sizeof(char) + 1;
+ je = malloc(size);
+ memset(je, 0, size);
- if (calc_thread_status(je))
+ if (calc_thread_status(je
, 0
))
display_thread_status(je);
free(je);
display_thread_status(je);
free(je);