commit 03b96882deb60cd21c3c77746f4f9cd4aac0a724
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Apr 13 10:51:59 2018 -0400
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.
---
src/common/token_bucket.c | 33 +++++++++++-----------
src/common/token_bucket.h | 33 +++++++++++-----------
src/or/connection.c | 70 ++++++++++++++++++++++++-----------------------
src/or/connection_or.c | 4 +--
src/or/main.c | 16 +++++------
src/or/main.h | 4 +--
src/or/or.h | 2 +-
src/test/test_bwmgt.c | 68 ++++++++++++++++++++++-----------------------
8 files changed, 117 insertions(+), 113 deletions(-)
diff --git a/src/common/token_bucket.c b/src/common/token_bucket.c
index 6af298214..3191568ac 100644
--- a/src/common/token_bucket.c
+++ b/src/common/token_bucket.c
@@ -41,14 +41,14 @@ rate_per_sec_to_rate_per_step(uint32_t rate)
* starts out full.
*/
void
-token_bucket_init(token_bucket_t *bucket,
+token_bucket_rw_init(token_bucket_rw_t *bucket,
uint32_t rate,
uint32_t burst,
uint32_t now_ts)
{
- memset(bucket, 0, sizeof(token_bucket_t));
- token_bucket_adjust(bucket, rate, burst);
- token_bucket_reset(bucket, now_ts);
+ memset(bucket, 0, sizeof(token_bucket_rw_t));
+ token_bucket_rw_adjust(bucket, rate, burst);
+ token_bucket_rw_reset(bucket, now_ts);
}
/**
@@ -56,14 +56,14 @@ token_bucket_init(token_bucket_t *bucket,
* for the token bucket in *<b>bucket</b>.
*/
void
-token_bucket_adjust(token_bucket_t *bucket,
+token_bucket_rw_adjust(token_bucket_rw_t *bucket,
uint32_t rate,
uint32_t burst)
{
tor_assert_nonfatal(rate > 0);
tor_assert_nonfatal(burst > 0);
- if (burst > TOKEN_BUCKET_MAX_BURST)
- burst = TOKEN_BUCKET_MAX_BURST;
+ if (burst > TOKEN_BUCKET_RW_MAX_BURST)
+ burst = TOKEN_BUCKET_RW_MAX_BURST;
bucket->rate = rate_per_sec_to_rate_per_step(rate);
bucket->burst = burst;
@@ -75,7 +75,7 @@ token_bucket_adjust(token_bucket_t *bucket,
* Reset <b>bucket</b> to be full, as of timestamp <b>now_ts</b>.
*/
void
-token_bucket_reset(token_bucket_t *bucket,
+token_bucket_rw_reset(token_bucket_rw_t *bucket,
uint32_t now_ts)
{
bucket->read_bucket = bucket->burst;
@@ -83,7 +83,7 @@ token_bucket_reset(token_bucket_t *bucket,
bucket->last_refilled_at_ts = now_ts;
}
-/* Helper: see token_bucket_refill */
+/* Helper: see token_bucket_rw_refill */
static int
refill_single_bucket(int32_t *bucketptr,
const uint32_t rate,
@@ -116,7 +116,7 @@ refill_single_bucket(int32_t *bucketptr,
* nonempty, and TB_WRITE iff the write bucket was empty and became nonempty.
*/
int
-token_bucket_refill(token_bucket_t *bucket,
+token_bucket_rw_refill(token_bucket_rw_t *bucket,
uint32_t now_ts)
{
const uint32_t elapsed_ticks = (now_ts - bucket->last_refilled_at_ts);
@@ -167,7 +167,7 @@ decrement_single_bucket(int32_t *bucketptr,
* otherwise.
*/
int
-token_bucket_dec_read(token_bucket_t *bucket,
+token_bucket_rw_dec_read(token_bucket_rw_t *bucket,
ssize_t n)
{
return decrement_single_bucket(&bucket->read_bucket, n);
@@ -180,20 +180,21 @@ token_bucket_dec_read(token_bucket_t *bucket,
* otherwise.
*/
int
-token_bucket_dec_write(token_bucket_t *bucket,
+token_bucket_rw_dec_write(token_bucket_rw_t *bucket,
ssize_t n)
{
return decrement_single_bucket(&bucket->write_bucket, n);
}
/**
- * As token_bucket_dec_read and token_bucket_dec_write, in a single operation.
+ * As token_bucket_rw_dec_read and token_bucket_rw_dec_write, in a single
+ * operation.
*/
void
-token_bucket_dec(token_bucket_t *bucket,
+token_bucket_rw_dec(token_bucket_rw_t *bucket,
ssize_t n_read, ssize_t n_written)
{
- token_bucket_dec_read(bucket, n_read);
- token_bucket_dec_read(bucket, n_written);
+ token_bucket_rw_dec_read(bucket, n_read);
+ token_bucket_rw_dec_read(bucket, n_written);
}
diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h
index 2d1ccd5cf..f9d04f79a 100644
--- a/src/common/token_bucket.h
+++ b/src/common/token_bucket.h
@@ -2,8 +2,8 @@
/* See LICENSE for licensing information */
/**
- * \file token_bucket.h
- * \brief Headers for token_bucket.c
+ * \file token_bucket_rw.h
+ * \brief Headers for token_bucket_rw.c
**/
#ifndef TOR_TOKEN_BUCKET_H
@@ -11,52 +11,53 @@
#include "torint.h"
-typedef struct token_bucket_t {
+typedef struct token_bucket_rw_t {
uint32_t rate;
int32_t burst;
int32_t read_bucket;
int32_t write_bucket;
uint32_t last_refilled_at_ts;
-} token_bucket_t;
+} token_bucket_rw_t;
-#define TOKEN_BUCKET_MAX_BURST INT32_MAX
+#define TOKEN_BUCKET_RW_MAX_BURST INT32_MAX
-void token_bucket_init(token_bucket_t *bucket,
+void token_bucket_rw_init(token_bucket_rw_t *bucket,
uint32_t rate,
uint32_t burst,
uint32_t now_ts);
-void token_bucket_adjust(token_bucket_t *bucket,
+void token_bucket_rw_adjust(token_bucket_rw_t *bucket,
uint32_t rate, uint32_t burst);
-void token_bucket_reset(token_bucket_t *bucket,
+void token_bucket_rw_reset(token_bucket_rw_t *bucket,
uint32_t now_ts);
#define TB_READ 1
#define TB_WRITE 2
-int token_bucket_refill(token_bucket_t *bucket,
+int token_bucket_rw_refill(token_bucket_rw_t *bucket,
uint32_t now_ts);
-int token_bucket_dec_read(token_bucket_t *bucket,
+int token_bucket_rw_dec_read(token_bucket_rw_t *bucket,
ssize_t n);
-int token_bucket_dec_write(token_bucket_t *bucket,
+int token_bucket_rw_dec_write(token_bucket_rw_t *bucket,
ssize_t n);
-void token_bucket_dec(token_bucket_t *bucket,
+void token_bucket_rw_dec(token_bucket_rw_t *bucket,
ssize_t n_read, ssize_t n_written);
-static inline size_t token_bucket_get_read(const token_bucket_t *bucket);
+static inline size_t token_bucket_rw_get_read(const token_bucket_rw_t *bucket);
static inline size_t
-token_bucket_get_read(const token_bucket_t *bucket)
+token_bucket_rw_get_read(const token_bucket_rw_t *bucket)
{
const ssize_t b = bucket->read_bucket;
return b >= 0 ? b : 0;
}
-static inline size_t token_bucket_get_write(const token_bucket_t *bucket);
+static inline size_t token_bucket_rw_get_write(
+ const token_bucket_rw_t *bucket);
static inline size_t
-token_bucket_get_write(const token_bucket_t *bucket)
+token_bucket_rw_get_write(const token_bucket_rw_t *bucket)
{
const ssize_t b = bucket->write_bucket;
return b >= 0 ? b : 0;
diff --git a/src/or/connection.c b/src/or/connection.c
index 1aad68678..20c758f57 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2880,12 +2880,12 @@ connection_bucket_read_limit(connection_t *conn, time_t now)
int base = RELAY_PAYLOAD_SIZE;
int priority = conn->type != CONN_TYPE_DIR;
ssize_t conn_bucket = -1;
- size_t global_bucket_val = token_bucket_get_read(&global_bucket);
+ size_t global_bucket_val = token_bucket_rw_get_read(&global_bucket);
if (connection_speaks_cells(conn)) {
or_connection_t *or_conn = TO_OR_CONN(conn);
if (conn->state == OR_CONN_STATE_OPEN)
- conn_bucket = token_bucket_get_read(&or_conn->bucket);
+ conn_bucket = token_bucket_rw_get_read(&or_conn->bucket);
base = get_cell_network_size(or_conn->wide_circ_ids);
}
@@ -2895,7 +2895,7 @@ connection_bucket_read_limit(connection_t *conn, time_t now)
}
if (connection_counts_as_relayed_traffic(conn, now)) {
- size_t relayed = token_bucket_get_read(&global_relayed_bucket);
+ size_t relayed = token_bucket_rw_get_read(&global_relayed_bucket);
global_bucket_val = MIN(global_bucket_val, relayed);
}
@@ -2910,7 +2910,7 @@ connection_bucket_write_limit(connection_t *conn, time_t now)
int base = RELAY_PAYLOAD_SIZE;
int priority = conn->type != CONN_TYPE_DIR;
size_t conn_bucket = conn->outbuf_flushlen;
- size_t global_bucket_val = token_bucket_get_write(&global_bucket);
+ size_t global_bucket_val = token_bucket_rw_get_write(&global_bucket);
if (!connection_is_rate_limited(conn)) {
/* be willing to write to local conns even if our buckets are empty */
@@ -2921,12 +2921,13 @@ connection_bucket_write_limit(connection_t *conn, time_t now)
/* use the per-conn write limit if it's lower */
or_connection_t *or_conn = TO_OR_CONN(conn);
if (conn->state == OR_CONN_STATE_OPEN)
- conn_bucket = MIN(conn_bucket, token_bucket_get_write(&or_conn->bucket));
+ conn_bucket = MIN(conn_bucket,
+ token_bucket_rw_get_write(&or_conn->bucket));
base = get_cell_network_size(or_conn->wide_circ_ids);
}
if (connection_counts_as_relayed_traffic(conn, now)) {
- size_t relayed = token_bucket_get_write(&global_relayed_bucket);
+ size_t relayed = token_bucket_rw_get_write(&global_relayed_bucket);
global_bucket_val = MIN(global_bucket_val, relayed);
}
@@ -2956,8 +2957,9 @@ connection_bucket_write_limit(connection_t *conn, time_t now)
int
global_write_bucket_low(connection_t *conn, size_t attempt, int priority)
{
- size_t smaller_bucket = MIN(token_bucket_get_write(&global_bucket),
- token_bucket_get_write(&global_relayed_bucket));
+ size_t smaller_bucket =
+ MIN(token_bucket_rw_get_write(&global_bucket),
+ token_bucket_rw_get_write(&global_relayed_bucket));
if (authdir_mode(get_options()) && priority>1)
return 0; /* there's always room to answer v2 if we're an auth dir */
@@ -3041,12 +3043,12 @@ connection_buckets_decrement(connection_t *conn, time_t now,
return; /* local IPs are free */
if (connection_counts_as_relayed_traffic(conn, now)) {
- token_bucket_dec(&global_relayed_bucket, num_read, num_written);
+ token_bucket_rw_dec(&global_relayed_bucket, num_read, num_written);
}
- token_bucket_dec(&global_bucket, num_read, num_written);
+ token_bucket_rw_dec(&global_bucket, num_read, num_written);
if (connection_speaks_cells(conn) && conn->state == OR_CONN_STATE_OPEN) {
or_connection_t *or_conn = TO_OR_CONN(conn);
- token_bucket_dec(&or_conn->bucket, num_read, num_written);
+ token_bucket_rw_dec(&or_conn->bucket, num_read, num_written);
}
}
@@ -3060,14 +3062,14 @@ connection_consider_empty_read_buckets(connection_t *conn)
if (!connection_is_rate_limited(conn))
return; /* Always okay. */
- if (token_bucket_get_read(&global_bucket) <= 0) {
+ if (token_bucket_rw_get_read(&global_bucket) <= 0) {
reason = "global read bucket exhausted. Pausing.";
} else if (connection_counts_as_relayed_traffic(conn, approx_time()) &&
- token_bucket_get_read(&global_relayed_bucket) <= 0) {
+ token_bucket_rw_get_read(&global_relayed_bucket) <= 0) {
reason = "global relayed read bucket exhausted. Pausing.";
} else if (connection_speaks_cells(conn) &&
conn->state == OR_CONN_STATE_OPEN &&
- token_bucket_get_read(&TO_OR_CONN(conn)->bucket) <= 0) {
+ token_bucket_rw_get_read(&TO_OR_CONN(conn)->bucket) <= 0) {
reason = "connection read bucket exhausted. Pausing.";
} else
return; /* all good, no need to stop it */
@@ -3087,14 +3089,14 @@ connection_consider_empty_write_buckets(connection_t *conn)
if (!connection_is_rate_limited(conn))
return; /* Always okay. */
- if (token_bucket_get_write(&global_bucket) <= 0) {
+ if (token_bucket_rw_get_write(&global_bucket) <= 0) {
reason = "global write bucket exhausted. Pausing.";
} else if (connection_counts_as_relayed_traffic(conn, approx_time()) &&
- token_bucket_get_write(&global_relayed_bucket) <= 0) {
+ token_bucket_rw_get_write(&global_relayed_bucket) <= 0) {
reason = "global relayed write bucket exhausted. Pausing.";
} else if (connection_speaks_cells(conn) &&
conn->state == OR_CONN_STATE_OPEN &&
- token_bucket_get_write(&TO_OR_CONN(conn)->bucket) <= 0) {
+ token_bucket_rw_get_write(&TO_OR_CONN(conn)->bucket) <= 0) {
reason = "connection write bucket exhausted. Pausing.";
} else
return; /* all good, no need to stop it */
@@ -3111,17 +3113,17 @@ connection_bucket_init(void)
{
const or_options_t *options = get_options();
const uint32_t now_ts = monotime_coarse_get_stamp();
- token_bucket_init(&global_bucket,
+ token_bucket_rw_init(&global_bucket,
(int32_t)options->BandwidthRate,
(int32_t)options->BandwidthBurst,
now_ts);
if (options->RelayBandwidthRate) {
- token_bucket_init(&global_relayed_bucket,
+ token_bucket_rw_init(&global_relayed_bucket,
(int32_t)options->RelayBandwidthRate,
(int32_t)options->RelayBandwidthBurst,
now_ts);
} else {
- token_bucket_init(&global_relayed_bucket,
+ token_bucket_rw_init(&global_relayed_bucket,
(int32_t)options->BandwidthRate,
(int32_t)options->BandwidthBurst,
now_ts);
@@ -3132,15 +3134,15 @@ connection_bucket_init(void)
void
connection_bucket_adjust(const or_options_t *options)
{
- token_bucket_adjust(&global_bucket,
+ token_bucket_rw_adjust(&global_bucket,
(int32_t)options->BandwidthRate,
(int32_t)options->BandwidthBurst);
if (options->RelayBandwidthRate) {
- token_bucket_adjust(&global_relayed_bucket,
+ token_bucket_rw_adjust(&global_relayed_bucket,
(int32_t)options->RelayBandwidthRate,
(int32_t)options->RelayBandwidthBurst);
} else {
- token_bucket_adjust(&global_relayed_bucket,
+ token_bucket_rw_adjust(&global_relayed_bucket,
(int32_t)options->BandwidthRate,
(int32_t)options->BandwidthBurst);
}
@@ -3153,12 +3155,12 @@ connection_bucket_refill(time_t now, uint32_t now_ts)
smartlist_t *conns = get_connection_array();
write_buckets_empty_last_second =
- token_bucket_get_write(&global_bucket) <= 0 ||
- token_bucket_get_write(&global_relayed_bucket) <= 0;
+ token_bucket_rw_get_write(&global_bucket) <= 0 ||
+ token_bucket_rw_get_write(&global_relayed_bucket) <= 0;
/* refill the global buckets */
- token_bucket_refill(&global_bucket, now_ts);
- token_bucket_refill(&global_relayed_bucket, now_ts);
+ token_bucket_rw_refill(&global_bucket, now_ts);
+ token_bucket_rw_refill(&global_relayed_bucket, now_ts);
/* refill the per-connection buckets */
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) {
@@ -3166,17 +3168,17 @@ connection_bucket_refill(time_t now, uint32_t now_ts)
or_connection_t *or_conn = TO_OR_CONN(conn);
if (conn->state == OR_CONN_STATE_OPEN) {
- token_bucket_refill(&or_conn->bucket, now_ts);
+ token_bucket_rw_refill(&or_conn->bucket, now_ts);
}
}
if (conn->read_blocked_on_bw == 1 /* marked to turn reading back on now */
- && token_bucket_get_read(&global_bucket) > 0 /* and we can read */
+ && token_bucket_rw_get_read(&global_bucket) > 0 /* and we can read */
&& (!connection_counts_as_relayed_traffic(conn, now) ||
- token_bucket_get_read(&global_relayed_bucket) > 0)
+ token_bucket_rw_get_read(&global_relayed_bucket) > 0)
&& (!connection_speaks_cells(conn) ||
conn->state != OR_CONN_STATE_OPEN ||
- token_bucket_get_read(&TO_OR_CONN(conn)->bucket) > 0)) {
+ token_bucket_rw_get_read(&TO_OR_CONN(conn)->bucket) > 0)) {
/* and either a non-cell conn or a cell conn with non-empty bucket */
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,
"waking up conn (fd %d) for read", (int)conn->s));
@@ -3185,12 +3187,12 @@ connection_bucket_refill(time_t now, uint32_t now_ts)
}
if (conn->write_blocked_on_bw == 1
- && token_bucket_get_write(&global_bucket) > 0 /* and we can write */
+ && token_bucket_rw_get_write(&global_bucket) > 0 /* and we can write */
&& (!connection_counts_as_relayed_traffic(conn, now) ||
- token_bucket_get_write(&global_relayed_bucket) > 0)
+ token_bucket_rw_get_write(&global_relayed_bucket) > 0)
&& (!connection_speaks_cells(conn) ||
conn->state != OR_CONN_STATE_OPEN ||
- token_bucket_get_write(&TO_OR_CONN(conn)->bucket) > 0)) {
+ token_bucket_rw_get_write(&TO_OR_CONN(conn)->bucket) > 0)) {
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,
"waking up conn (fd %d) for write", (int)conn->s));
conn->write_blocked_on_bw = 0;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 3afdfa6b5..7723d9d2b 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -793,9 +793,9 @@ connection_or_update_token_buckets_helper(or_connection_t *conn, int reset,
(int)options->BandwidthBurst, 1, INT32_MAX);
}
- token_bucket_adjust(&conn->bucket, rate, burst);
+ token_bucket_rw_adjust(&conn->bucket, rate, burst);
if (reset) {
- token_bucket_reset(&conn->bucket, monotime_coarse_get_stamp());
+ token_bucket_rw_reset(&conn->bucket, monotime_coarse_get_stamp());
}
}
diff --git a/src/or/main.c b/src/or/main.c
index 0e67ea6f6..2ad915c5f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -154,10 +154,10 @@ static void shutdown_did_not_work_callback(evutil_socket_t fd, short event,
/********* START VARIABLES **********/
/* Token bucket for all traffic. */
-token_bucket_t global_bucket;
+token_bucket_rw_t global_bucket;
/* Token bucket for relayed traffic. */
-token_bucket_t global_relayed_bucket;
+token_bucket_rw_t global_relayed_bucket;
/** What was the read/write bucket before the last second_elapsed_callback()
* call? (used to determine how many bytes we've read). */
@@ -2390,9 +2390,9 @@ refill_callback(periodic_timer_t *timer, void *arg)
}
bytes_written = stats_prev_global_write_bucket -
- token_bucket_get_write(&global_bucket);
+ token_bucket_rw_get_write(&global_bucket);
bytes_read = stats_prev_global_read_bucket -
- token_bucket_get_read(&global_bucket);
+ token_bucket_rw_get_read(&global_bucket);
stats_n_bytes_read += bytes_read;
stats_n_bytes_written += bytes_written;
@@ -2404,8 +2404,8 @@ refill_callback(periodic_timer_t *timer, void *arg)
monotime_coarse_get_stamp());
}
- stats_prev_global_read_bucket = token_bucket_get_read(&global_bucket);
- stats_prev_global_write_bucket = token_bucket_get_write(&global_bucket);
+ stats_prev_global_read_bucket = token_bucket_rw_get_read(&global_bucket);
+ stats_prev_global_write_bucket = token_bucket_rw_get_write(&global_bucket);
/* remember what time it is, for next time */
refill_timer_current_millisecond = now;
@@ -2609,8 +2609,8 @@ do_main_loop(void)
/* Set up our buckets */
connection_bucket_init();
- stats_prev_global_read_bucket = token_bucket_get_read(&global_bucket);
- stats_prev_global_write_bucket = token_bucket_get_write(&global_bucket);
+ stats_prev_global_read_bucket = token_bucket_rw_get_read(&global_bucket);
+ stats_prev_global_write_bucket = token_bucket_rw_get_write(&global_bucket);
/* initialize the bootstrap status events to know we're starting up */
control_event_bootstrap(BOOTSTRAP_STATUS_STARTING, 0);
diff --git a/src/or/main.h b/src/or/main.h
index 9ef5b9472..6b9ac1b58 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -89,8 +89,8 @@ uint64_t get_main_loop_idle_count(void);
extern time_t time_of_process_start;
extern int quiet_level;
-extern token_bucket_t global_bucket;
-extern token_bucket_t global_relayed_bucket;
+extern token_bucket_rw_t global_bucket;
+extern token_bucket_rw_t global_relayed_bucket;
#ifdef MAIN_PRIVATE
STATIC void init_connection_lists(void);
diff --git a/src/or/or.h b/src/or/or.h
index 829b6755d..c0e1ffff4 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1661,7 +1661,7 @@ typedef struct or_connection_t {
time_t timestamp_lastempty; /**< When was the outbuf last completely empty?*/
- token_bucket_t bucket; /**< Used for rate limiting when the connection is
+ token_bucket_rw_t bucket; /**< Used for rate limiting when the connection is
* in state CONN_OPEN. */
/*
diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c
index 1a54f44fc..9e4748af7 100644
--- a/src/test/test_bwmgt.c
+++ b/src/test/test_bwmgt.c
@@ -21,9 +21,9 @@ static void
test_bwmgt_token_buf_init(void *arg)
{
(void)arg;
- token_bucket_t b;
+ token_bucket_rw_t b;
- token_bucket_init(&b, 16*KB, 64*KB, START_TS);
+ token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
// Burst is correct
tt_uint_op(b.burst, OP_EQ, 64*KB);
// Rate is correct, within 1 percent.
@@ -47,31 +47,31 @@ static void
test_bwmgt_token_buf_adjust(void *arg)
{
(void)arg;
- token_bucket_t b;
+ token_bucket_rw_t b;
- token_bucket_init(&b, 16*KB, 64*KB, START_TS);
+ token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
uint32_t rate_orig = b.rate;
// Increasing burst
- token_bucket_adjust(&b, 16*KB, 128*KB);
+ token_bucket_rw_adjust(&b, 16*KB, 128*KB);
tt_uint_op(b.rate, OP_EQ, rate_orig);
tt_uint_op(b.read_bucket, OP_EQ, 64*KB);
tt_uint_op(b.burst, OP_EQ, 128*KB);
// Decreasing burst but staying above bucket
- token_bucket_adjust(&b, 16*KB, 96*KB);
+ token_bucket_rw_adjust(&b, 16*KB, 96*KB);
tt_uint_op(b.rate, OP_EQ, rate_orig);
tt_uint_op(b.read_bucket, OP_EQ, 64*KB);
tt_uint_op(b.burst, OP_EQ, 96*KB);
// Decreasing burst below bucket,
- token_bucket_adjust(&b, 16*KB, 48*KB);
+ token_bucket_rw_adjust(&b, 16*KB, 48*KB);
tt_uint_op(b.rate, OP_EQ, rate_orig);
tt_uint_op(b.read_bucket, OP_EQ, 48*KB);
tt_uint_op(b.burst, OP_EQ, 48*KB);
// Changing rate.
- token_bucket_adjust(&b, 32*KB, 48*KB);
+ token_bucket_rw_adjust(&b, 32*KB, 48*KB);
tt_uint_op(b.rate, OP_GE, rate_orig*2 - 10);
tt_uint_op(b.rate, OP_LE, rate_orig*2 + 10);
tt_uint_op(b.read_bucket, OP_EQ, 48*KB);
@@ -85,33 +85,33 @@ static void
test_bwmgt_token_buf_dec(void *arg)
{
(void)arg;
- token_bucket_t b;
- token_bucket_init(&b, 16*KB, 64*KB, START_TS);
+ token_bucket_rw_t b;
+ token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
// full-to-not-full.
- tt_int_op(0, OP_EQ, token_bucket_dec_read(&b, KB));
+ tt_int_op(0, OP_EQ, token_bucket_rw_dec_read(&b, KB));
tt_int_op(b.read_bucket, OP_EQ, 63*KB);
// Full to almost-not-full
- tt_int_op(0, OP_EQ, token_bucket_dec_read(&b, 63*KB - 1));
+ tt_int_op(0, OP_EQ, token_bucket_rw_dec_read(&b, 63*KB - 1));
tt_int_op(b.read_bucket, OP_EQ, 1);
// almost-not-full to empty.
- tt_int_op(1, OP_EQ, token_bucket_dec_read(&b, 1));
+ tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, 1));
tt_int_op(b.read_bucket, OP_EQ, 0);
// reset bucket, try full-to-empty
- token_bucket_init(&b, 16*KB, 64*KB, START_TS);
- tt_int_op(1, OP_EQ, token_bucket_dec_read(&b, 64*KB));
+ 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));
tt_int_op(b.read_bucket, OP_EQ, 0);
// reset bucket, try underflow.
- token_bucket_init(&b, 16*KB, 64*KB, START_TS);
- tt_int_op(1, OP_EQ, token_bucket_dec_read(&b, 64*KB + 1));
+ 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));
tt_int_op(b.read_bucket, OP_EQ, -1);
// A second underflow does not make the bucket empty.
- tt_int_op(0, OP_EQ, token_bucket_dec_read(&b, 1000));
+ tt_int_op(0, OP_EQ, token_bucket_rw_dec_read(&b, 1000));
tt_int_op(b.read_bucket, OP_EQ, -1001);
done:
@@ -122,21 +122,21 @@ static void
test_bwmgt_token_buf_refill(void *arg)
{
(void)arg;
- token_bucket_t b;
+ token_bucket_rw_t b;
const uint32_t SEC =
(uint32_t)monotime_msec_to_approx_coarse_stamp_units(1000);
printf("%d\n", (int)SEC);
- token_bucket_init(&b, 16*KB, 64*KB, START_TS);
+ token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS);
/* Make the buffer much emptier, then let one second elapse. */
- token_bucket_dec_read(&b, 48*KB);
+ token_bucket_rw_dec_read(&b, 48*KB);
tt_int_op(b.read_bucket, OP_EQ, 16*KB);
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC));
tt_int_op(b.read_bucket, OP_GT, 32*KB - 300);
tt_int_op(b.read_bucket, OP_LT, 32*KB + 300);
/* Another half second. */
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC*3/2));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2));
tt_int_op(b.read_bucket, OP_GT, 40*KB - 400);
tt_int_op(b.read_bucket, OP_LT, 40*KB + 400);
tt_uint_op(b.last_refilled_at_ts, OP_EQ, START_TS + SEC*3/2);
@@ -144,48 +144,48 @@ test_bwmgt_token_buf_refill(void *arg)
/* No time: nothing happens. */
{
const uint32_t bucket_orig = b.read_bucket;
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC*3/2));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2));
tt_int_op(b.read_bucket, OP_EQ, bucket_orig);
}
/* Another 30 seconds: fill the bucket. */
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC*3/2 + SEC*30));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*30));
tt_int_op(b.read_bucket, OP_EQ, b.burst);
tt_uint_op(b.last_refilled_at_ts, OP_EQ, START_TS + SEC*3/2 + SEC*30);
/* Another 30 seconds: nothing happens. */
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC*3/2 + SEC*60));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*60));
tt_int_op(b.read_bucket, OP_EQ, b.burst);
tt_uint_op(b.last_refilled_at_ts, OP_EQ, START_TS + SEC*3/2 + SEC*60);
/* Empty the bucket, let two seconds pass, and make sure that a refill is
* noticed. */
- tt_int_op(1, OP_EQ, token_bucket_dec_read(&b, b.burst));
+ tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, b.burst));
tt_int_op(0, OP_EQ, b.read_bucket);
- tt_int_op(1, OP_EQ, token_bucket_refill(&b, START_TS + SEC*3/2 + SEC*61));
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC*3/2 + SEC*62));
+ 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));
tt_int_op(b.read_bucket, OP_GT, 32*KB-400);
tt_int_op(b.read_bucket, OP_LT, 32*KB+400);
/* Underflow the bucket, make sure we detect when it has tokens again. */
- tt_int_op(1, OP_EQ, token_bucket_dec_read(&b, b.read_bucket+16*KB));
+ tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, b.read_bucket+16*KB));
tt_int_op(-16*KB, OP_EQ, b.read_bucket);
// half a second passes...
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC*64));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64));
tt_int_op(b.read_bucket, OP_GT, -8*KB-300);
tt_int_op(b.read_bucket, OP_LT, -8*KB+300);
// a second passes
- tt_int_op(1, OP_EQ, token_bucket_refill(&b, START_TS + SEC*65));
+ tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*65));
tt_int_op(b.read_bucket, OP_GT, 8*KB-400);
tt_int_op(b.read_bucket, OP_LT, 8*KB+400);
// We step a second backwards, and nothing happens.
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, START_TS + SEC*64));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64));
tt_int_op(b.read_bucket, OP_GT, 8*KB-400);
tt_int_op(b.read_bucket, OP_LT, 8*KB+400);
// A ridiculous amount of time passes.
- tt_int_op(0, OP_EQ, token_bucket_refill(&b, INT32_MAX));
+ tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, INT32_MAX));
tt_int_op(b.read_bucket, OP_EQ, b.burst);
done:
