nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-23 06:24:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
63b4ea22af
tor/src/test/test_bwmgt.c

229 lines
7.1 KiB
C
Raw Normal View History

Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
/* Copyright (c) 2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
/**
* \file test_bwmgt.c
* \brief tests for bandwidth management / token bucket functions
*/
#define TOKEN_BUCKET_PRIVATE
Run rectify_include_paths.py
2018-06-20 15:35:05 +02:00
#include "or/or.h"
#include "test/test.h"
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
Clean up include paths for libtor-evloop (automated)
2018-07-05 21:14:04 +02:00
#include "lib/evloop/token_bucket.h"
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// an imaginary time, in timestamp units. Chosen so it will roll over.
static const uint32_t START_TS = UINT32_MAX-10;
static const int32_t KB = 1024;
Replace U64_LITERAL with the standard UINT64_C
2018-07-03 16:33:50 +02:00
static const uint32_t GB = (UINT64_C(1) << 30);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
static void
test_bwmgt_token_buf_init(void *arg)
{
(void)arg;
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_t b;
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// Burst is correct
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_uint_op(b.cfg.burst, OP_EQ, 64*KB);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// Rate is correct, within 1 percent.
{
uint32_t ticks_per_sec =
(uint32_t) monotime_msec_to_approx_coarse_stamp_units(1000);
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
uint32_t rate_per_sec = (b.cfg.rate * ticks_per_sec / TICKS_PER_STEP);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
tt_uint_op(rate_per_sec, OP_GT, 16*KB-160);
tt_uint_op(rate_per_sec, OP_LT, 16*KB+160);
}
// Bucket starts out full:
Refactor "timestamp" not to be its own type coupled to token buffers 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.
2018-04-13 18:03:29 +02:00
tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS);
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, 64*KB);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
done:
;
}
static void
test_bwmgt_token_buf_adjust(void *arg)
{
(void)arg;
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_t b;
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
uint32_t rate_orig = b.cfg.rate;
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// Increasing burst
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_adjust(&b, 16*KB, 128*KB);
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_uint_op(b.cfg.rate, OP_EQ, rate_orig);
tt_uint_op(b.read_bucket.bucket, OP_EQ, 64*KB);
tt_uint_op(b.cfg.burst, OP_EQ, 128*KB);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// Decreasing burst but staying above bucket
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_adjust(&b, 16*KB, 96*KB);
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_uint_op(b.cfg.rate, OP_EQ, rate_orig);
tt_uint_op(b.read_bucket.bucket, OP_EQ, 64*KB);
tt_uint_op(b.cfg.burst, OP_EQ, 96*KB);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// Decreasing burst below bucket,
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_adjust(&b, 16*KB, 48*KB);
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_uint_op(b.cfg.rate, OP_EQ, rate_orig);
tt_uint_op(b.read_bucket.bucket, OP_EQ, 48*KB);
tt_uint_op(b.cfg.burst, OP_EQ, 48*KB);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// Changing rate.
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_adjust(&b, 32*KB, 48*KB);
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_uint_op(b.cfg.rate, OP_GE, rate_orig*2 - 10);
tt_uint_op(b.cfg.rate, OP_LE, rate_orig*2 + 10);
tt_uint_op(b.read_bucket.bucket, OP_EQ, 48*KB);
tt_uint_op(b.cfg.burst, OP_EQ, 48*KB);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
done:
;
}
static void
test_bwmgt_token_buf_dec(void *arg)
{
(void)arg;
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_t b;
token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// full-to-not-full.
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_dec_read(&b, KB));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, 63*KB);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// Full to almost-not-full
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_dec_read(&b, 63*KB - 1));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, 1);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// almost-not-full to empty.
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, 1));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, 0);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// reset bucket, try full-to-empty
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, 64*KB));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, 0);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// reset bucket, try underflow.
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, 64*KB + 1));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, -1);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// A second underflow does not make the bucket empty.
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_dec_read(&b, 1000));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, -1001);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
done:
;
}
static void
test_bwmgt_token_buf_refill(void *arg)
{
(void)arg;
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_t b;
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
const uint32_t SEC =
(uint32_t)monotime_msec_to_approx_coarse_stamp_units(1000);
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
/* Make the buffer much emptier, then let one second elapse. */
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
token_bucket_rw_dec_read(&b, 48*KB);
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, 16*KB);
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB - 300);
tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB + 300);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
/* Another half second. */
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_GT, 40*KB - 400);
tt_int_op(b.read_bucket.bucket, OP_LT, 40*KB + 400);
Refactor "timestamp" not to be its own type coupled to token buffers 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.
2018-04-13 18:03:29 +02:00
tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
/* No time: nothing happens. */
{
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
const uint32_t bucket_orig = b.read_bucket.bucket;
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, bucket_orig);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
}
/* Another 30 seconds: fill the bucket. */
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*30));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst);
Refactor "timestamp" not to be its own type coupled to token buffers 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.
2018-04-13 18:03:29 +02:00
tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*30);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
/* Another 30 seconds: nothing happens. */
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*60));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst);
Refactor "timestamp" not to be its own type coupled to token buffers 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.
2018-04-13 18:03:29 +02:00
tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*60);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
/* Empty the bucket, let two seconds pass, and make sure that a refill is
* noticed. */
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, b.cfg.burst));
tt_int_op(0, OP_EQ, b.read_bucket.bucket);
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*61));
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*62));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB-400);
tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB+400);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
/* Underflow the bucket, make sure we detect when it has tokens again. */
Fix "make check-spaces"
2018-04-13 18:04:54 +02:00
tt_int_op(1, OP_EQ,
token_bucket_rw_dec_read(&b, b.read_bucket.bucket+16*KB));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(-16*KB, OP_EQ, b.read_bucket.bucket);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// half a second passes...
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_GT, -8*KB-300);
tt_int_op(b.read_bucket.bucket, OP_LT, -8*KB+300);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
// a second passes
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*65));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400);
tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
Accept small hops backward in the monotonic timer.
2018-04-12 19:11:35 +02:00
// We step a second backwards, and nothing happens.
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400);
tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400);
Accept small hops backward in the monotonic timer.
2018-04-12 19:11:35 +02:00
// A ridiculous amount of time passes.
Rename token_bucket_t to token_bucket_rw_t. 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.
2018-04-13 16:51:59 +02:00
tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, INT32_MAX));
Start re-refactoring the token bucket interface. 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)
2018-04-13 17:30:53 +02:00
tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst);
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
done:
;
}
token: Fix uint32_t to uint64_t conversion Unfortunately, the units passed to monotime_coarse_stamp_units_to_approx_msec() was always 0 due to a type conversion. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-16 21:02:51 +02:00
/* Test some helper functions we use within the token bucket interface. */
static void
test_bwmgt_token_buf_helpers(void *arg)
{
uint32_t ret;
(void) arg;
/* The returned value will be OS specific but in any case, it should be
* greater than 1 since we are passing 1GB/sec rate. */
ret = rate_per_sec_to_rate_per_step(1 * GB);
tt_u64_op(ret, OP_GT, 1);
/* We default to 1 in case rate is 0. */
ret = rate_per_sec_to_rate_per_step(0);
tt_u64_op(ret, OP_EQ, 1);
done:
;
}
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
#define BWMGT(name) \
{ #name, test_bwmgt_ ## name , 0, NULL, NULL }
struct testcase_t bwmgt_tests[] = {
BWMGT(token_buf_init),
BWMGT(token_buf_adjust),
BWMGT(token_buf_dec),
BWMGT(token_buf_refill),
token: Fix uint32_t to uint64_t conversion Unfortunately, the units passed to monotime_coarse_stamp_units_to_approx_msec() was always 0 due to a type conversion. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-16 21:02:51 +02:00
BWMGT(token_buf_helpers),
Add a new token-bucket backend abstraction, with tests This differs from our previous token bucket abstraction in a few ways: 1) It is an abstraction, and not a collection of fields. 2) It is meant to be used with monotonic timestamps, which should produce better results than calling gettimeofday over and over.
2018-04-10 17:23:14 +02:00
END_OF_TESTCASES
};
Reference in New Issue Copy Permalink