[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/14] throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code
From: |
Hanna Czenczek |
Subject: |
[PULL 07/14] throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code |
Date: |
Fri, 1 Sep 2023 10:18:02 +0200 |
From: zhenwei pi <pizhenwei@bytedance.com>
The first dimension of both to_check and
bucket_types_size/bucket_types_units is used as throttle direction,
use THROTTLE_MAX instead of hard coded number. Also use ARRAY_SIZE()
to avoid hard coded number for the second dimension.
Hanna noticed that the two array should be static. Yes, turn them
into static variables.
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230728022006.1098509-8-pizhenwei@bytedance.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
---
util/throttle.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/util/throttle.c b/util/throttle.c
index 7d3eb6032f..9582899da3 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -142,7 +142,8 @@ int64_t throttle_compute_wait(LeakyBucket *bkt)
static int64_t throttle_compute_wait_for(ThrottleState *ts,
ThrottleDirection direction)
{
- BucketType to_check[2][4] = { {THROTTLE_BPS_TOTAL,
+ static const BucketType to_check[THROTTLE_MAX][4] = {
+ {THROTTLE_BPS_TOTAL,
THROTTLE_OPS_TOTAL,
THROTTLE_BPS_READ,
THROTTLE_OPS_READ},
@@ -153,7 +154,7 @@ static int64_t throttle_compute_wait_for(ThrottleState *ts,
int64_t wait, max_wait = 0;
int i;
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < ARRAY_SIZE(to_check[THROTTLE_READ]); i++) {
BucketType index = to_check[direction][i];
wait = throttle_compute_wait(&ts->cfg.buckets[index]);
if (wait > max_wait) {
@@ -469,11 +470,11 @@ bool throttle_schedule_timer(ThrottleState *ts,
void throttle_account(ThrottleState *ts, ThrottleDirection direction,
uint64_t size)
{
- const BucketType bucket_types_size[2][2] = {
+ static const BucketType bucket_types_size[THROTTLE_MAX][2] = {
{ THROTTLE_BPS_TOTAL, THROTTLE_BPS_READ },
{ THROTTLE_BPS_TOTAL, THROTTLE_BPS_WRITE }
};
- const BucketType bucket_types_units[2][2] = {
+ static const BucketType bucket_types_units[THROTTLE_MAX][2] = {
{ THROTTLE_OPS_TOTAL, THROTTLE_OPS_READ },
{ THROTTLE_OPS_TOTAL, THROTTLE_OPS_WRITE }
};
@@ -486,7 +487,7 @@ void throttle_account(ThrottleState *ts, ThrottleDirection
direction,
units = (double) size / ts->cfg.op_size;
}
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < ARRAY_SIZE(bucket_types_size[THROTTLE_READ]); i++) {
LeakyBucket *bkt;
bkt = &ts->cfg.buckets[bucket_types_size[direction][i]];
--
2.41.0
- [PULL 00/14] Block patches, Hanna Czenczek, 2023/09/01
- [PULL 02/14] test-throttle: use enum ThrottleDirection, Hanna Czenczek, 2023/09/01
- [PULL 03/14] throttle: support read-only and write-only, Hanna Czenczek, 2023/09/01
- [PULL 01/14] throttle: introduce enum ThrottleDirection, Hanna Czenczek, 2023/09/01
- [PULL 04/14] test-throttle: test read only and write only, Hanna Czenczek, 2023/09/01
- [PULL 06/14] throttle: use enum ThrottleDirection instead of bool is_write, Hanna Czenczek, 2023/09/01
- [PULL 07/14] throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code,
Hanna Czenczek <=
- [PULL 05/14] cryptodev: use NULL throttle timer cb for read direction, Hanna Czenczek, 2023/09/01
- [PULL 08/14] fsdev: Use ThrottleDirection instread of bool is_write, Hanna Czenczek, 2023/09/01
- [PULL 10/14] file-posix: Clear bs->bl.zoned on error, Hanna Czenczek, 2023/09/01
- [PULL 11/14] file-posix: Check bs->bl.zoned for zone info, Hanna Czenczek, 2023/09/01
- [PULL 13/14] file-posix: Simplify raw_co_prw's 'out' zone code, Hanna Czenczek, 2023/09/01
- [PULL 12/14] file-posix: Fix zone update in I/O error path, Hanna Czenczek, 2023/09/01
- [PULL 14/14] tests/file-io-error: New test, Hanna Czenczek, 2023/09/01
- [PULL 09/14] block/throttle-groups: Use ThrottleDirection instread of bool is_write, Hanna Czenczek, 2023/09/01
- Re: [PULL 00/14] Block patches, Stefan Hajnoczi, 2023/09/06