projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nvme: add nvme opcodes, structures and helper functions
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index d1c9449f47173451895f9ce71167aa23276dc370..6017ca3102eb3b5795915a676e1140728b72579c 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-3,6
+3,7
@@
*/
#include <unistd.h>
#include <string.h>
*/
#include <unistd.h>
#include <string.h>
+#include <stdlib.h>
#ifdef CONFIG_VALGRIND_DEV
#include <valgrind/drd.h>
#else
#ifdef CONFIG_VALGRIND_DEV
#include <valgrind/drd.h>
#else
@@
-331,7
+332,7
@@
static void calc_rate(int unified_rw_rep, unsigned long mtime,
else
this_rate = 0;
else
this_rate = 0;
- if (unified_rw_rep) {
+ if (unified_rw_rep
== UNIFIED_MIXED
) {
rate[i] = 0;
rate[0] += this_rate;
} else
rate[i] = 0;
rate[0] += this_rate;
} else
@@
-356,7
+357,7
@@
static void calc_iops(int unified_rw_rep, unsigned long mtime,
else
this_iops = 0;
else
this_iops = 0;
- if (unified_rw_rep) {
+ if (unified_rw_rep
== UNIFIED_MIXED
) {
iops[i] = 0;
iops[0] += this_iops;
} else
iops[i] = 0;
iops[0] += this_iops;
} else
@@
-420,6
+421,7
@@
bool calc_thread_status(struct jobs_eta *je, int force)
if (is_power_of_2(td->o.kb_base))
je->is_pow2 = 1;
je->unit_base = td->o.unit_base;
if (is_power_of_2(td->o.kb_base))
je->is_pow2 = 1;
je->unit_base = td->o.unit_base;
+ je->sig_figs = td->o.sig_figs;
if (td->o.bw_avg_time < bw_avg_time)
bw_avg_time = td->o.bw_avg_time;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
if (td->o.bw_avg_time < bw_avg_time)
bw_avg_time = td->o.bw_avg_time;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
@@
-507,8
+509,9
@@
bool calc_thread_status(struct jobs_eta *je, int force)
calc_rate(unified_rw_rep, rate_time, io_bytes, rate_io_bytes,
je->rate);
memcpy(&rate_prev_time, &now, sizeof(now));
calc_rate(unified_rw_rep, rate_time, io_bytes, rate_io_bytes,
je->rate);
memcpy(&rate_prev_time, &now, sizeof(now));
+ regrow_agg_logs();
for_each_rw_ddir(ddir) {
for_each_rw_ddir(ddir) {
- add_agg_sample(sample_val(je->rate[ddir]), ddir, 0
, 0
);
+ add_agg_sample(sample_val(je->rate[ddir]), ddir, 0);
}
}
}
}
@@
-599,9
+602,9
@@
void display_thread_status(struct jobs_eta *je)
char *tr, *mr;
mr = num2str(je->m_rate[0] + je->m_rate[1] + je->m_rate[2],
char *tr, *mr;
mr = num2str(je->m_rate[0] + je->m_rate[1] + je->m_rate[2],
- je->sig_figs,
0
, je->is_pow2, N2S_BYTEPERSEC);
+ je->sig_figs,
1
, je->is_pow2, N2S_BYTEPERSEC);
tr = num2str(je->t_rate[0] + je->t_rate[1] + je->t_rate[2],
tr = num2str(je->t_rate[0] + je->t_rate[1] + je->t_rate[2],
- je->sig_figs,
0
, je->is_pow2, N2S_BYTEPERSEC);
+ je->sig_figs,
1
, je->is_pow2, N2S_BYTEPERSEC);
p += sprintf(p, ", %s-%s", mr, tr);
free(tr);
p += sprintf(p, ", %s-%s", mr, tr);
free(tr);
@@
-705,10
+708,10
@@
void print_thread_status(void)
size_t size;
je = get_jobs_eta(false, &size);
size_t size;
je = get_jobs_eta(false, &size);
- if (je)
+ if (je)
{
display_thread_status(je);
display_thread_status(je);
-
- free(je);
+ free(je);
+ }
}
void print_status_init(int thr_number)
}
void print_status_init(int thr_number)