lib: Move vlog.h to <openvswitch/vlog.h>

A new function vlog_insert_module() is introduced to avoid using list_insert() from the vlog.h header. Signed-off-by: Thomas Graf <[email protected]> Acked-by: Ben Pfaff <[email protected]>
dhanunjaya · Dec 15, 2014 · e6211ad · e6211ad
1 parent 55951e1
commit e6211ad
Show file tree

Hide file tree

Showing 123 changed files with 150 additions and 140 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -6,5 +6,6 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/token-bucket.h \
 	include/openvswitch/types.h \
 	include/openvswitch/util.h \
-	include/openvswitch/version.h
+	include/openvswitch/version.h \
+	include/openvswitch/vlog.h
 
diff --git a/lib/vlog.h → include/openvswitch/vlog.h b/lib/vlog.h → include/openvswitch/vlog.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef VLOG_H
-#define VLOG_H 1
+#ifndef OPENVSWITCH_VLOG_H
+#define OPENVSWITCH_VLOG_H 1
 
 /* Logging.
  *
@@ -30,12 +30,11 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <time.h>
-#include "compiler.h"
-#include "ovs-thread.h"
-#include "sat-math.h"
-#include "openvswitch/token-bucket.h"
-#include "util.h"
-#include "list.h"
+#include <openvswitch/compiler.h>
+#include <openvswitch/list.h>
+#include <openvswitch/thread.h>
+#include <openvswitch/token-bucket.h>
+#include <openvswitch/util.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -89,11 +88,13 @@ struct vlog_module {
 /* Global list of all logging modules */
 extern struct ovs_list vlog_modules;
 
+void vlog_insert_module(struct ovs_list *);
+
 /* Creates and initializes a global instance of a module named MODULE. */
 #define VLOG_DEFINE_MODULE(MODULE)                                      \
         VLOG_DEFINE_MODULE__(MODULE)                                    \
         OVS_CONSTRUCTOR(init_##MODULE) {                                \
-                list_insert(&vlog_modules, &VLM_##MODULE.list);         \
+                vlog_insert_module(&VLM_##MODULE.list);                 \
         }                                                               \
 
 const char *vlog_get_module_name(const struct vlog_module *);
@@ -114,13 +115,13 @@ struct vlog_rate_limit {
 
 /* 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)                               \
-        {                                                               \
-            TOKEN_BUCKET_INIT(RATE, OVS_SAT_MUL(BURST, VLOG_MSG_TOKENS)),\
-            0,                              /* first_dropped */         \
-            0,                              /* last_dropped */          \
-            0,                              /* n_dropped */             \
-            OVS_MUTEX_INITIALIZER           /* mutex */                 \
+#define VLOG_RATE_LIMIT_INIT(RATE, BURST)                                 \
+        {                                                                 \
+            TOKEN_BUCKET_INIT(RATE, OVS_SAT_MUL(BURST, VLOG_MSG_TOKENS)), \
+            0,                              /* first_dropped */           \
+            0,                              /* last_dropped */            \
+            0,                              /* n_dropped */               \
+            OVS_MUTEX_INITIALIZER           /* mutex */                   \
         }
 
 /* Configuring how each module logs messages. */
@@ -292,5 +293,4 @@ void vlog_usage(void);
 }
 #endif
 
-
 #endif /* vlog.h */
diff --git a/lib/automake.mk b/lib/automake.mk
@@ -265,7 +265,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/vlandev.c \
 	lib/vlandev.h \
 	lib/vlog.c \
-	lib/vlog.h \
 	lib/vswitch-idl.c \
 	lib/vswitch-idl.h \
 	lib/vtep-idl.c \

diff --git a/lib/backtrace.c b/lib/backtrace.c
@@ -18,7 +18,7 @@
 #include <inttypes.h>
 
 #include "backtrace.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(backtrace);
 

diff --git a/lib/bfd.c b/lib/bfd.c
@@ -44,7 +44,7 @@
 #include "unaligned.h"
 #include "unixctl.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(bfd);
 

diff --git a/lib/bundle.c b/lib/bundle.c
@@ -29,7 +29,7 @@
 #include "ofp-errors.h"
 #include "ofp-util.h"
 #include "openflow/nicira-ext.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(bundle);
 

diff --git a/lib/cfm.c b/lib/cfm.c
@@ -36,7 +36,7 @@
 #include "timer.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(cfm);
 

diff --git a/lib/classifier.c b/lib/classifier.c
@@ -25,7 +25,7 @@
 #include "ofp-util.h"
 #include "packets.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(classifier);
 

diff --git a/lib/command-line.c b/lib/command-line.c
@@ -22,7 +22,7 @@
 #include "dynamic-string.h"
 #include "ovs-thread.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(command_line);
 

diff --git a/lib/coverage.c b/lib/coverage.c
@@ -24,7 +24,7 @@
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(coverage);
 

diff --git a/lib/daemon-unix.c b/lib/daemon-unix.c
@@ -35,7 +35,7 @@
 #include "socket-util.h"
 #include "timeval.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(daemon_unix);
 

diff --git a/lib/daemon-windows.c b/lib/daemon-windows.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "poll-loop.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(daemon_windows);
 

diff --git a/lib/daemon.c b/lib/daemon.c
@@ -19,7 +19,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "vlog.h"
+#include "util.h"
+#include "ovs-thread.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(daemon);
 

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -66,7 +66,7 @@
 #include "tnl-arp-cache.h"
 #include "unixctl.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(dpif_netdev);
 

diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
@@ -53,7 +53,7 @@
 #include "timeval.h"
 #include "unaligned.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(dpif_netlink);
 #ifdef _WIN32

diff --git a/lib/dpif.c b/lib/dpif.c
@@ -47,7 +47,7 @@
 #include "tnl-ports.h"
 #include "util.h"
 #include "valgrind.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(dpif);
 

diff --git a/lib/entropy.c b/lib/entropy.c
@@ -23,9 +23,9 @@
 #ifdef _WIN32
 #include <Wincrypt.h>
 #endif
-
+#include "util.h"
 #include "socket-util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(entropy);
 

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
@@ -30,7 +30,7 @@
 #include "signals.h"
 #include "socket-util.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 #include "type-props.h"
 

diff --git a/lib/getopt_long.c b/lib/getopt_long.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(getopt_long);
 

diff --git a/lib/getrusage-windows.c b/lib/getrusage-windows.c
@@ -20,7 +20,7 @@
 #include <sys/resource.h>
 #include <time.h>
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(getrusage_windows);
 

diff --git a/lib/hmap.c b/lib/hmap.c
@@ -21,7 +21,7 @@
 #include "coverage.h"
 #include "random.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(hmap);
 

diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
@@ -31,7 +31,7 @@
 #include "reconnect.h"
 #include "stream.h"
 #include "timeval.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(jsonrpc);
 

diff --git a/lib/lacp.c b/lib/lacp.c
@@ -30,7 +30,7 @@
 #include "timer.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(lacp);
 

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
@@ -42,7 +42,7 @@
 #include "simap.h"
 #include "timeval.h"
 #include "vconn.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(learning_switch);
 

diff --git a/lib/lockfile.c b/lib/lockfile.c
@@ -30,7 +30,7 @@
 #include "ovs-thread.h"
 #include "timeval.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(lockfile);
 

diff --git a/lib/mcast-snooping.c b/lib/mcast-snooping.c
@@ -33,7 +33,7 @@
 #include "unaligned.h"
 #include "util.h"
 #include "vlan-bitmap.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 COVERAGE_DEFINE(mcast_snooping_learned);
 COVERAGE_DEFINE(mcast_snooping_expired);

diff --git a/lib/memory.c b/lib/memory.c
@@ -24,7 +24,7 @@
 #include "simap.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(memory);
 

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
@@ -35,7 +35,7 @@
 #include "socket-util.h"
 #include "unaligned.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(meta_flow);
 

diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c
@@ -61,7 +61,7 @@
 #include "socket-util.h"
 #include "svec.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev_bsd);
 

diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
@@ -46,7 +46,7 @@
 #include "unaligned.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(dpdk);
 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
@@ -40,7 +40,7 @@
 #include "timeval.h"
 #include "unixctl.h"
 #include "reconnect.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev_dummy);
 

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
@@ -71,7 +71,7 @@
 #include "sset.h"
 #include "timer.h"
 #include "unaligned.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev_linux);
 

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
@@ -44,7 +44,7 @@
 #include "route-table.h"
 #include "shash.h"
 #include "socket-util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 #include "unaligned.h"
 #include "unixctl.h"
 #include "util.h"

diff --git a/lib/netdev-windows.c b/lib/netdev-windows.c
@@ -28,7 +28,7 @@
 #include "poll-loop.h"
 #include "shash.h"
 #include "svec.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 #include "odp-netlink.h"
 #include "netlink-socket.h"
 #include "netlink.h"

diff --git a/lib/netdev.c b/lib/netdev.c
@@ -42,7 +42,7 @@
 #include "smap.h"
 #include "sset.h"
 #include "svec.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev);
 

diff --git a/lib/netlink-notifier.c b/lib/netlink-notifier.c
@@ -26,7 +26,7 @@
 #include "netlink.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netlink_notifier);
 

diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
@@ -35,7 +35,7 @@
 #include "seq.h"
 #include "socket-util.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netlink_socket);