X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=bae03dd0f61892871063c6bab35029015fc826ed;hb=a328a943f173391cd9a9a54e257c8dabcd463402;hp=7b0661ec63e2850e1ae69fc085c06eac3edef307;hpb=bd76d25d8b3b7d11c5a326e91d784ad2cdeecd45;p=sliver-openvswitch.git diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 7b0661ec6..bae03dd0f 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010 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. @@ -22,30 +22,36 @@ #include #include #include +#ifdef HAVE_MLOCKALL +#include +#endif #include "bridge.h" #include "command-line.h" #include "compiler.h" #include "daemon.h" #include "dpif.h" +#include "dummy.h" #include "leak-checker.h" #include "netdev.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.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; @@ -55,17 +61,13 @@ main(int argc, char *argv[]) { 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(); + stress_init_command(); remote = parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); sighup = signal_register(SIGHUP); @@ -79,54 +81,31 @@ main(int argc, char *argv[]) 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(); } + bridge_exit(); + unixctl_server_destroy(unixctl); return 0; } @@ -136,15 +115,17 @@ 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, - OPT_BOOTSTRAP_CA_CERT + 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, @@ -153,10 +134,10 @@ parse_options(int argc, char *argv[]) {"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); - int error; for (;;) { int c; @@ -175,12 +156,14 @@ parse_options(int argc, char *argv[]) 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 @@ -199,6 +182,10 @@ parse_options(int argc, char *argv[]) break; #endif + case OPT_ENABLE_DUMMY: + dummy_enable(); + break; + case '?': exit(EXIT_FAILURE); @@ -212,8 +199,8 @@ parse_options(int argc, char *argv[]) argv += optind; if (argc != 1) { - ovs_fatal(0, "database socket is only non-option argument; " - "use --help for usage"); + VLOG_FATAL("database socket is only non-option argument; " + "use --help for usage"); } return argv[0]; @@ -229,11 +216,18 @@ usage(void) 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); +}