[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/7] throttle: Make throttle_is_valid() a bit les
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH v2 3/7] throttle: Make throttle_is_valid() a bit less verbose |
Date: |
Thu, 24 Aug 2017 16:24:45 +0300 |
Use a pointer to the bucket instead of repeating cfg->buckets[i] all
the time. This makes the code more concise and will help us expand the
checks later and save a few line breaks.
Signed-off-by: Alberto Garcia <address@hidden>
---
util/throttle.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/util/throttle.c b/util/throttle.c
index 9a6bda813c..bde56fe3de 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -324,32 +324,31 @@ bool throttle_is_valid(ThrottleConfig *cfg, Error **errp)
}
for (i = 0; i < BUCKETS_COUNT; i++) {
- if (cfg->buckets[i].avg < 0 ||
- cfg->buckets[i].max < 0 ||
- cfg->buckets[i].avg > THROTTLE_VALUE_MAX ||
- cfg->buckets[i].max > THROTTLE_VALUE_MAX) {
+ LeakyBucket *bkt = &cfg->buckets[i];
+ if (bkt->avg < 0 || bkt->max < 0 ||
+ bkt->avg > THROTTLE_VALUE_MAX || bkt->max > THROTTLE_VALUE_MAX) {
error_setg(errp, "bps/iops/max values must be within [0, %lld]",
THROTTLE_VALUE_MAX);
return false;
}
- if (!cfg->buckets[i].burst_length) {
+ if (!bkt->burst_length) {
error_setg(errp, "the burst length cannot be 0");
return false;
}
- if (cfg->buckets[i].burst_length > 1 && !cfg->buckets[i].max) {
+ if (bkt->burst_length > 1 && !bkt->max) {
error_setg(errp, "burst length set without burst rate");
return false;
}
- if (cfg->buckets[i].max && !cfg->buckets[i].avg) {
+ if (bkt->max && !bkt->avg) {
error_setg(errp, "bps_max/iops_max require corresponding"
" bps/iops values");
return false;
}
- if (cfg->buckets[i].max && cfg->buckets[i].max < cfg->buckets[i].avg) {
+ if (bkt->max && bkt->max < bkt->avg) {
error_setg(errp, "bps_max/iops_max cannot be lower than bps/iops");
return false;
}
--
2.11.0
- [Qemu-devel] [PATCH v2 0/7] Misc throttle fixes, Alberto Garcia, 2017/08/24
- [Qemu-devel] [PATCH v2 1/7] throttle: Fix wrong variable name in the header documentation, Alberto Garcia, 2017/08/24
- [Qemu-devel] [PATCH v2 7/7] throttle: Test the valid range of config values, Alberto Garcia, 2017/08/24
- [Qemu-devel] [PATCH v2 3/7] throttle: Make throttle_is_valid() a bit less verbose,
Alberto Garcia <=
- [Qemu-devel] [PATCH v2 4/7] throttle: Remove throttle_fix_bucket() / throttle_unfix_bucket(), Alberto Garcia, 2017/08/24
- [Qemu-devel] [PATCH v2 5/7] throttle: Make LeakyBucket.avg and LeakyBucket.max integer types, Alberto Garcia, 2017/08/24
- [Qemu-devel] [PATCH v2 2/7] throttle: Update the throttle_fix_bucket() documentation, Alberto Garcia, 2017/08/24
- [Qemu-devel] [PATCH v2 6/7] throttle: Make burst_length 64bit and add range checks, Alberto Garcia, 2017/08/24
- Re: [Qemu-devel] [PATCH v2 0/7] Misc throttle fixes, Stefan Hajnoczi, 2017/08/29