chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: fix --help syntax for variables
[elogind.git]
/
src
/
ratelimit.c
diff --git
a/src/ratelimit.c
b/src/ratelimit.c
index 1e5ed03c55dbde295d096ba679cdacaae588db07..1ddc83187f59295fc2402a63a75fa637fbf88210 100644
(file)
--- a/
src/ratelimit.c
+++ b/
src/ratelimit.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-28,35
+28,29
@@
* <hidave.darkstar@gmail.com>, which is licensed GPLv2. */
bool ratelimit_test(RateLimit *r) {
* <hidave.darkstar@gmail.com>, which is licensed GPLv2. */
bool ratelimit_test(RateLimit *r) {
- usec_t t
imestamp
;
+ usec_t t
s
;
- t
imestamp
= now(CLOCK_MONOTONIC);
+ t
s
= now(CLOCK_MONOTONIC);
assert(r);
assert(r->interval > 0);
assert(r->burst > 0);
if (r->begin <= 0 ||
assert(r);
assert(r->interval > 0);
assert(r->burst > 0);
if (r->begin <= 0 ||
- r->begin + r->interval < timestamp) {
+ r->begin + r->interval < ts) {
+ r->begin = ts;
- if (r->n_missed > 0)
- log_warning("%u events suppressed", r->n_missed);
-
- r->begin = timestamp;
-
- /* Reset counters */
- r->n_printed = 0;
- r->n_missed = 0;
+ /* Reset counter */
+ r->num = 0;
goto good;
}
goto good;
}
- if (r->n
_printed
<= r->burst)
+ if (r->n
um
<= r->burst)
goto good;
goto good;
- r->n_missed++;
return false;
good:
return false;
good:
- r->n
_printed
++;
+ r->n
um
++;
return true;
}
return true;
}