RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

infra: make limiter {min,max}_window configurable

This commit is contained in:
Thomas Schoebel-Theuer 2013-11-20 15:14:05 +01:00
parent 8b74dddc24
commit af418eb9f0
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/lib_limiter.c
View File

@ -22,13 +22,18 @@ int mars_limit(struct mars_limiter *lim, int amount)
/* Sometimes, raw CPU clocks may do weired things...
* Smaller windows in the denominator than 1s could fake unrealistic rates.
*/
if (unlikely(window < LIMITER_TIME_RESOLUTION))
window = LIMITER_TIME_RESOLUTION;
if (unlikely(lim->lim_min_window <= 0))
lim->lim_min_window = 1000;
if (unlikely(lim->lim_max_window <= lim->lim_min_window))
lim->lim_max_window = lim->lim_min_window + 8000;
if (unlikely(window < (long long)lim->lim_min_window * (LIMITER_TIME_RESOLUTION / 1000)))
window = (long long)lim->lim_min_window * (LIMITER_TIME_RESOLUTION / 1000);
/* Only use incremental accumulation at repeated calls, but
* never after longer pauses.
*/
if (likely(lim->lim_stamp && window < LIMITER_TIME_RESOLUTION * 8)) {
if (likely(lim->lim_stamp &&
window < (long long)lim->lim_max_window * (LIMITER_TIME_RESOLUTION / 1000))) {
long long rate_raw;
int rate;
@ -55,20 +60,23 @@ int mars_limit(struct mars_limiter *lim, int amount)
delay = this_delay;
}
/* Try to keep the next window below 2s
/* Try to keep the next window below min_window
*/
window -= LIMITER_TIME_RESOLUTION;
if (window > LIMITER_TIME_RESOLUTION) {
lim->lim_stamp += window;
lim->lim_accu -= (unsigned long long)lim->lim_rate * (unsigned long long)window / LIMITER_TIME_RESOLUTION;
if (unlikely(lim->lim_accu < 0))
lim->lim_accu = 0;
window -= lim->lim_min_window * (LIMITER_TIME_RESOLUTION / 1000);
if (window > 0) {
long long used_up = (long long)lim->lim_rate * window / LIMITER_TIME_RESOLUTION;
if (used_up > 0) {
lim->lim_stamp += window;
lim->lim_accu -= used_up;
if (unlikely(lim->lim_accu < 0))
lim->lim_accu = 0;
}
}
} else { // reset, start over with new measurement cycle
if (unlikely(amount < 0))
amount = 0;
lim->lim_accu = amount;
lim->lim_stamp = now - LIMITER_TIME_RESOLUTION;
lim->lim_stamp = now - lim->lim_min_window * (LIMITER_TIME_RESOLUTION / 1000);
lim->lim_rate = 0;
}
lim = lim->lim_father;

2
kernel/lib_limiter.h
View File

@ -12,6 +12,8 @@ struct mars_limiter {
/* tunables */
int lim_max_rate;
int lim_max_delay;
int lim_min_window;
int lim_max_window;
/* readable */
int lim_rate;
int lim_cumul;

2
kernel/sy_old/mars_proc.c
View File

@ -171,6 +171,8 @@ EXPORT_SYMBOL_GPL(mars_max_loadavg);
#define LIMITER_ENTRIES(VAR, PREFIX, SUFFIX) \
INT_ENTRY(PREFIX "_ratelimit_" SUFFIX, (VAR)->lim_max_rate, 0600), \
INT_ENTRY(PREFIX "_maxdelay_ms", (VAR)->lim_max_delay,0600), \
INT_ENTRY(PREFIX "_minwindow_ms", (VAR)->lim_min_window,0600), \
INT_ENTRY(PREFIX "_maxwindow_ms", (VAR)->lim_max_window,0600), \
INT_ENTRY(PREFIX "_cumul_" SUFFIX, (VAR)->lim_cumul, 0600), \
INT_ENTRY(PREFIX "_rate_" SUFFIX, (VAR)->lim_rate, 0400) \