git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

ratelimit: reset on start

Browse Source 
On any `Curl_rlimit_start()` the rate limit needs to reset its
values before calculating the effective step duration and adjust
the tokens/burst per step.

Add two fields to the struct to remember the original values.

Closes #21086
This commit is contained in:
Stefan Eissing 2026-03-24 13:41:51 +01:00 committed by Daniel Stenberg
parent 372d721e92
commit 797bc316bf
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ratelimit.c
View File

@ -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);
}

2
lib/ratelimit.h
View File

@ -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 */