projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blktrace: fix bugs in accounting
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index db08e2abe2e43e79b2da6447157e166b1041d29a..167bf5f62b215d470e1f41d1ee95ba75968589cd 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-555,8
+555,7
@@
void display_thread_status(struct jobs_eta *je)
if (!eta_new_line_init) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_init = 1;
if (!eta_new_line_init) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_init = 1;
- } else if (eta_new_line &&
- mtime_since_now(&disp_eta_new_line) > eta_new_line * 1000) {
+ } else if (eta_new_line && mtime_since_now(&disp_eta_new_line) > eta_new_line) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_pending = 1;
}
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_pending = 1;
}
@@
-573,9
+572,11
@@
struct jobs_eta *get_jobs_eta(int force, size_t *size)
*size = sizeof(*je) + THREAD_RUNSTR_SZ;
je = malloc(*size);
*size = sizeof(*je) + THREAD_RUNSTR_SZ;
je = malloc(*size);
+ if (!je)
+ return NULL;
memset(je, 0, *size);
memset(je, 0, *size);
- if (!calc_thread_status(je,
0
)) {
+ if (!calc_thread_status(je,
force
)) {
free(je);
return NULL;
}
free(je);
return NULL;
}