diff options
| author | mav <mav@FreeBSD.org> | 2015-10-05 11:01:18 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-05 11:01:18 +0000 |
| commit | 06a6d5a7e3b17cc5d5954391a0381bd879162cd9 (patch) | |
| tree | dc675ff3e001d11cc3101f570b5cedd33932ba35 /sys/cam/ctl/ctl_backend_block.c | |
| parent | c6145a39413884ba52da9cff41d3c6f66599bc1d (diff) | |
| download | FreeBSD-src-06a6d5a7e3b17cc5d5954391a0381bd879162cd9.zip FreeBSD-src-06a6d5a7e3b17cc5d5954391a0381bd879162cd9.tar.gz | |
MFC r288215: Switch I/O time accounting from system time to uptime.
While there, make num_dmas accounted independently of CTL_TIME_IO.
Diffstat (limited to 'sys/cam/ctl/ctl_backend_block.c')
| -rw-r--r-- | sys/cam/ctl/ctl_backend_block.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c index 29009a9..5985993 100644 --- a/sys/cam/ctl/ctl_backend_block.c +++ b/sys/cam/ctl/ctl_backend_block.c @@ -408,11 +408,11 @@ ctl_be_block_move_done(union ctl_io *io) DPRINTF("entered\n"); #ifdef CTL_TIME_IO - getbintime(&cur_bt); + getbinuptime(&cur_bt); bintime_sub(&cur_bt, &io->io_hdr.dma_start_bt); bintime_add(&io->io_hdr.dma_bt, &cur_bt); +#endif io->io_hdr.num_dmas++; -#endif io->scsiio.kern_rel_offset += io->scsiio.kern_data_len; /* @@ -566,8 +566,8 @@ ctl_be_block_biodone(struct bio *bio) ctl_serseq_done(io); } #ifdef CTL_TIME_IO - getbintime(&io->io_hdr.dma_start_bt); -#endif + getbinuptime(&io->io_hdr.dma_start_bt); +#endif ctl_datamove(io); } } @@ -788,8 +788,8 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun, ctl_serseq_done(io); } #ifdef CTL_TIME_IO - getbintime(&io->io_hdr.dma_start_bt); -#endif + getbinuptime(&io->io_hdr.dma_start_bt); +#endif ctl_datamove(io); } } @@ -959,8 +959,8 @@ ctl_be_block_dispatch_zvol(struct ctl_be_block_lun *be_lun, ctl_serseq_done(io); } #ifdef CTL_TIME_IO - getbintime(&io->io_hdr.dma_start_bt); -#endif + getbinuptime(&io->io_hdr.dma_start_bt); +#endif ctl_datamove(io); } } @@ -1666,8 +1666,8 @@ ctl_be_block_dispatch(struct ctl_be_block_lun *be_lun, } else { SDT_PROBE(cbb, kernel, write, alloc_done, 0, 0, 0, 0, 0); #ifdef CTL_TIME_IO - getbintime(&io->io_hdr.dma_start_bt); -#endif + getbinuptime(&io->io_hdr.dma_start_bt); +#endif ctl_datamove(io); } } |
