projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/majianpeng/fio
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 0b795263325bbef5372cfb8a6760ed3b089da521..9111f5ec1e670bfc4177c12e24601795be291efb 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-2,8
+2,12
@@
* Status and ETA code
*/
#include <unistd.h>
* Status and ETA code
*/
#include <unistd.h>
-#include <fcntl.h>
#include <string.h>
#include <string.h>
+#ifdef CONFIG_VALGRIND_DEV
+#include <valgrind/drd.h>
+#else
+#define DRD_IGNORE_VAR(x) do { } while (0)
+#endif
#include "fio.h"
#include "lib/pow2.h"
#include "fio.h"
#include "lib/pow2.h"
@@
-145,7
+149,7
@@
void eta_to_str(char *str, unsigned long eta_sec)
str += sprintf(str, "%02uh:", h);
str += sprintf(str, "%02um:", m);
str += sprintf(str, "%02uh:", h);
str += sprintf(str, "%02um:", m);
- s
tr += s
printf(str, "%02us", s);
+ sprintf(str, "%02us", s);
}
/*
}
/*
@@
-617,7
+621,7
@@
void display_thread_status(struct jobs_eta *je)
free(iops_str[ddir]);
}
}
free(iops_str[ddir]);
}
}
-
p +=
sprintf(p, "\r");
+ sprintf(p, "\r");
printf("%s", output);
printf("%s", output);
@@
-668,6
+672,7
@@
void print_thread_status(void)
void print_status_init(int thr_number)
{
void print_status_init(int thr_number)
{
+ DRD_IGNORE_VAR(__run_str);
__run_str[thr_number] = 'P';
update_condensed_str(__run_str, run_str);
}
__run_str[thr_number] = 'P';
update_condensed_str(__run_str, run_str);
}