{
const int nr_samples = iolog->nr_samples;
+ if (iolog->disabled)
+ return;
+
if (!iolog->nr_samples)
iolog->avg_last = t;
if (iolog->nr_samples == iolog->max_samples) {
int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
+ void *new_log;
- iolog->log = realloc(iolog->log, new_size);
+ new_log = realloc(iolog->log, new_size);
+ if (!new_log) {
+ log_err("fio: failed extending iolog! Will stop logging.\n");
+ iolog->disabled = 1;
+ return;
+ }
+ iolog->log = new_log;
iolog->max_samples <<= 1;
}
fio_gettime(&td->bw_sample_time, NULL);
}
-void add_iops_sample(struct thread_data *td, enum fio_ddir ddir,
+void add_iops_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
struct timeval *t)
{
struct thread_stat *ts = &td->ts;
add_stat_sample(&ts->iops_stat[ddir], iops);
if (td->iops_log)
- add_log_sample(td, td->iops_log, iops, ddir, 0);
+ add_log_sample(td, td->iops_log, iops, ddir, bs);
td->stat_io_blocks[ddir] = td->this_io_blocks[ddir];
}