#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 "unixctl.h"
#include "util.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]);
- time_init();
- vlog_init();
remote = parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
process_init();
+ ovsrec_init();
die_if_already_running();
daemonize_start();
if (retval) {
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();
}
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
+ OPT_MLOCKALL,
OPT_FAKE_PROC_NET,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_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,
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) {
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);
+}