-/* Copyright (c) 2008, 2009 Nicira Networks
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 <signal.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_MLOCKALL
+#include <sys/mman.h>
+#endif
#include "bridge.h"
-#include "cfg.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
+#include "dirs.h"
#include "dpif.h"
-#include "fault.h"
-#include "leak-checker.h"
-#include "mgmt.h"
+#include "dummy.h"
+#include "fatal-signal.h"
+#include "memory.h"
#include "netdev.h"
-#include "ovs-vswitchd.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 "svec.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn-ssl.h"
#include "vconn.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_vswitchd
+#include "lib/vswitch-idl.h"
+#include "lib/netdev-dpdk.h"
-static void parse_options(int argc, char *argv[]);
-static void usage(void) NO_RETURN;
-static void reload(struct unixctl_conn *, const char *args);
+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 bool need_reconfigure;
-static struct unixctl_conn **conns;
-static size_t n_conns;
+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;
+ char *remote;
+ bool exiting;
int retval;
set_program_name(argv[0]);
- register_fault_handlers();
- time_init();
- vlog_init();
- parse_options(argc, argv);
- signal(SIGPIPE, SIG_IGN);
- sighup = signal_register(SIGHUP);
- process_init();
-
- die_if_already_running();
- daemonize();
-
- retval = unixctl_server_create(NULL, &unixctl);
- if (retval) {
- ovs_fatal(retval, "could not listen for control connections");
+ retval = dpdk_init(argc,argv);
+ argc -= retval;
+ argv += retval;
+
+ proctitle_init(argc, argv);
+ service_start(&argc, &argv);
+ remote = parse_options(argc, argv, &unixctl_path);
+ fatal_ignore_sigpipe();
+ ovsrec_init();
+
+ daemonize_start();
+
+ 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
}
- unixctl_command_register("vswitchd/reload", reload);
- retval = cfg_read();
+ retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
- ovs_fatal(retval, "could not read config file");
+ exit(EXIT_FAILURE);
}
- mgmt_init();
- bridge_init();
- mgmt_reconfigure();
+ unixctl_command_register("exit", "", 0, 0, ovs_vswitchd_exit, &exiting);
- need_reconfigure = false;
- for (;;) {
- if (need_reconfigure || signal_poll(sighup)) {
- need_reconfigure = false;
- vlog_reopen_log_file();
- reconfigure();
- }
- if (mgmt_run()) {
- need_reconfigure = true;
- }
- if (bridge_run()) {
- need_reconfigure = true;
+ bridge_init(remote);
+ free(remote);
+
+ exiting = false;
+ while (!exiting) {
+ 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();
unixctl_server_run(unixctl);
- dp_run();
netdev_run();
- if (need_reconfigure) {
- poll_immediate_wake();
- }
- signal_wait(sighup);
- mgmt_wait();
+ memory_wait();
bridge_wait();
unixctl_server_wait(unixctl);
- dp_wait();
netdev_wait();
+ if (exiting) {
+ poll_immediate_wake();
+ }
poll_block();
+ if (should_service_stop()) {
+ exiting = true;
+ }
}
+ bridge_exit();
+ unixctl_server_destroy(unixctl);
+ service_stop();
return 0;
}
-static void
-reload(struct unixctl_conn *conn, const char *args UNUSED)
-{
- need_reconfigure = true;
- conns = xrealloc(conns, sizeof *conns * (n_conns + 1));
- conns[n_conns++] = conn;
-}
-
-void
-reconfigure(void)
-{
- size_t i;
-
- cfg_read();
- bridge_reconfigure();
- mgmt_reconfigure();
-
- for (i = 0; i < n_conns; i++) {
- unixctl_command_reply(conns[i], 202, NULL);
- }
- free(conns);
- conns = NULL;
- n_conns = 0;
-}
-
-static void
-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_FAKE_PROC_NET,
+ OPT_MLOCKALL,
+ OPT_UNIXCTL,
VLOG_OPTION_ENUMS,
- LEAK_CHECKER_OPTION_ENUMS
+ OPT_BOOTSTRAP_CA_CERT,
+ OPT_ENABLE_DUMMY,
+ OPT_DISABLE_SYSTEM,
+ OPT_ENABLE_OF14,
+ DAEMON_OPTION_ENUMS,
+ OPT_DPDK,
};
- static struct option long_options[] = {
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'V'},
- {"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
- VCONN_SSL_LONG_OPTIONS
- {"peer-ca-cert", required_argument, 0, OPT_PEER_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},
+ {"enable-of14", no_argument, NULL, OPT_ENABLE_OF14},
+ {"dpdk", required_argument, NULL, OPT_DPDK},
+ {NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
- const char *config_file;
- 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_FAKE_PROC_NET:
- error = proc_net_compat_init();
- if (error) {
- ovs_fatal(error, "failed to initialize /proc/net "
- "compatibility");
- }
+ case OPT_MLOCKALL:
+ want_mlockall = true;
+ break;
+
+ case OPT_UNIXCTL:
+ *unixctl_pathp = optarg;
break;
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
- VCONN_SSL_OPTION_HANDLERS
- LEAK_CHECKER_OPTION_HANDLERS
+ STREAM_SSL_OPTION_HANDLERS
-#ifdef HAVE_OPENSSL
case OPT_PEER_CA_CERT:
- vconn_ssl_set_peer_ca_cert_file(optarg);
+ stream_ssl_set_peer_ca_cert_file(optarg);
+ break;
+
+ case OPT_BOOTSTRAP_CA_CERT:
+ stream_ssl_set_ca_cert_file(optarg, true);
+ break;
+
+ case OPT_ENABLE_DUMMY:
+ dummy_enable(optarg && !strcmp(optarg, "override"));
+ break;
+
+ case OPT_DISABLE_SYSTEM:
+ dp_blacklist_provider("system");
+ break;
+
+ case OPT_ENABLE_OF14:
+ bridge_enable_of14();
break;
-#endif
case '?':
exit(EXIT_FAILURE);
+ case OPT_DPDK:
+ break;
+
default:
abort();
}
argc -= optind;
argv += optind;
- if (argc != 1) {
- ovs_fatal(0, "config file is only non-option argument; "
- "use --help for usage");
- }
+ switch (argc) {
+ case 0:
+ return xasprintf("unix:%s/db.sock", ovs_rundir());
+
+ case 1:
+ return xstrdup(argv[0]);
- cfg_init();
- config_file = argv[0];
- error = cfg_set_file(config_file);
- if (error) {
- ovs_fatal(error, "failed to add configuration file \"%s\"",
- config_file);
+ default:
+ VLOG_FATAL("at most one non-option argument accepted; "
+ "use --help for usage");
}
}
usage(void)
{
printf("%s: Open vSwitch daemon\n"
- "usage: %s [OPTIONS] CONFIG\n"
- "CONFIG is a configuration file in ovs-vswitchd.conf(5) format.\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"
+ " --enable-of14 allow enabling OF1.4 (unsafely!)\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);
+}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff