git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-doc: generate vswitch.[pic|gv] files only if dot tool is available
[sliver-openvswitch.git]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index
80c8fed
..
bc45dac
100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+/* 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-42,7
+42,6
@@
#include "simap.h"
#include "stream-ssl.h"
#include "stream.h"
#include "simap.h"
#include "stream-ssl.h"
#include "stream.h"
-#include "stress.h"
#include "svec.h"
#include "timeval.h"
#include "unixctl.h"
#include "svec.h"
#include "timeval.h"
#include "unixctl.h"
@@
-50,7
+49,6
@@
#include "vconn.h"
#include "vlog.h"
#include "lib/vswitch-idl.h"
#include "vconn.h"
#include "vlog.h"
#include "lib/vswitch-idl.h"
-#include "worker.h"
VLOG_DEFINE_THIS_MODULE(vswitchd);
VLOG_DEFINE_THIS_MODULE(vswitchd);
@@
-75,7
+73,6
@@
main(int argc, char *argv[])
proctitle_init(argc, argv);
set_program_name(argv[0]);
proctitle_init(argc, argv);
set_program_name(argv[0]);
- stress_init_command();
remote = parse_options(argc, argv, &unixctl_path);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
remote = parse_options(argc, argv, &unixctl_path);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
@@
-87,15
+84,13
@@
main(int argc, char *argv[])
if (want_mlockall) {
#ifdef HAVE_MLOCKALL
if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
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
}
}
#else
VLOG_ERR("mlockall not supported on this system");
#endif
}
- worker_start();
-
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
@@
-107,7
+102,6
@@
main(int argc, char *argv[])
exiting = false;
while (!exiting) {
exiting = false;
while (!exiting) {
- worker_run();
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
@@
-126,7
+120,6
@@
main(int argc, char *argv[])
unixctl_server_run(unixctl);
netdev_run();
unixctl_server_run(unixctl);
netdev_run();
- worker_wait();
signal_wait(sighup);
memory_wait();
bridge_wait();
signal_wait(sighup);
memory_wait();
bridge_wait();