-/* Copyright (c) 2008, 2009 Nicira Networks
+/* Copyright (c) 2008, 2009, 2010 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 "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "dpif.h"
-#include "fault.h"
+#include "dummy.h"
#include "leak-checker.h"
#include "netdev.h"
#include "ovsdb-idl.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"
#include "vswitchd/vswitch-idl.h"
-#include "vlog.h"
-#define THIS_MODULE VLM_vswitchd
+VLOG_DEFINE_THIS_MODULE(vswitchd);
+
+static unixctl_cb_func ovs_vswitchd_exit;
static const char *parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
{
struct unixctl_server *unixctl;
struct signal *sighup;
- struct ovsdb_idl *idl;
const char *remote;
- bool need_reconfigure;
- bool inited;
- unsigned int idl_seqno;
+ bool exiting;
int retval;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
- register_fault_handlers();
- time_init();
- vlog_init();
+ 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_start();
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
- ovs_fatal(retval, "could not listen for control connections");
+ exit(EXIT_FAILURE);
}
+ unixctl_command_register("exit", ovs_vswitchd_exit, &exiting);
daemonize_complete();
- idl = ovsdb_idl_create(remote, &ovsrec_idl_class);
- idl_seqno = ovsdb_idl_get_seqno(idl);
-
- need_reconfigure = false;
- inited = false;
- for (;;) {
+ bridge_init(remote);
+ exiting = false;
+ while (!exiting) {
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;
- }
- }
- }
+ bridge_run();
unixctl_server_run(unixctl);
dp_run();
netdev_run();
signal_wait(sighup);
- if (inited) {
- bridge_wait();
- }
- ovsdb_idl_wait(idl);
+ 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;
}
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
+ OPT_MLOCKALL,
OPT_FAKE_PROC_NET,
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'},
+ {"mlockall", no_argument, 0, OPT_MLOCKALL},
{"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET},
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},
+ {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
#endif
+ {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY},
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
OVS_PRINT_VERSION(OFP_VERSION, OFP_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
+ break;
+
case OPT_FAKE_PROC_NET:
error = proc_net_compat_init();
if (error) {
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
- VCONN_SSL_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
+ STREAM_SSL_OPTION_HANDLERS
+
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;
#endif
+ case OPT_ENABLE_DUMMY:
+ dummy_enable();
+ break;
+
case '?':
exit(EXIT_FAILURE);
"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);
+ stream_usage("DATABASE", true, false, true);
daemon_usage();
vlog_usage();
printf("\nLegacy compatibility options:\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