X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=7d4e4d7704797245ea8e9d3deadee1b8f18f1818;hb=a0dbc22b4edc06af32354162bd5eb26c0cc3bd72;hp=6478156031e4d431a3f1942c994b8faea170bd1d;hpb=9e15c889f7a94db2decefd93dd6b3f77fb1b7bc6;p=sliver-openvswitch.git diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 647815603..7d4e4d770 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. @@ -30,29 +30,30 @@ #include "command-line.h" #include "compiler.h" #include "daemon.h" -#include "dpif.h" +#include "dirs.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 char *parse_options(int argc, char *argv[]); static void usage(void) NO_RETURN; int @@ -60,24 +61,19 @@ main(int argc, char *argv[]) { struct unixctl_server *unixctl; struct signal *sighup; - struct ovsdb_idl *idl; - const char *remote; - bool need_reconfigure; - bool inited, exiting; - unsigned int idl_seqno; + char *remote; + 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); process_init(); ovsrec_init(); - die_if_already_running(); daemonize_start(); retval = unixctl_server_create(NULL, &unixctl); @@ -86,86 +82,60 @@ main(int argc, char *argv[]) } 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); + bridge_init(remote); + free(remote); - need_reconfigure = false; - inited = false; 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); + signal_unregister(sighup); return 0; } -static const char * +static char * parse_options(int argc, char *argv[]) { enum { OPT_PEER_CA_CERT = UCHAR_MAX + 1, OPT_MLOCKALL, - OPT_FAKE_PROC_NET, 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'}, - {"mlockall", no_argument, 0, OPT_MLOCKALL}, - {"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, + {"mlockall", no_argument, NULL, OPT_MLOCKALL}, 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", no_argument, NULL, OPT_ENABLE_DUMMY}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); - int error; for (;;) { int c; @@ -194,19 +164,9 @@ parse_options(int argc, char *argv[]) #endif break; - case OPT_FAKE_PROC_NET: - error = proc_net_compat_init(); - if (error) { - ovs_fatal(error, "failed to initialize /proc/net " - "compatibility"); - } - break; - VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS - -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: @@ -216,7 +176,10 @@ parse_options(int argc, char *argv[]) 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); @@ -230,27 +193,31 @@ parse_options(int argc, char *argv[]) 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" + printf("\nOther options:\n" " -h, --help display this help message\n" " -V, --version display version information\n"); leak_checker_usage();