void update_rusage_stat(struct thread_data *td)
{
- if (!(td->runtime[0] + td->runtime[1]))
- return;
-
getrusage(RUSAGE_SELF, &td->ru_end);
td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
double *mean, double *dev)
{
- double n;
+ double n, o;
if (is->samples == 0)
return 0;
n = (double) is->samples;
*mean = (double) is->val / n;
- *dev = sqrt(((double) is->val_sq - (*mean * *mean) / n) / (n - 1));
+ *dev = 0.01;
+
+ if (n <= 1.0)
+ return 1;
+
+ o = (double) is->val_sq - ((*mean * *mean) / n);
+ if (o < 0.0)
+ *dev = -1.0;
+ else
+ *dev = sqrt(o / (n - 1.0));
return 1;
}
struct group_run_stats *rs)
{
double usr_cpu, sys_cpu;
+ unsigned long runtime;
if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
return;
if (td->io_bytes[td->ddir ^ 1])
show_ddir_status(td, rs, td->ddir ^ 1);
- if (td->runtime[0] + td->runtime[1]) {
- double runt = td->runtime[0] + td->runtime[1];
+ runtime = mtime_since(&td->epoch, &td->end_time);
+ if (runtime) {
+ double runt = (double) runtime;
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
show_ddir_status_terse(td, rs, 1);
if (td->runtime[0] + td->runtime[1]) {
- double runt = td->runtime[0] + td->runtime[1];
+ double runt = (double) (td->runtime[0] + td->runtime[1]);
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
}
static void add_log_sample(struct thread_data *td, struct io_log *iolog,
- unsigned long val, int ddir)
+ unsigned long val, enum fio_ddir ddir)
{
if (iolog->nr_samples == iolog->max_samples) {
int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
iolog->nr_samples++;
}
-void add_clat_sample(struct thread_data *td, int ddir, unsigned long msec)
+void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
+ unsigned long msec)
{
add_stat_sample(&td->clat_stat[ddir], msec);
add_log_sample(td, td->clat_log, msec, ddir);
}
-void add_slat_sample(struct thread_data *td, int ddir, unsigned long msec)
+void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
+ unsigned long msec)
{
add_stat_sample(&td->slat_stat[ddir], msec);
add_log_sample(td, td->slat_log, msec, ddir);
}
-void add_bw_sample(struct thread_data *td, int ddir, struct timeval *t)
+void add_bw_sample(struct thread_data *td, enum fio_ddir ddir,
+ struct timeval *t)
{
unsigned long spent = mtime_since(&td->stat_sample_time[ddir], t);
unsigned long rate;