[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] block: clean up I/O throttling wait_time code
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 6/8] block: clean up I/O throttling wait_time code |
Date: |
Fri, 5 Apr 2013 15:28:08 +0200 |
From: Stefan Hajnoczi <address@hidden>
The wait_time variable is in seconds. Reflect this in a comment and use
NANOSECONDS_PER_SECOND instead of BLOCK_IO_SLICE_TIME * 10 (which
happens to have the right value).
Signed-off-by: Stefan Hajnoczi <address@hidden>
Tested-By: Benoit Canet <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index aa16fc4..602d8a4 100644
--- a/block.c
+++ b/block.c
@@ -3800,7 +3800,7 @@ static bool bdrv_exceed_bps_limits(BlockDriverState *bs,
int nb_sectors,
BLOCK_IO_SLICE_TIME;
bs->slice_end += extension;
if (wait) {
- *wait = wait_time * BLOCK_IO_SLICE_TIME * 10;
+ *wait = wait_time * NANOSECONDS_PER_SECOND;
}
return true;
@@ -3841,7 +3841,7 @@ static bool bdrv_exceed_iops_limits(BlockDriverState *bs,
bool is_write,
return false;
}
- /* Calc approx time to dispatch */
+ /* Calc approx time to dispatch, in seconds */
wait_time = (ios_base + 1) / iops_limit;
if (wait_time > elapsed_time) {
wait_time = wait_time - elapsed_time;
@@ -3852,7 +3852,7 @@ static bool bdrv_exceed_iops_limits(BlockDriverState *bs,
bool is_write,
/* Exceeded current slice, extend it by another slice time */
bs->slice_end += BLOCK_IO_SLICE_TIME;
if (wait) {
- *wait = wait_time * BLOCK_IO_SLICE_TIME * 10;
+ *wait = wait_time * NANOSECONDS_PER_SECOND;
}
return true;
--
1.8.1.4
- [Qemu-devel] [PULL 0/8] Block patches, Kevin Wolf, 2013/04/05
- [Qemu-devel] [PATCH 2/8] usb-storage: Forward serial number to scsi-disk, Kevin Wolf, 2013/04/05
- [Qemu-devel] [PATCH 1/8] virtio-blk-x: fix configuration synchronization., Kevin Wolf, 2013/04/05
- [Qemu-devel] [PATCH 5/8] block: drop duplicated slice extension code, Kevin Wolf, 2013/04/05
- [Qemu-devel] [PATCH 3/8] block: fix I/O throttling accounting blind spot, Kevin Wolf, 2013/04/05
- [Qemu-devel] [PATCH 6/8] block: clean up I/O throttling wait_time code,
Kevin Wolf <=
- [Qemu-devel] [PATCH 8/8] qcow2: Fix L1 write error handling in qcow2_update_snapshot_refcount, Kevin Wolf, 2013/04/05
- [Qemu-devel] [PATCH 7/8] qcow2: Return real error in qcow2_update_snapshot_refcount, Kevin Wolf, 2013/04/05
- [Qemu-devel] [PATCH 4/8] block: keep I/O throttling slice time constant, Kevin Wolf, 2013/04/05