-/* Copyright (c) 2008, 2009, 2010 Nicira Networks
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <config.h>
-#include <assert.h>
#include <errno.h>
#include <getopt.h>
#include <limits.h>
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
+#include "dirs.h"
#include "dpif.h"
-#include "leak-checker.h"
+#include "dummy.h"
+#include "memory.h"
#include "netdev.h"
+#include "openflow/openflow.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"
-#include "proc-net-compat.h"
#include "process.h"
#include "signals.h"
+#include "simap.h"
#include "stream-ssl.h"
#include "stream.h"
+#include "stress.h"
#include "svec.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
-#include "vswitchd/vswitch-idl.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_vswitchd
+#include "lib/vswitch-idl.h"
+#include "worker.h"
+
+VLOG_DEFINE_THIS_MODULE(vswitchd);
+
+/* --mlockall: If set, locks all process memory into physical RAM, preventing
+ * the kernel from paging any of its memory to disk. */
+static bool want_mlockall;
-static const char *parse_options(int argc, char *argv[]);
+static unixctl_cb_func ovs_vswitchd_exit;
+
+static char *parse_options(int argc, char *argv[], char **unixctl_path);
static void usage(void) NO_RETURN;
int
main(int argc, char *argv[])
{
+ char *unixctl_path = NULL;
struct unixctl_server *unixctl;
struct signal *sighup;
- struct ovsdb_idl *idl;
- const char *remote;
- bool need_reconfigure;
- bool inited;
- unsigned int idl_seqno;
+ char *remote;
+ bool exiting;
int retval;
proctitle_init(argc, argv);
set_program_name(argv[0]);
- time_init();
- vlog_init();
- remote = parse_options(argc, argv);
+ stress_init_command();
+ remote = parse_options(argc, argv, &unixctl_path);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
process_init();
ovsrec_init();
- die_if_already_running();
daemonize_start();
- retval = unixctl_server_create(NULL, &unixctl);
+ if (want_mlockall) {
+#ifdef HAVE_MLOCKALL
+ if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
+ VLOG_ERR("mlockall failed: %s", ovs_strerror(errno));
+ }
+#else
+ VLOG_ERR("mlockall not supported on this system");
+#endif
+ }
+
+ worker_start();
+
+ retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
}
+ unixctl_command_register("exit", "", 0, 0, ovs_vswitchd_exit, &exiting);
- daemonize_complete();
+ bridge_init(remote);
+ free(remote);
- idl = ovsdb_idl_create(remote, &ovsrec_idl_class);
- idl_seqno = ovsdb_idl_get_seqno(idl);
-
- need_reconfigure = false;
- inited = false;
- for (;;) {
+ exiting = false;
+ while (!exiting) {
+ worker_run();
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
- if (inited && bridge_run()) {
- need_reconfigure = true;
- }
- ovsdb_idl_run(idl);
- if (idl_seqno != ovsdb_idl_get_seqno(idl)) {
- idl_seqno = ovsdb_idl_get_seqno(idl);
- need_reconfigure = true;
- }
- if (need_reconfigure) {
- const struct ovsrec_open_vswitch *cfg;
-
- need_reconfigure = false;
- cfg = ovsrec_open_vswitch_first(idl);
- if (cfg) {
- if (inited) {
- bridge_reconfigure(cfg);
- } else {
- bridge_init(cfg);
- inited = true;
- }
- }
+ memory_run();
+ if (memory_should_report()) {
+ struct simap usage;
+
+ simap_init(&usage);
+ bridge_get_memory_usage(&usage);
+ memory_report(&usage);
+ simap_destroy(&usage);
}
+ bridge_run_fast();
+ bridge_run();
+ bridge_run_fast();
unixctl_server_run(unixctl);
- dp_run();
netdev_run();
+ worker_wait();
signal_wait(sighup);
- if (inited) {
- bridge_wait();
- }
- ovsdb_idl_wait(idl);
+ memory_wait();
+ bridge_wait();
unixctl_server_wait(unixctl);
- dp_wait();
netdev_wait();
+ if (exiting) {
+ poll_immediate_wake();
+ }
poll_block();
}
+ bridge_exit();
+ unixctl_server_destroy(unixctl);
return 0;
}
-static const char *
-parse_options(int argc, char *argv[])
+static char *
+parse_options(int argc, char *argv[], char **unixctl_pathp)
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
OPT_MLOCKALL,
- OPT_FAKE_PROC_NET,
+ OPT_UNIXCTL,
VLOG_OPTION_ENUMS,
- LEAK_CHECKER_OPTION_ENUMS,
- OPT_BOOTSTRAP_CA_CERT
+ OPT_BOOTSTRAP_CA_CERT,
+ OPT_ENABLE_DUMMY,
+ OPT_DISABLE_SYSTEM,
+ DAEMON_OPTION_ENUMS
};
- static struct option long_options[] = {
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'V'},
- {"mlockall", no_argument, 0, OPT_MLOCKALL},
- {"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET},
+ static const struct option long_options[] = {
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'V'},
+ {"mlockall", no_argument, NULL, OPT_MLOCKALL},
+ {"unixctl", required_argument, NULL, OPT_UNIXCTL},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
- LEAK_CHECKER_LONG_OPTIONS,
-#ifdef HAVE_OPENSSL
- STREAM_SSL_LONG_OPTIONS
- {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
- {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
-#endif
- {0, 0, 0, 0},
+ STREAM_SSL_LONG_OPTIONS,
+ {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
+ {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
+ {"enable-dummy", optional_argument, NULL, OPT_ENABLE_DUMMY},
+ {"disable-system", no_argument, NULL, OPT_DISABLE_SYSTEM},
+ {NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
- int error;
for (;;) {
int c;
}
switch (c) {
- case 'H':
case 'h':
usage();
case 'V':
- OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION);
+ ovs_print_version(OFP10_VERSION, OFP10_VERSION);
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
-#ifdef HAVE_MLOCKALL
- if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
- VLOG_ERR("mlockall failed: %s", strerror(errno));
- }
-#else
- VLOG_ERR("mlockall not supported on this system");
-#endif
+ want_mlockall = true;
break;
- case OPT_FAKE_PROC_NET:
- error = proc_net_compat_init();
- if (error) {
- ovs_fatal(error, "failed to initialize /proc/net "
- "compatibility");
- }
+ case OPT_UNIXCTL:
+ *unixctl_pathp = optarg;
break;
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
- LEAK_CHECKER_OPTION_HANDLERS
-
-#ifdef HAVE_OPENSSL
STREAM_SSL_OPTION_HANDLERS
case OPT_PEER_CA_CERT:
case OPT_BOOTSTRAP_CA_CERT:
stream_ssl_set_ca_cert_file(optarg, true);
break;
-#endif
+
+ case OPT_ENABLE_DUMMY:
+ dummy_enable(optarg && !strcmp(optarg, "override"));
+ break;
+
+ case OPT_DISABLE_SYSTEM:
+ dp_blacklist_provider("system");
+ break;
case '?':
exit(EXIT_FAILURE);
argc -= optind;
argv += optind;
- if (argc != 1) {
- ovs_fatal(0, "database socket is only non-option argument; "
- "use --help for usage");
- }
+ switch (argc) {
+ case 0:
+ return xasprintf("unix:%s/db.sock", ovs_rundir());
- return argv[0];
+ case 1:
+ return xstrdup(argv[0]);
+
+ default:
+ VLOG_FATAL("at most one non-option argument accepted; "
+ "use --help for usage");
+ }
}
static void
usage(void)
{
printf("%s: Open vSwitch daemon\n"
- "usage: %s [OPTIONS] DATABASE\n"
- "where DATABASE is a socket on which ovsdb-server is listening.\n",
- program_name, program_name);
+ "usage: %s [OPTIONS] [DATABASE]\n"
+ "where DATABASE is a socket on which ovsdb-server is listening\n"
+ " (default: \"unix:%s/db.sock\").\n",
+ program_name, program_name, ovs_rundir());
stream_usage("DATABASE", true, false, true);
daemon_usage();
vlog_usage();
- printf("\nLegacy compatibility options:\n"
- " --fake-proc-net simulate some files in /proc/net\n"
- "\nOther options:\n"
+ printf("\nOther options:\n"
+ " --unixctl=SOCKET override default control socket name\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
- leak_checker_usage();
exit(EXIT_SUCCESS);
}
+
+static void
+ovs_vswitchd_exit(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ const char *argv[] OVS_UNUSED, void *exiting_)
+{
+ bool *exiting = exiting_;
+ *exiting = true;
+ unixctl_command_reply(conn, NULL);
+}