提交 0775437f 编写于 作者: S Stefan Hajnoczi 提交者: Kevin Wolf

block: clean up I/O throttling wait_time code

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: NStefan Hajnoczi <stefanha@redhat.com>
Tested-By: NBenoit Canet <benoit@irqsave.net>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 e660fb8b
...@@ -3800,7 +3800,7 @@ static bool bdrv_exceed_bps_limits(BlockDriverState *bs, int nb_sectors, ...@@ -3800,7 +3800,7 @@ static bool bdrv_exceed_bps_limits(BlockDriverState *bs, int nb_sectors,
BLOCK_IO_SLICE_TIME; BLOCK_IO_SLICE_TIME;
bs->slice_end += extension; bs->slice_end += extension;
if (wait) { if (wait) {
*wait = wait_time * BLOCK_IO_SLICE_TIME * 10; *wait = wait_time * NANOSECONDS_PER_SECOND;
} }
return true; return true;
...@@ -3841,7 +3841,7 @@ static bool bdrv_exceed_iops_limits(BlockDriverState *bs, bool is_write, ...@@ -3841,7 +3841,7 @@ static bool bdrv_exceed_iops_limits(BlockDriverState *bs, bool is_write,
return false; return false;
} }
/* Calc approx time to dispatch */ /* Calc approx time to dispatch, in seconds */
wait_time = (ios_base + 1) / iops_limit; wait_time = (ios_base + 1) / iops_limit;
if (wait_time > elapsed_time) { if (wait_time > elapsed_time) {
wait_time = 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, ...@@ -3852,7 +3852,7 @@ static bool bdrv_exceed_iops_limits(BlockDriverState *bs, bool is_write,
/* Exceeded current slice, extend it by another slice time */ /* Exceeded current slice, extend it by another slice time */
bs->slice_end += BLOCK_IO_SLICE_TIME; bs->slice_end += BLOCK_IO_SLICE_TIME;
if (wait) { if (wait) {
*wait = wait_time * BLOCK_IO_SLICE_TIME * 10; *wait = wait_time * NANOSECONDS_PER_SECOND;
} }
return true; return true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册