X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fvlog.h;h=c6980a2f95476c87fd0a84de29ac7b8cbf851217;hb=06e22ff0fe709ec119fea34c555e9411a4cce0d9;hp=068a62779760eb821fd537612227312d5d128df0;hpb=792576de0140a4fc9050a2533b8761c0b997b547;p=sliver-openvswitch.git

diff --git a/include/vlog.h b/include/vlog.h
index 068a62779..c6980a2f9 100644
--- a/include/vlog.h
+++ b/include/vlog.h
@@ -34,14 +34,22 @@
 #ifndef VLOG_H
 #define VLOG_H 1
 
+#include <limits.h>
+#include <stdarg.h>
 #include <stdbool.h>
+#include <time.h>
+#include "util.h"
 
 /* Logging importance levels. */
+#define VLOG_LEVELS                             \
+    VLOG_LEVEL(EMER)                            \
+    VLOG_LEVEL(ERR)                             \
+    VLOG_LEVEL(WARN)                            \
+    VLOG_LEVEL(DBG)
 enum vlog_level {
-    VLL_EMER,
-    VLL_ERR,
-    VLL_WARN,
-    VLL_DBG,
+#define VLOG_LEVEL(NAME) VLL_##NAME,
+    VLOG_LEVELS
+#undef VLOG_LEVEL
     VLL_N_LEVELS
 };
 
@@ -49,9 +57,13 @@ const char *vlog_get_level_name(enum vlog_level);
 enum vlog_level vlog_get_level_val(const char *name);
 
 /* Facilities that we can log to. */
+#define VLOG_FACILITIES                         \
+    VLOG_FACILITY(SYSLOG)                       \
+    VLOG_FACILITY(CONSOLE)
 enum vlog_facility {
-    VLF_SYSLOG,
-    VLF_CONSOLE,
+#define VLOG_FACILITY(NAME) VLF_##NAME,
+    VLOG_FACILITIES
+#undef VLOG_FACILITY
     VLF_N_FACILITIES,
     VLF_ANY_FACILITY = -1
 };
@@ -59,37 +71,10 @@ enum vlog_facility {
 const char *vlog_get_facility_name(enum vlog_facility);
 enum vlog_facility vlog_get_facility_val(const char *name);
 
-/* Modules that can emit log messages. */
-#define VLOG_MODULES                            \
-        VLOG_MODULE(chain)                      \
-        VLOG_MODULE(controller)                 \
-        VLOG_MODULE(ctlpath)                    \
-        VLOG_MODULE(daemon)                     \
-        VLOG_MODULE(datapath)                   \
-        VLOG_MODULE(dpif)                       \
-        VLOG_MODULE(dpctl)                      \
-        VLOG_MODULE(fault)                      \
-        VLOG_MODULE(flow)                       \
-        VLOG_MODULE(learning_switch)            \
-        VLOG_MODULE(mac_learning)               \
-        VLOG_MODULE(netdev)                     \
-        VLOG_MODULE(netlink)                    \
-        VLOG_MODULE(poll_loop)                  \
-        VLOG_MODULE(secchan)                    \
-        VLOG_MODULE(rconn)                      \
-        VLOG_MODULE(switch)                     \
-        VLOG_MODULE(socket_util)                \
-        VLOG_MODULE(vconn_netlink)              \
-        VLOG_MODULE(vconn_tcp)                  \
-        VLOG_MODULE(vconn_ssl)                  \
-        VLOG_MODULE(vconn)                      \
-        VLOG_MODULE(vlog)                       \
-
 /* VLM_ constant for each vlog module. */
 enum vlog_module {
 #define VLOG_MODULE(NAME) VLM_##NAME,
-    VLOG_MODULES
-#undef VLOG_MODULE
+#include "vlog-modules.def"
     VLM_N_MODULES,
     VLM_ANY_MODULE = -1
 };
@@ -97,6 +82,36 @@ enum vlog_module {
 const char *vlog_get_module_name(enum vlog_module);
 enum vlog_module vlog_get_module_val(const char *name);
 
+/* Rate-limiter for log messages. */
+struct vlog_rate_limit {
+    /* Configuration settings. */
+    unsigned int rate;          /* Tokens per second. */
+    unsigned int burst;         /* Max cumulative tokens credit. */
+
+    /* Current status. */
+    unsigned int tokens;        /* Current number of tokens. */
+    time_t last_fill;           /* Last time tokens added. */
+    time_t first_dropped;       /* Time first message was dropped. */
+    unsigned int n_dropped;     /* Number of messages dropped. */
+};
+
+/* Number of tokens to emit a message.  We add 'rate' token per second, which
+ * is 60 times the unit used for 'rate', thus 60 tokens are required to emit
+ * one message. */
+#define VLOG_MSG_TOKENS 60
+
+/* Initializer for a struct vlog_rate_limit, to set up a maximum rate of RATE
+ * messages per minute and a maximum burst size of BURST messages. */
+#define VLOG_RATE_LIMIT_INIT(RATE, BURST)                   \
+        {                                                   \
+            RATE,                           /* rate */      \
+            (MIN(BURST, UINT_MAX / VLOG_MSG_TOKENS)         \
+             * VLOG_MSG_TOKENS),            /* burst */     \
+            0,                              /* tokens */    \
+            0,                              /* last_fill */ \
+            0,                              /* n_dropped */ \
+        }
+
 /* Configuring how each module logs messages. */
 enum vlog_level vlog_get_level(enum vlog_module, enum vlog_facility);
 void vlog_set_levels(enum vlog_module, enum vlog_facility, enum vlog_level);
@@ -110,6 +125,11 @@ void vlog_init(void);
 void vlog_exit(void);
 void vlog(enum vlog_module, enum vlog_level, const char *format, ...)
     __attribute__((format(printf, 3, 4)));
+void vlog_valist(enum vlog_module, enum vlog_level, const char *, va_list)
+    __attribute__((format(printf, 3, 0)));
+void vlog_rate_limit(enum vlog_module, enum vlog_level,
+                     struct vlog_rate_limit *, const char *, ...)
+    __attribute__((format(printf, 4, 5)));
 
 /* Convenience macros.  To use these, define THIS_MODULE as a macro that
  * expands to the module used by the current source file, e.g.
@@ -130,4 +150,17 @@ void vlog(enum vlog_module, enum vlog_level, const char *format, ...)
 #define VLOG_IS_WARN_ENABLED() vlog_is_enabled(THIS_MODULE, VLL_WARN)
 #define VLOG_IS_DBG_ENABLED() vlog_is_enabled(THIS_MODULE, VLL_DBG)
 
+/* Convenience macros.  To use these, define THIS_MODULE as a macro that
+ * expands to the module used by the current source file, e.g.
+ *      #include "vlog.h"
+ *      #define THIS_MODULE VLM_netlink
+ * Guaranteed to preserve errno.
+ */
+#define VLOG_ERR_RL(RL, ...) \
+        vlog_rate_limit(THIS_MODULE, VLL_ERR, RL, __VA_ARGS__)
+#define VLOG_WARN_RL(RL, ...) \
+        vlog_rate_limit(THIS_MODULE, VLL_WARN, RL, __VA_ARGS__)
+#define VLOG_DBG_RL(RL, ...) \
+        vlog_rate_limit(THIS_MODULE, VLL_DBG, RL, __VA_ARGS__)
+
 #endif /* vlog.h */