chiark / gitweb /
ratelimit: removed n_printed
authorHarald Hoyer <harald@redhat.com>
Mon, 21 Feb 2011 14:32:18 +0000 (15:32 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 28 Feb 2011 22:04:18 +0000 (23:04 +0100)
Removed n_printed and renamed n_printed to num.
This is not a logging rate limiter anymore.

src/ratelimit.c
src/ratelimit.h

index 5adf1ae..1ddc831 100644 (file)
@@ -38,25 +38,19 @@ bool ratelimit_test(RateLimit *r) {
 
         if (r->begin <= 0 ||
             r->begin + r->interval < ts) {
-
-                if (r->n_missed > 0)
-                        log_warning("%u events suppressed", r->n_missed);
-
                 r->begin = ts;
 
-                /* Reset counters */
-                r->n_printed = 0;
-                r->n_missed = 0;
+                /* Reset counter */
+                r->num = 0;
                 goto good;
         }
 
-        if (r->n_printed <= r->burst)
+        if (r->num <= r->burst)
                 goto good;
 
-        r->n_missed++;
         return false;
 
 good:
-        r->n_printed++;
+        r->num++;
         return true;
 }
index 2c77787..a44ef70 100644 (file)
@@ -28,15 +28,14 @@ typedef struct RateLimit {
         usec_t interval;
         usec_t begin;
         unsigned burst;
-        unsigned n_printed, n_missed;
+        unsigned num;
 } RateLimit;
 
 #define RATELIMIT_DEFINE(_name, _interval, _burst)       \
         RateLimit _name = {                              \
                 .interval = (_interval),                 \
                 .burst = (_burst),                       \
-                .n_printed = 0,                          \
-                .n_missed = 0,                           \
+                .num = 0,                                \
                 .begin = 0                               \
         }
 
@@ -45,8 +44,7 @@ typedef struct RateLimit {
                 RateLimit *_r = &(v);                    \
                 _r->interval = (_interval);              \
                 _r->burst = (_burst);                    \
-                _r->n_printed = 0;                       \
-                _r->n_missed = 0;                        \
+                _r->num = 0;                             \
                 _r->begin = 0;                           \
         } while (false);