797bc316bf
Stefan Eissing
2026-03-24
Subject
ratelimit: reset on start
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/ratelimit.c+8 -3
| @@ -157,8 +157,8 @@ void Curl_rlimit_init(struct Curl_rlimit *r, | |
| DEBUGASSERT(rate_per_sec >= 0); | |
| DEBUGASSERT(burst_per_sec >= rate_per_sec || !burst_per_sec); | |
| DEBUGASSERT(pts); | |
| - | r->rate_per_step = rate_per_sec; |
| - | r->burst_per_step = burst_per_sec; |
| + | r->rate_per_step = r->rate_per_sec = rate_per_sec; |
| + | r->burst_per_step = r->burst_per_sec = burst_per_sec; |
| r->step_us = CURL_US_PER_SEC; | |
| r->spare_us = 0; | |
| r->tokens = r->rate_per_step; | |
| @@ -169,8 +169,13 @@ void Curl_rlimit_init(struct Curl_rlimit *r, | |
| void Curl_rlimit_start(struct Curl_rlimit *r, const struct curltime *pts, | |
| int64_t total_tokens) | |
| { | |
| - | r->tokens = r->rate_per_step; |
| + | /* A start always resets the values to initial defaults, then |
| + | * fine tunes the intervals for the total_tokens expected. */ |
| + | r->rate_per_step = r->rate_per_sec; |
| + | r->burst_per_step = r->burst_per_sec; |
| + | r->step_us = CURL_US_PER_SEC; |
| r->spare_us = 0; | |
| + | r->tokens = r->rate_per_step; |
| r->ts = *pts; | |
| rlimit_tune_steps(r, total_tokens); | |
| } | |
lib/ratelimit.h+2 -0
| @@ -55,6 +55,8 @@ struct Curl_easy; | |
| */ | |
| struct Curl_rlimit { | |
| + | int64_t rate_per_sec; /* rate tokens generated per second */ |
| + | int64_t burst_per_sec; /* burst rate of tokens per second */ |
| int64_t rate_per_step; /* rate tokens generated per step us */ | |
| int64_t burst_per_step; /* burst rate of tokens per step us */ | |
| timediff_t step_us; /* microseconds between token increases */ | |