projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixbug_glfs' of https://github.com/simon-rock/fio
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index d019747b94587a1e951d253512044b52d954b8a1..2d549ee9c8f4798154a1f3f9e515b6762cab0ebf 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"
@@
-520,7
+524,7
@@
void display_thread_status(struct jobs_eta *je)
static int eta_new_line_init, eta_new_line_pending;
static int linelen_last;
static int eta_good;
static int eta_new_line_init, eta_new_line_pending;
static int linelen_last;
static int eta_good;
- char output[
REAL_MAX_JOBS
+ 512], *p = output;
+ char output[
__THREAD_RUNSTR_SZ(REAL_MAX_JOBS)
+ 512], *p = output;
char eta_str[128];
double perc = 0.0;
char eta_str[128];
double perc = 0.0;
@@
-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);
}