X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=2f3086d9081f575c7fb9b124898ba2e185fccfca;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=ebac1aa5cfd4d61f45ae4c871b9207bfca70d43c;hpb=6e037e3ca6381fa36fdf6009c4ccc97d0f041be4;p=sliver-openvswitch.git diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index ebac1aa5c..2f3086d90 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks +/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ -33,26 +32,30 @@ #include "dirs.h" #include "dpif.h" #include "dummy.h" -#include "leak-checker.h" +#include "fatal-signal.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 "vswitch-idl.h" +#include "lib/vswitch-idl.h" +#include "lib/netdev-dpdk.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[], char **unixctl_path); @@ -63,22 +66,33 @@ main(int argc, char *argv[]) { char *unixctl_path = NULL; struct unixctl_server *unixctl; - struct signal *sighup; char *remote; bool exiting; int retval; - proctitle_init(argc, argv); set_program_name(argv[0]); - stress_init_command(); + retval = dpdk_init(argc,argv); + argc -= retval; + argv += retval; + + proctitle_init(argc, argv); + service_start(&argc, &argv); remote = parse_options(argc, argv, &unixctl_path); - signal(SIGPIPE, SIG_IGN); - sighup = signal_register(SIGHUP); - process_init(); + fatal_ignore_sigpipe(); ovsrec_init(); daemonize_start(); + 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); @@ -90,16 +104,20 @@ main(int argc, char *argv[]) exiting = false; while (!exiting) { - 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_fast(); bridge_run(); - bridge_run_fast(); unixctl_server_run(unixctl); netdev_run(); - signal_wait(sighup); + memory_wait(); bridge_wait(); unixctl_server_wait(unixctl); netdev_wait(); @@ -107,10 +125,13 @@ main(int argc, char *argv[]) poll_immediate_wake(); } poll_block(); + if (should_service_stop()) { + exiting = true; + } } bridge_exit(); unixctl_server_destroy(unixctl); - signal_unregister(sighup); + service_stop(); return 0; } @@ -123,25 +144,27 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) OPT_MLOCKALL, OPT_UNIXCTL, VLOG_OPTION_ENUMS, - LEAK_CHECKER_OPTION_ENUMS, OPT_BOOTSTRAP_CA_CERT, OPT_ENABLE_DUMMY, OPT_DISABLE_SYSTEM, - DAEMON_OPTION_ENUMS + OPT_ENABLE_OF14, + DAEMON_OPTION_ENUMS, + OPT_DPDK, }; - 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", optional_argument, NULL, OPT_ENABLE_DUMMY}, {"disable-system", no_argument, NULL, OPT_DISABLE_SYSTEM}, + {"enable-of14", no_argument, NULL, OPT_ENABLE_OF14}, + {"dpdk", required_argument, NULL, OPT_DPDK}, {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -163,13 +186,7 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) 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: @@ -178,7 +195,6 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS - LEAK_CHECKER_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: @@ -197,9 +213,16 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) dp_blacklist_provider("system"); break; + case OPT_ENABLE_OF14: + bridge_enable_of14(); + break; + case '?': exit(EXIT_FAILURE); + case OPT_DPDK: + break; + default: abort(); } @@ -235,9 +258,9 @@ usage(void) vlog_usage(); printf("\nOther options:\n" " --unixctl=SOCKET override default control socket name\n" + " --enable-of14 allow enabling OF1.4 (unsafely!)\n" " -h, --help display this help message\n" " -V, --version display version information\n"); - leak_checker_usage(); exit(EXIT_SUCCESS); }