-/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#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 "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
#include "lib/vswitch-idl.h"
-#include "worker.h"
+#include "lib/netdev-dpdk.h"
VLOG_DEFINE_THIS_MODULE(vswitchd);
static unixctl_cb_func ovs_vswitchd_exit;
static char *parse_options(int argc, char *argv[], char **unixctl_path);
-static void usage(void) NO_RETURN;
+OVS_NO_RETURN static void usage(void);
int
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);
+ if (retval < 0) {
+ return retval;
+ }
+
+ argc -= retval;
+ argv += retval;
+
+ ovs_cmdl_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();
+ daemonize_start(true);
if (want_mlockall) {
#ifdef HAVE_MLOCKALL
if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
- VLOG_ERR("mlockall failed: %s", strerror(errno));
+ VLOG_ERR("mlockall failed: %s", ovs_strerror(errno));
}
#else
VLOG_ERR("mlockall not supported on this system");
#endif
}
- worker_start();
-
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
exiting = false;
while (!exiting) {
- worker_run();
- if (signal_poll(sighup)) {
- vlog_reopen_log_file();
- }
memory_run();
if (memory_should_report()) {
struct simap usage;
memory_report(&usage);
simap_destroy(&usage);
}
- bridge_run_fast();
bridge_run();
- bridge_run_fast();
unixctl_server_run(unixctl);
netdev_run();
- worker_wait();
- signal_wait(sighup);
memory_wait();
bridge_wait();
unixctl_server_wait(unixctl);
poll_immediate_wake();
}
poll_block();
+ if (should_service_stop()) {
+ exiting = true;
+ }
}
bridge_exit();
unixctl_server_destroy(unixctl);
- signal_unregister(sighup);
+ service_stop();
return 0;
}
OPT_MLOCKALL,
OPT_UNIXCTL,
VLOG_OPTION_ENUMS,
- LEAK_CHECKER_OPTION_ENUMS,
OPT_BOOTSTRAP_CA_CERT,
OPT_ENABLE_DUMMY,
OPT_DISABLE_SYSTEM,
- DAEMON_OPTION_ENUMS
+ 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},
+ {"dpdk", required_argument, NULL, OPT_DPDK},
{NULL, 0, NULL, 0},
};
- char *short_options = long_options_to_short_options(long_options);
+ char *short_options = ovs_cmdl_long_options_to_short_options(long_options);
for (;;) {
int c;
usage();
case 'V':
- ovs_print_version(OFP10_VERSION, OFP10_VERSION);
+ ovs_print_version(0, 0);
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
- LEAK_CHECKER_OPTION_HANDLERS
STREAM_SSL_OPTION_HANDLERS
case OPT_PEER_CA_CERT:
break;
case OPT_ENABLE_DUMMY:
- dummy_enable(optarg && !strcmp(optarg, "override"));
+ dummy_enable(optarg);
break;
case OPT_DISABLE_SYSTEM:
case '?':
exit(EXIT_FAILURE);
+ case OPT_DPDK:
+ ovs_fatal(0, "--dpdk must be given at beginning of command line.");
+ break;
+
default:
abort();
}
stream_usage("DATABASE", true, false, true);
daemon_usage();
vlog_usage();
+ printf("\nDPDK options:\n"
+ " --dpdk [VHOST] [DPDK] Initialize DPDK datapath.\n"
+ " where DPDK are options for initializing DPDK lib and VHOST is\n"
+#ifdef VHOST_CUSE
+ " option to override default character device name used for\n"
+ " for use with userspace vHost\n"
+ " -cuse_dev_name NAME\n"
+#else
+ " option to override default directory where vhost-user\n"
+ " sockets are created.\n"
+ " -vhost_sock_dir DIR\n"
+#endif
+ );
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();
+ " --unixctl=SOCKET override default control socket name\n"
+ " -h, --help display this help message\n"
+ " -V, --version display version information\n");
exit(EXIT_SUCCESS);
}
projects / cascardo / ovs.git / blobdiff