-/* Copyright (c) 2008, 2009 Nicira Networks
+/* Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#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 "dpif.h"
-#include "fault.h"
+#include "dummy.h"
#include "leak-checker.h"
-#include "mgmt.h"
#include "netdev.h"
-#include "ovs-vswitchd.h"
+#include "ovsdb-idl.h"
#include "poll-loop.h"
-#include "proc-net-compat.h"
#include "process.h"
#include "signals.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-ssl.h"
#include "vconn.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_vswitchd
+#include "vswitchd/vswitch-idl.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);
-static bool need_reconfigure;
-static struct unixctl_conn **conns;
-static size_t n_conns;
+static unixctl_cb_func ovs_vswitchd_exit;
+
+static const char *parse_options(int argc, char *argv[]);
+static void usage(void) NO_RETURN;
int
main(int argc, char *argv[])
{
struct unixctl_server *unixctl;
struct signal *sighup;
+ const char *remote;
+ bool exiting;
int retval;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
- register_fault_handlers();
- time_init();
- vlog_init();
- parse_options(argc, argv);
+ stress_init_command();
+ remote = parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
process_init();
+ ovsrec_init();
- die_if_already_running();
- daemonize();
+ daemonize_start();
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
- ovs_fatal(retval, "could not listen for control connections");
+ exit(EXIT_FAILURE);
}
- unixctl_command_register("vswitchd/reload", reload);
+ unixctl_command_register("exit", ovs_vswitchd_exit, &exiting);
- retval = cfg_read();
- if (retval) {
- ovs_fatal(retval, "could not read config file");
- }
- mgmt_init();
- bridge_init();
- mgmt_reconfigure();
-
- need_reconfigure = false;
- for (;;) {
- if (need_reconfigure || signal_poll(sighup)) {
- need_reconfigure = false;
+ bridge_init(remote);
+ exiting = false;
+ while (!exiting) {
+ if (signal_poll(sighup)) {
vlog_reopen_log_file();
- reconfigure();
- }
- if (mgmt_run()) {
- need_reconfigure = true;
- }
- if (bridge_run()) {
- need_reconfigure = true;
}
+ bridge_run();
unixctl_server_run(unixctl);
- dp_run();
netdev_run();
- if (need_reconfigure) {
- poll_immediate_wake();
- }
signal_wait(sighup);
- mgmt_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 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
+static const char *
parse_options(int argc, char *argv[])
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
- OPT_FAKE_PROC_NET,
+ OPT_MLOCKALL,
VLOG_OPTION_ENUMS,
- LEAK_CHECKER_OPTION_ENUMS
+ LEAK_CHECKER_OPTION_ENUMS,
+ OPT_BOOTSTRAP_CA_CERT,
+ OPT_ENABLE_DUMMY,
+ DAEMON_OPTION_ENUMS
};
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},
+ {"mlockall", no_argument, 0, OPT_MLOCKALL},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
-#ifdef HAVE_OPENSSL
- VCONN_SSL_LONG_OPTIONS
+ STREAM_SSL_LONG_OPTIONS,
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
-#endif
+ {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
+ {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY},
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
- const char *config_file;
- int error;
for (;;) {
int c;
OVS_PRINT_VERSION(OFP_VERSION, OFP_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:
+#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
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();
break;
-#endif
case '?':
exit(EXIT_FAILURE);
argv += optind;
if (argc != 1) {
- ovs_fatal(0, "config file is only non-option argument; "
- "use --help for usage");
+ VLOG_FATAL("database socket is only non-option argument; "
+ "use --help for usage");
}
- 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);
- }
+ return argv[0];
}
static void
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",
+ "usage: %s [OPTIONS] DATABASE\n"
+ "where DATABASE is a socket on which ovsdb-server is listening.\n",
program_name, program_name);
+ 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"
" -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, const char *args OVS_UNUSED,
+ void *exiting_)
+{
+ bool *exiting = exiting_;
+ *exiting = true;
+ unixctl_command_reply(conn, 200, NULL);
+}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff