# Get the list of modules defined in some source file.
src_modules=`
- git grep -h -E '^[ ]*VLOG_DEFINE(_THIS)?_MODULE\([_a-zA-Z0-9]+\)[ ]*$' \
+ git grep -h -E '^[ ]*VLOG_DEFINE(_THIS)?_MODULE\([_a-zA-Z0-9]+\);[ ]*$' \
| sed 's/.*(\([_a-zA-Z0-9]\{1,\}\)).*/\1/' \
| LC_ALL=C sort -u \
| xargs echo`
#include "compiler.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(backtrace)
+VLOG_DEFINE_THIS_MODULE(backtrace);
static uintptr_t OVS_UNUSED
get_max_stack(void)
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(coverage)
+VLOG_DEFINE_THIS_MODULE(coverage);
static unsigned int epoch;
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(daemon)
+VLOG_DEFINE_THIS_MODULE(daemon);
/* --detach: Should we run in the background? */
static bool detach;
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(dhcp_client)
+VLOG_DEFINE_THIS_MODULE(dhcp_client);
#define DHCLIENT_STATES \
DHCLIENT_STATE(INIT, 1 << 0) \
#include "ofpbuf.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(dhcp)
+VLOG_DEFINE_THIS_MODULE(dhcp);
/* Information about a DHCP argument type. */
struct arg_type {
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(dpif_linux)
+VLOG_DEFINE_THIS_MODULE(dpif_linux);
/* Datapath interface for the openvswitch Linux kernel module. */
struct dpif_linux {
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(dpif_netdev)
+VLOG_DEFINE_THIS_MODULE(dpif_netdev);
/* Configuration parameters. */
enum { N_QUEUES = 2 }; /* Number of queues for dpif_recv(). */
#include "valgrind.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(dpif)
+VLOG_DEFINE_THIS_MODULE(dpif);
static const struct dpif_class *base_dpif_classes[] = {
#ifdef HAVE_NETLINK
#include "socket-util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(entropy)
+VLOG_DEFINE_THIS_MODULE(entropy);
static const char urandom[] = "/dev/urandom";
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(fatal_signal)
+VLOG_DEFINE_THIS_MODULE(fatal_signal);
/* Signals to catch. */
static const int fatal_signals[] = { SIGTERM, SIGINT, SIGHUP, SIGALRM };
#include "unaligned.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(flow)
+VLOG_DEFINE_THIS_MODULE(flow);
static struct arp_eth_header *
pull_arp(struct ofpbuf *packet)
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(jsonrpc)
+VLOG_DEFINE_THIS_MODULE(jsonrpc);
\f
struct jsonrpc {
struct stream *stream;
#include "backtrace.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(leak_checker)
+VLOG_DEFINE_THIS_MODULE(leak_checker);
#ifndef HAVE_MALLOC_HOOKS
void
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(learning_switch)
+VLOG_DEFINE_THIS_MODULE(learning_switch);
struct lswitch_port {
struct hmap_node hmap_node; /* Hash node for port number. */
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(lockfile)
+VLOG_DEFINE_THIS_MODULE(lockfile);
struct lockfile {
struct hmap_node hmap_node;
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(mac_learning)
+VLOG_DEFINE_THIS_MODULE(mac_learning);
/* Returns the number of seconds since 'e' was last learned. */
int
#include "svec.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(netdev_linux)
+VLOG_DEFINE_THIS_MODULE(netdev_linux);
\f
/* These were introduced in Linux 2.6.14, so they might be missing if we have
* old headers. */
#include "socket-util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(netdev_vport)
+VLOG_DEFINE_THIS_MODULE(netdev_vport);
struct netdev_vport_notifier {
struct netdev_notifier notifier;
#include "svec.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(netdev)
+VLOG_DEFINE_THIS_MODULE(netdev);
static struct shash netdev_classes = SHASH_INITIALIZER(&netdev_classes);
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(netlink)
+VLOG_DEFINE_THIS_MODULE(netlink);
/* Linux header file confusion causes this to be undefined. */
#ifndef SOL_NETLINK
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ofp_parse)
+VLOG_DEFINE_THIS_MODULE(ofp_parse);
static uint32_t
str_to_u32(const char *str)
#include "random.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ofp_util)
+VLOG_DEFINE_THIS_MODULE(ofp_util);
/* Rate limit for OpenFlow message parse errors. These always indicate a bug
* in the peer and so there's not much point in showing a lot of them. */
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_error)
+VLOG_DEFINE_THIS_MODULE(ovsdb_error);
struct ovsdb_error {
const char *tag; /* String for "error" member. */
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_idl)
+VLOG_DEFINE_THIS_MODULE(ovsdb_idl);
/* An arc from one idl_row to another. When row A contains a UUID that
* references row B, this is represented by an arc from A (the source) to B
#include "ofpbuf.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(pcap)
+VLOG_DEFINE_THIS_MODULE(pcap);
struct pcap_hdr {
uint32_t magic_number; /* magic number */
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(poll_loop)
+VLOG_DEFINE_THIS_MODULE(poll_loop);
/* An event that will wake the following call to poll_block(). */
struct poll_waiter {
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(process)
+VLOG_DEFINE_THIS_MODULE(process);
struct process {
struct list node;
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(rconn)
+VLOG_DEFINE_THIS_MODULE(rconn);
#define STATES \
STATE(VOID, 1 << 0) \
#include "poll-loop.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(reconnect)
+VLOG_DEFINE_THIS_MODULE(reconnect);
#define STATES \
STATE(VOID, 1 << 0) \
#include "ofpbuf.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(rtnetlink)
+VLOG_DEFINE_THIS_MODULE(rtnetlink);
/* rtnetlink socket. */
static struct nl_sock *notify_sock;
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(socket_util)
+VLOG_DEFINE_THIS_MODULE(socket_util);
/* Sets 'fd' to non-blocking mode. Returns 0 if successful, otherwise a
* positive errno value. */
#include "stream.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(stream_fd)
+VLOG_DEFINE_THIS_MODULE(stream_fd);
/* Active file descriptor stream. */
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(stream_ssl)
+VLOG_DEFINE_THIS_MODULE(stream_ssl);
/* Active SSL. */
#include "stream-fd.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(stream_tcp)
+VLOG_DEFINE_THIS_MODULE(stream_tcp);
/* Active TCP. */
#include "stream-fd.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(stream_unix)
+VLOG_DEFINE_THIS_MODULE(stream_unix);
/* Active UNIX socket. */
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(stream)
+VLOG_DEFINE_THIS_MODULE(stream);
/* State of an active stream.*/
enum stream_state {
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(svec)
+VLOG_DEFINE_THIS_MODULE(svec);
void
svec_init(struct svec *svec)
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(timeval)
+VLOG_DEFINE_THIS_MODULE(timeval);
/* The clock to use for measuring time intervals. This is CLOCK_MONOTONIC by
* preference, but on systems that don't have a monotonic clock we fall back
#include <time.h>
#endif
-VLOG_DEFINE_THIS_MODULE(unixctl)
+VLOG_DEFINE_THIS_MODULE(unixctl);
\f
struct unixctl_command {
unixctl_cb_func *cb;
#include "coverage.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(util)
+VLOG_DEFINE_THIS_MODULE(util);
const char *program_name;
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(vconn_stream)
+VLOG_DEFINE_THIS_MODULE(vconn_stream);
/* Active stream socket vconn. */
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(vconn)
+VLOG_DEFINE_THIS_MODULE(vconn);
/* State of an active vconn.*/
enum vconn_state {
#include "unixctl.h"
#include "util.h"
-VLOG_DEFINE_THIS_MODULE(vlog)
+VLOG_DEFINE_THIS_MODULE(vlog);
/* Name for each logging level. */
static const char *level_names[VLL_N_LEVELS] = {
#define VLOG_DEFINE_MODULE(MODULE) \
VLOG_DEFINE_MODULE__(MODULE) \
struct vlog_module *vlog_module_ptr_##MODULE \
- __attribute__((section("vlog_modules"))) = &VLM_##MODULE;
+ __attribute__((section("vlog_modules"))) = &VLM_##MODULE
#else
-#define VLOG_DEFINE_MODULE(MODULE) extern struct vlog_module VLM_##MODULE;
+#define VLOG_DEFINE_MODULE(MODULE) extern struct vlog_module VLM_##MODULE
#endif
const char *vlog_get_module_name(const struct vlog_module *);
* defines a static variable named THIS_MODULE that points to it, for use with
* the convenience macros below. */
#define VLOG_DEFINE_THIS_MODULE(MODULE) \
- VLOG_DEFINE_MODULE(MODULE) \
- static struct vlog_module *const THIS_MODULE = &VLM_##MODULE;
+ VLOG_DEFINE_MODULE(MODULE); \
+ static struct vlog_module *const THIS_MODULE = &VLM_##MODULE
/* Convenience macros. These assume that THIS_MODULE points to a "struct
* vlog_module" for the current module, as set up by e.g. the
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(collectors)
+VLOG_DEFINE_THIS_MODULE(collectors);
struct collectors {
int *fds; /* Sockets. */
#include "stream-ssl.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(discovery)
+VLOG_DEFINE_THIS_MODULE(discovery);
struct discovery {
char *dpif_name;
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(fail_open)
+VLOG_DEFINE_THIS_MODULE(fail_open);
/*
* Fail-open mode.
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(in_band)
+VLOG_DEFINE_THIS_MODULE(in_band);
/* In-band control allows a single network to be used for OpenFlow
* traffic and other data traffic. Refer to ovs-vswitchd.conf(5) and
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(netflow)
+VLOG_DEFINE_THIS_MODULE(netflow);
#define NETFLOW_V5_VERSION 5
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(sflow)
+VLOG_DEFINE_THIS_MODULE(sflow);
struct ofproto_sflow_port {
struct hmap_node hmap_node; /* In struct ofproto_sflow's "ports" hmap. */
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ofproto)
+VLOG_DEFINE_THIS_MODULE(ofproto);
#include "sflow_api.h"
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(pktbuf)
+VLOG_DEFINE_THIS_MODULE(pktbuf);
/* Buffers are identified by a 32-bit opaque ID. We divide the ID
* into a buffer number (low bits) and a cookie (high bits). The buffer number
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(status)
+VLOG_DEFINE_THIS_MODULE(status);
struct status_category {
struct list node;
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_file)
+VLOG_DEFINE_THIS_MODULE(ovsdb_file);
/* Minimum number of milliseconds between database compactions. */
#define COMPACT_MIN_MSEC (10 * 60 * 1000) /* 10 minutes. */
#include "trigger.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server)
+VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server);
struct ovsdb_jsonrpc_remote;
struct ovsdb_jsonrpc_session;
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_log)
+VLOG_DEFINE_THIS_MODULE(ovsdb_log);
enum ovsdb_log_mode {
OVSDB_LOG_READ,
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_client)
+VLOG_DEFINE_THIS_MODULE(ovsdb_client);
/* --format: Output formatting. */
static enum {
#include "unixctl.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_server)
+VLOG_DEFINE_THIS_MODULE(ovsdb_server);
#if HAVE_OPENSSL
/* SSL configuration. */
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovsdb_tool)
+VLOG_DEFINE_THIS_MODULE(ovsdb_tool);
/* -m, --more: Verbosity level for "show-log" command output. */
static int show_log_verbosity;
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(controller)
+VLOG_DEFINE_THIS_MODULE(controller);
#define MAX_SWITCHES 16
#define MAX_LISTENERS 16
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ovs_discover)
+VLOG_DEFINE_THIS_MODULE(ovs_discover);
struct iface {
const char *name;
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(dpctl)
+VLOG_DEFINE_THIS_MODULE(dpctl);
static const struct command all_commands[];
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(ofctl)
+VLOG_DEFINE_THIS_MODULE(ofctl);
#define MOD_PORT_CMD_UP "up"
#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(openflowd)
+VLOG_DEFINE_THIS_MODULE(openflowd);
/* Settings that may be configured by the user. */
struct ofsettings {
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(vsctl)
+VLOG_DEFINE_THIS_MODULE(vsctl);
/* vsctl_fatal() also logs the error, so it is preferred in this file. */
#define ovs_fatal please_use_vsctl_fatal_instead_of_ovs_fatal
#include "vlog.h"
#include "sflow_api.h"
-VLOG_DEFINE_THIS_MODULE(bridge)
+VLOG_DEFINE_THIS_MODULE(bridge);
struct dst {
uint16_t vlan;
#include "vlog.h"
#include "vswitchd/vswitch-idl.h"
-VLOG_DEFINE_THIS_MODULE(brcompatd)
+VLOG_DEFINE_THIS_MODULE(brcompatd);
/* xxx Just hangs if datapath is rmmod/insmod. Learn to reconnect? */
#include "vlog.h"
#include "vswitchd/vswitch-idl.h"
-VLOG_DEFINE_THIS_MODULE(vswitchd)
+VLOG_DEFINE_THIS_MODULE(vswitchd);
static unixctl_cb_func ovs_vswitchd_exit;
#include "svec.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(proc_net_compat)
+VLOG_DEFINE_THIS_MODULE(proc_net_compat);
/* Netlink socket to bridge compatibility kernel module. */
static struct nl_sock *brc_sock;
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(system_stats)
+VLOG_DEFINE_THIS_MODULE(system_stats);
/* #ifdefs make it a pain to maintain code: you have to try to build both ways.
* Thus, this file tries to compile as much of the code as possible regardless
#include "process.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(xenserver)
+VLOG_DEFINE_THIS_MODULE(xenserver);
static char *
read_host_uuid(void)