X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=990e58f0a08aa2099ff6efc0cd27aad82436f8d7;hb=59804c80a9821e3aca208012c1a496f3c26bfe9a;hp=875da6985fd6cfdd903424e532db5ba5e70bbff3;hpb=4f356133b56d7e907393118f41c17beac4260dd0;p=sliver-openvswitch.git diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 875da6985..990e58f0a 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks +/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ #include -#include #include #include #include @@ -31,34 +30,41 @@ #include "compiler.h" #include "daemon.h" #include "dirs.h" +#include "dpif.h" #include "dummy.h" -#include "leak-checker.h" +#include "memory.h" #include "netdev.h" +#include "openflow/openflow.h" #include "ovsdb-idl.h" #include "poll-loop.h" #include "process.h" #include "signals.h" +#include "simap.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 "lib/vswitch-idl.h" VLOG_DEFINE_THIS_MODULE(vswitchd); +/* --mlockall: If set, locks all process memory into physical RAM, preventing + * the kernel from paging any of its memory to disk. */ +static bool want_mlockall; + static unixctl_cb_func ovs_vswitchd_exit; -static char *parse_options(int argc, char *argv[]); +static char *parse_options(int argc, char *argv[], char **unixctl_path); static void usage(void) NO_RETURN; int main(int argc, char *argv[]) { + char *unixctl_path = NULL; struct unixctl_server *unixctl; struct signal *sighup; char *remote; @@ -67,8 +73,7 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - stress_init_command(); - remote = parse_options(argc, argv); + remote = parse_options(argc, argv, &unixctl_path); signal(SIGPIPE, SIG_IGN); sighup = signal_register(SIGHUP); process_init(); @@ -76,11 +81,21 @@ main(int argc, char *argv[]) daemonize_start(); - retval = unixctl_server_create(NULL, &unixctl); + if (want_mlockall) { +#ifdef HAVE_MLOCKALL + if (mlockall(MCL_CURRENT | MCL_FUTURE)) { + VLOG_ERR("mlockall failed: %s", ovs_strerror(errno)); + } +#else + VLOG_ERR("mlockall not supported on this system"); +#endif + } + + retval = unixctl_server_create(unixctl_path, &unixctl); if (retval) { exit(EXIT_FAILURE); } - unixctl_command_register("exit", ovs_vswitchd_exit, &exiting); + unixctl_command_register("exit", "", 0, 0, ovs_vswitchd_exit, &exiting); bridge_init(remote); free(remote); @@ -90,11 +105,21 @@ main(int argc, char *argv[]) if (signal_poll(sighup)) { vlog_reopen_log_file(); } + memory_run(); + if (memory_should_report()) { + struct simap usage; + + simap_init(&usage); + bridge_get_memory_usage(&usage); + memory_report(&usage); + simap_destroy(&usage); + } bridge_run(); unixctl_server_run(unixctl); netdev_run(); signal_wait(sighup); + memory_wait(); bridge_wait(); unixctl_server_wait(unixctl); netdev_wait(); @@ -105,34 +130,35 @@ main(int argc, char *argv[]) } bridge_exit(); unixctl_server_destroy(unixctl); - signal_unregister(sighup); return 0; } static char * -parse_options(int argc, char *argv[]) +parse_options(int argc, char *argv[], char **unixctl_pathp) { enum { OPT_PEER_CA_CERT = UCHAR_MAX + 1, OPT_MLOCKALL, + OPT_UNIXCTL, VLOG_OPTION_ENUMS, - LEAK_CHECKER_OPTION_ENUMS, OPT_BOOTSTRAP_CA_CERT, OPT_ENABLE_DUMMY, + OPT_DISABLE_SYSTEM, DAEMON_OPTION_ENUMS }; - static struct option long_options[] = { + static const struct option long_options[] = { {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, {"mlockall", no_argument, NULL, OPT_MLOCKALL}, + {"unixctl", required_argument, NULL, OPT_UNIXCTL}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, - LEAK_CHECKER_LONG_OPTIONS, 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}, + {"enable-dummy", optional_argument, NULL, OPT_ENABLE_DUMMY}, + {"disable-system", no_argument, NULL, OPT_DISABLE_SYSTEM}, {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -150,22 +176,19 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - ovs_print_version(OFP_VERSION, OFP_VERSION); + ovs_print_version(OFP10_VERSION, OFP10_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 + want_mlockall = true; + break; + + case OPT_UNIXCTL: + *unixctl_pathp = optarg; break; VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS - LEAK_CHECKER_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: @@ -177,7 +200,11 @@ parse_options(int argc, char *argv[]) break; case OPT_ENABLE_DUMMY: - dummy_enable(); + dummy_enable(optarg && !strcmp(optarg, "override")); + break; + + case OPT_DISABLE_SYSTEM: + dp_blacklist_provider("system"); break; case '?': @@ -217,17 +244,17 @@ usage(void) daemon_usage(); vlog_usage(); printf("\nOther options:\n" + " --unixctl=SOCKET override default control socket name\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_) +ovs_vswitchd_exit(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *exiting_) { bool *exiting = exiting_; *exiting = true; - unixctl_command_reply(conn, 200, NULL); + unixctl_command_reply(conn, NULL); }