Token bucket once again #47
Closed
Conversation
This is a simple search-and-replace to rename the token bucket type to indicate that it contains both a read and a write bucket, bundled with their configuration. It's preliminary to refactoring the bucket type.
Begin by creating a lowest-level triple of the types needed to implement a token bucket: a configuration, a timestamp, and the raw bucket itself. Note that for low-level buckets, the units of the timestamp and the bucket itself are unspecified: each user can use a different type. (This patch breaks check-spaces; a later patch will fix it)
(The tests caught this one.)
(These functions were previously helper functions for token_bucket_rw_t).
Really, the uint32_t is only an optimization; any kind of unit should work fine. Some users might want to use time_t or monotime_coarse_t or something like that.
dgoulet-tor
reviewed
Apr 13, 2018
src/common/token_bucket.h
Outdated
| /** A timestamp for a token bucket. The units of this timestamp are | ||
| * unspecified, but must match with the rate set in the token_bucket_cfg_t. */ | ||
| typedef struct token_bucket_timestamp_t { | ||
| uint32_t last_refilled_at; |
If this is a Unix timestamp, this means we are stuck in 2038 ... :S Could we go to uint64_t to avoid that?
src/common/token_bucket.c
Outdated
| @@ -20,6 +21,51 @@ | |||
| #include "token_bucket.h" | |||
| #include "util_bug.h" | |||
|
|
|||
| /** | |||
| *Set the <b>rate</b> and <b>burst</b> value in a token_bucket_cfg. | |||
| * | |||
Whitespace missing.
Fixed in 1be0247
src/common/token_bucket.c
Outdated
| token_bucket_raw_reset(token_bucket_raw_t *bucket, | ||
| token_bucket_timestamp_t *stamp, | ||
| const token_bucket_cfg_t *cfg, | ||
| uint32_t now) |
Again, if now is a Unix timestamp, we are a bit stuck in 2038.
| * rate in <b>cfg</b>, or the result will be illogical. | ||
| */ | ||
| int | ||
| token_bucket_raw_refill_steps(token_bucket_raw_t *bucket, |
This can be made static.
No; it should be public, so that others can use token_bucket_raw.
That is to say, the idea of the refactoring here is that the token_bucket_raw() functions can be used by outside code to build token buckets that aren't specifically tied to token_bucket_rw_t.
|
This was squashed and merged with 34c2574 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
No description provided.
The text was updated successfully, but these errors were encountered: