lib: Expose SAT_MUT as OVS_SAT_MUL in <openvswitch/util.h>

[cascardo/ovs.git] / lib / vlog.h

diff --git a/lib/vlog.h b/lib/vlog.h
index e5af21d..8190a44 100644 (file)
--- a/lib/vlog.h
+++ b/lib/vlog.h
@@ -33,7 +33,7 @@
 #include "compiler.h"
 #include "ovs-thread.h"
 #include "sat-math.h"
-#include "token-bucket.h"
+#include "openvswitch/token-bucket.h"
 #include "util.h"
 #include "list.h"
 
@@ -116,7 +116,7 @@ struct vlog_rate_limit {
  * messages per minute and a maximum burst size of BURST messages. */
 #define VLOG_RATE_LIMIT_INIT(RATE, BURST)                               \
         {                                                               \
-            TOKEN_BUCKET_INIT(RATE, SAT_MUL(BURST, VLOG_MSG_TOKENS)),   \
+            TOKEN_BUCKET_INIT(RATE, OVS_SAT_MUL(BURST, VLOG_MSG_TOKENS)),\
             0,                              /* first_dropped */         \
             0,                              /* last_dropped */          \
             0,                              /* n_dropped */             \
@@ -127,7 +127,7 @@ struct vlog_rate_limit {
 enum vlog_level vlog_get_level(const struct vlog_module *, enum vlog_facility);
 void vlog_set_levels(struct vlog_module *,
                      enum vlog_facility, enum vlog_level);
-char *vlog_set_levels_from_string(const char *) WARN_UNUSED_RESULT;
+char *vlog_set_levels_from_string(const char *) OVS_WARN_UNUSED_RESULT;
 void vlog_set_levels_from_string_assert(const char *);
 char *vlog_get_levels(void);
 bool vlog_is_enabled(const struct vlog_module *, enum vlog_level);
@@ -149,24 +149,26 @@ void vlog_enable_async(void);
 
 /* Functions for actual logging. */
 void vlog(const struct vlog_module *, enum vlog_level, const char *format, ...)
-    PRINTF_FORMAT (3, 4);
+    OVS_PRINTF_FORMAT (3, 4);
 void vlog_valist(const struct vlog_module *, enum vlog_level,
                  const char *, va_list)
-    PRINTF_FORMAT (3, 0);
+    OVS_PRINTF_FORMAT (3, 0);
 
-void vlog_fatal(const struct vlog_module *, const char *format, ...)
-    PRINTF_FORMAT (2, 3) NO_RETURN;
-void vlog_fatal_valist(const struct vlog_module *, const char *format, va_list)
-    PRINTF_FORMAT (2, 0) NO_RETURN;
+OVS_NO_RETURN void vlog_fatal(const struct vlog_module *, const char *format, ...)
+    OVS_PRINTF_FORMAT (2, 3);
+OVS_NO_RETURN void vlog_fatal_valist(const struct vlog_module *,
+                                 const char *format, va_list)
+    OVS_PRINTF_FORMAT (2, 0);
 
-void vlog_abort(const struct vlog_module *, const char *format, ...)
-    PRINTF_FORMAT (2, 3) NO_RETURN;
-void vlog_abort_valist(const struct vlog_module *, const char *format, va_list)
-    PRINTF_FORMAT (2, 0) NO_RETURN;
+OVS_NO_RETURN void vlog_abort(const struct vlog_module *, const char *format, ...)
+    OVS_PRINTF_FORMAT (2, 3);
+OVS_NO_RETURN void vlog_abort_valist(const struct vlog_module *,
+                                 const char *format, va_list)
+    OVS_PRINTF_FORMAT (2, 0);
 
 void vlog_rate_limit(const struct vlog_module *, enum vlog_level,
                      struct vlog_rate_limit *, const char *, ...)
-    PRINTF_FORMAT (4, 5);
+    OVS_PRINTF_FORMAT (4, 5);
 
 /* Creates and initializes a global instance of a module named MODULE, and
  * defines a static variable named THIS_MODULE that points to it, for use with