noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small refactoring of ratelimit code to make more sense

Browse Source
This commit is contained in:
Nils O. Selåsdal
2014-03-09 23:54:48 +01:00
parent 8fca5333d9
commit 15a3cbb59a
2 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ucore/rate_limit.h
+2 -2
View File
@@ -62,7 +62,7 @@ struct RateLimit {
//money we have to "buy" tickets
long funds;
//time of the previos period
long last_ts;
long last_refill_ts;
};
/** Static initializer for a struct RateLimit
@@ -91,7 +91,7 @@ void uc_ratelimit_init(struct RateLimit *r, long tickets, long period);
* Reset a RateLimit, filling up the tickets again.
*
* @param r RateLimit to reset
* @param current ts, if non-zero, re-sets the last_ts to the current_ts
* @param current ts, if non-zero, re-sets the last_refill_ts to the current_ts
*/
void uc_ratelimit_reset(struct RateLimit *r, long current_ts);
src/rate_limit.c
+22 -15
View File
@@ -8,11 +8,12 @@ void uc_ratelimit_init(struct RateLimit *r, long tickets, long period)
r->period = period;
r->funds = 0; //we fill it on first _allow call
r->last_ts = -period; //-period ensures the first tick can start
r->last_refill_ts = -period; //-period ensures the first tick can start
//at >= 0 and still refill the bicket
assert(tickets > 0);
assert(r->period > 0);
assert(r->period != LONG_MAX);
}
void uc_ratelimit_reset(struct RateLimit *r, long current_ts)
@@ -20,22 +21,16 @@ void uc_ratelimit_reset(struct RateLimit *r, long current_ts)
r->funds = r->period * r->tickets;
if (current_ts) {
r->last_ts = current_ts;
r->last_refill_ts = current_ts;
}
}
int uc_ratelimit_allow(struct RateLimit *r, long current_ts)
static void uc_ratelimit_refill(struct RateLimit *r, long current_ts)
{
int allowed;
long diff_period;
if (r->funds >= r->period) {
//we have enough
r->funds -= r->period;
allowed = 1;
} else { //refill
long diff_period;
//Find elapsed time
diff_period = current_ts - r->last_ts;
diff_period = current_ts - r->last_refill_ts;
if (diff_period > r->period + 1) {
//help prevent overflow when calculating available_tickets below
@@ -48,12 +43,27 @@ int uc_ratelimit_allow(struct RateLimit *r, long current_ts)
//Calculate the cost of tickets that became available
r->funds += diff_period * r->tickets;
//throttle handing out tickets
if (r->funds > r->period * r->tickets) {
r->funds = r->period * r->tickets;
}
//save this period.
r->last_refill_ts = current_ts;
}
int uc_ratelimit_allow(struct RateLimit *r, long current_ts)
{
int allowed;
if (r->funds < r->period) { //not enough funds
uc_ratelimit_refill(r, current_ts);
//as we keep track of the last timestamp of refilling
//We don't need to refill when there is enough funds
}
//If we have enough to buy atleast one ticket, we can allow
if (r->funds >= r->period) {
r->funds -= r->period;
@@ -63,9 +73,6 @@ int uc_ratelimit_allow(struct RateLimit *r, long current_ts)
allowed = 0;
}
//save this period.
r->last_ts = current_ts;
}
return allowed;