picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ratelimit: removed n_printed

Browse source 
Removed n_printed and renamed n_printed to num.
This is not a logging rate limiter anymore.
This commit is contained in:
Harald Hoyer 2011-02-21 15:32:18 +01:00 committed by Lennart Poettering
parent 35b8ca3aaf
commit 4ce9faa9d2
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ratelimit.c
View file

@ -38,25 +38,19 @@ bool ratelimit_test(RateLimit *r) {
if (r->begin <= 0 || if (r->begin <= 0 ||
r->begin + r->interval < ts) { r->begin + r->interval < ts) {
if (r->n_missed > 0)
log_warning("%u events suppressed", r->n_missed);
r->begin = ts; r->begin = ts;
/* Reset counters */ /* Reset counter */
r->n_printed = 0; r->num = 0;
r->n_missed = 0;
goto good; goto good;
} }
if (r->n_printed <= r->burst) if (r->num <= r->burst)
goto good; goto good;
r->n_missed++;
return false; return false;
good: good:
r->n_printed++; r->num++;
return true; return true;
} }

8
src/ratelimit.h
View file

@ -28,15 +28,14 @@ typedef struct RateLimit {
usec_t interval; usec_t interval;
usec_t begin; usec_t begin;
unsigned burst; unsigned burst;
unsigned n_printed, n_missed; unsigned num;
} RateLimit; } RateLimit;
#define RATELIMIT_DEFINE(_name, _interval, _burst) \ #define RATELIMIT_DEFINE(_name, _interval, _burst) \
RateLimit _name = { \ RateLimit _name = { \
.interval = (_interval), \ .interval = (_interval), \
.burst = (_burst), \ .burst = (_burst), \
.n_printed = 0, \ .num = 0, \
.n_missed = 0, \
.begin = 0 \ .begin = 0 \
} }
@ -45,8 +44,7 @@ typedef struct RateLimit {
RateLimit *_r = &(v); \ RateLimit *_r = &(v); \
_r->interval = (_interval); \ _r->interval = (_interval); \
_r->burst = (_burst); \ _r->burst = (_burst); \
_r->n_printed = 0; \ _r->num = 0; \
_r->n_missed = 0; \
_r->begin = 0; \ _r->begin = 0; \
} while (false); } while (false);