-/* Copyright (c) 2008, 2009, 2010 Nicira Networks
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 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 "fatal-signal.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 "ovs-rcu.h"
+#include "ovs-router.h"
+#include "ovs-thread.h"
+#include "openvswitch/poll-loop.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.h"
-#include "vswitchd/vswitch-idl.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
+#include "lib/vswitch-idl.h"
+#include "lib/dns-resolve.h"
-#include "vlog.h"
-#define THIS_MODULE VLM_vswitchd
+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 unixctl_cb_func ovs_vswitchd_exit;
-static const char *parse_options(int argc, char *argv[]);
-static void usage(void) NO_RETURN;
+static char *parse_options(int argc, char *argv[], char **unixctl_path);
+OVS_NO_RETURN static void usage(void);
+
+struct ovs_vswitchd_exit_args {
+ bool *exiting;
+ bool *cleanup;
+};
int
main(int argc, char *argv[])
{
+ char *unixctl_path = NULL;
struct unixctl_server *unixctl;
- struct signal *sighup;
- const char *remote;
- bool exiting;
+ char *remote;
+ bool exiting, cleanup;
+ struct ovs_vswitchd_exit_args exit_args = {&exiting, &cleanup};
int retval;
- proctitle_init(argc, argv);
set_program_name(argv[0]);
- remote = parse_options(argc, argv);
- signal(SIGPIPE, SIG_IGN);
- sighup = signal_register(SIGHUP);
- process_init();
- ovsrec_init();
+ ovsthread_id_init();
+
+ dns_resolve_init(true);
+ ovs_cmdl_proctitle_init(argc, argv);
+ service_start(&argc, &argv);
+ remote = parse_options(argc, argv, &unixctl_path);
+ fatal_ignore_sigpipe();
+
+ daemonize_start(true);
- die_if_already_running();
- daemonize_start();
+ if (want_mlockall) {
+#ifdef HAVE_MLOCKALL
+ if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
+ VLOG_ERR("mlockall failed: %s", ovs_strerror(errno));
+ } else {
+ set_memory_locked();
+ }
+#else
+ VLOG_ERR("mlockall not supported on this system");
+#endif
+ }
- retval = unixctl_server_create(NULL, &unixctl);
+ retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
}
- unixctl_command_register("exit", ovs_vswitchd_exit, &exiting);
-
- daemonize_complete();
+ unixctl_command_register("exit", "[--cleanup]", 0, 1,
+ ovs_vswitchd_exit, &exit_args);
bridge_init(remote);
+ free(remote);
+
exiting = false;
+ cleanup = false;
while (!exiting) {
- if (signal_poll(sighup)) {
- vlog_reopen_log_file();
+ 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();
- signal_wait(sighup);
+ 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(cleanup);
+ unixctl_server_destroy(unixctl);
+ service_stop();
+ vlog_disable_async();
+ ovsrcu_exit();
+ dns_resolve_destroy();
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,
+ OPT_DISABLE_SYSTEM_ROUTE,
+ DAEMON_OPTION_ENUMS,
+ OPT_DPDK,
+ SSL_OPTION_ENUMS,
+ OPT_DUMMY_NUMA,
};
- 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},
+ {"disable-system-route", no_argument, NULL, OPT_DISABLE_SYSTEM_ROUTE},
+ {"dpdk", optional_argument, NULL, OPT_DPDK},
+ {"dummy-numa", required_argument, NULL, OPT_DUMMY_NUMA},
+ {NULL, 0, NULL, 0},
};
- char *short_options = long_options_to_short_options(long_options);
- int error;
+ char *short_options = ovs_cmdl_long_options_to_short_options(long_options);
for (;;) {
int c;
}
switch (c) {
- case 'H':
case 'h':
usage();
case 'V':
- OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION);
+ ovs_print_version(0, 0);
+ print_dpdk_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);
+ break;
+
+ case OPT_DISABLE_SYSTEM:
+ dp_disallow_provider("system");
+ break;
+
+ case OPT_DISABLE_SYSTEM_ROUTE:
+ ovs_router_disable_system_routing_table();
+ break;
case '?':
exit(EXIT_FAILURE);
+ case OPT_DPDK:
+ ovs_fatal(0, "Using --dpdk to configure DPDK is not supported.");
+ break;
+
+ case OPT_DUMMY_NUMA:
+ ovs_numa_set_dummy(optarg);
+ break;
+
default:
abort();
}
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"
- " -h, --help display this help message\n"
- " -V, --version display version information\n");
- leak_checker_usage();
+ printf("\nDPDK options:\n"
+ "Configuration of DPDK via command-line is removed from this\n"
+ "version of Open vSwitch. DPDK is configured through ovsdb.\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");
exit(EXIT_SUCCESS);
}
static void
-ovs_vswitchd_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED,
- void *exiting_)
+ovs_vswitchd_exit(struct unixctl_conn *conn, int argc,
+ const char *argv[], void *exit_args_)
{
- bool *exiting = exiting_;
- *exiting = true;
- unixctl_command_reply(conn, 200, NULL);
+ struct ovs_vswitchd_exit_args *exit_args = exit_args_;
+ *exit_args->exiting = true;
+ *exit_args->cleanup = argc == 2 && !strcmp(argv[1], "--cleanup");
+ unixctl_command_reply(conn, NULL);
}
projects / mirror_ovs.git / blobdiff