__u64 time;
__u32 size_hist[BLKIOMON_SIZE_BUCKETS];
__u32 d2c_hist[BLKIOMON_D2C_BUCKETS];
- struct minmax size_mm;
- struct minmax d2c_mm;
- __u64 read;
- __u64 write;
- __u64 bidir;
__u32 device;
+ struct minmax size_r;
+ struct minmax size_w;
+ struct minmax d2c_r;
+ struct minmax d2c_w;
+ struct minmax thrput_r;
+ struct minmax thrput_w;
+ __u64 bidir;
};
static struct histlog2 size_hist = {
static inline void blkiomon_stat_init(struct blkiomon_stat *bstat)
{
memset(bstat, 0, sizeof(*bstat));
- minmax_init(&bstat->size_mm);
- minmax_init(&bstat->d2c_mm);
+ minmax_init(&bstat->size_r);
+ minmax_init(&bstat->size_w);
+ minmax_init(&bstat->d2c_r);
+ minmax_init(&bstat->d2c_w);
+ minmax_init(&bstat->thrput_r);
+ minmax_init(&bstat->thrput_w);
}
static inline void blkiomon_stat_to_be(struct blkiomon_stat *bstat)
{
histlog2_to_be(bstat->size_hist, &size_hist);
histlog2_to_be(bstat->d2c_hist, &d2c_hist);
- minmax_to_be(&bstat->size_mm);
- minmax_to_be(&bstat->d2c_mm);
- bstat->read = cpu_to_be64(bstat->read);
- bstat->write = cpu_to_be64(bstat->write);
+ minmax_to_be(&bstat->size_r);
+ minmax_to_be(&bstat->size_w);
+ minmax_to_be(&bstat->d2c_r);
+ minmax_to_be(&bstat->d2c_w);
+ minmax_to_be(&bstat->thrput_r);
+ minmax_to_be(&bstat->thrput_w);
bstat->bidir = cpu_to_be64(bstat->bidir);
bstat->time = cpu_to_be64(bstat->time);
bstat->device = cpu_to_be32(bstat->device);
{
histlog2_merge(&size_hist, dst->size_hist, src->size_hist);
histlog2_merge(&d2c_hist, dst->d2c_hist, src->d2c_hist);
- minmax_merge(&dst->size_mm, &src->size_mm);
- minmax_merge(&dst->d2c_mm, &src->d2c_mm);
- dst->read += src->read;
- dst->write += src->write;
+ minmax_merge(&dst->size_r, &src->size_r);
+ minmax_merge(&dst->size_w, &src->size_w);
+ minmax_merge(&dst->d2c_r, &src->d2c_r);
+ minmax_merge(&dst->d2c_w, &src->d2c_w);
+ minmax_merge(&dst->thrput_r, &src->thrput_r);
+ minmax_merge(&dst->thrput_w, &src->thrput_w);
dst->bidir += src->bidir;
}
fprintf(fp, "\ntime: %s", ctime((void *)&p->time));
fprintf(fp, "device: %d,%d\n", MAJOR(p->device), MINOR(p->device));
- fprintf(fp, "requests: read %ld, write %ld, bidir: %ld\n",
- (unsigned long)p->read, (unsigned long)p->write,
- (unsigned long)p->bidir);
- minmax_print(fp, "sizes", &p->size_mm);
- minmax_print(fp, "d2c", &p->d2c_mm);
- histlog2_print(fp, "sizes histogram (in kB)", p->size_hist, &size_hist);
- histlog2_print(fp, "d2c histogram (in usec)", p->d2c_hist, &d2c_hist);
+ minmax_print(fp, "sizes read (bytes)", &p->size_r);
+ minmax_print(fp, "sizes write (bytes)", &p->size_w);
+ minmax_print(fp, "d2c read (usec)", &p->d2c_r);
+ minmax_print(fp, "d2c write (usec)", &p->d2c_w);
+ minmax_print(fp, "throughput read (bytes/msec)", &p->thrput_r);
+ minmax_print(fp, "throughput write (bytes/msec)", &p->thrput_w);
+ histlog2_print(fp, "sizes histogram (bytes)", p->size_hist, &size_hist);
+ histlog2_print(fp, "d2c histogram (usec)", p->d2c_hist, &d2c_hist);
+ fprintf(fp, "bidirectional requests: %ld\n", (unsigned long)p->bidir);
}
#endif