#include "compiler.h"
#include "daemon.h"
#include "dpif.h"
+#include "dummy.h"
#include "leak-checker.h"
#include "netdev.h"
#include "ovsdb-idl.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;
{
struct unixctl_server *unixctl;
struct signal *sighup;
- struct ovsdb_idl *idl;
const char *remote;
- bool inited, exiting;
+ 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);
daemonize_complete();
- idl = ovsdb_idl_create(remote, &ovsrec_idl_class);
-
- inited = false;
+ bridge_init(remote);
exiting = false;
while (!exiting) {
- bool need_reconfigure;
-
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
-
- need_reconfigure = false;
- if (inited && bridge_run()) {
- need_reconfigure = true;
- }
- if (ovsdb_idl_run(idl)) {
- need_reconfigure = true;
- }
-
- if (need_reconfigure) {
- const struct ovsrec_open_vswitch *cfg;
-
- 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);
return 0;
}
OPT_FAKE_PROC_NET,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS,
- OPT_BOOTSTRAP_CA_CERT
+ OPT_BOOTSTRAP_CA_CERT,
+ OPT_ENABLE_DUMMY
};
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
#endif
+ {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY},
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
break;
#endif
+ case OPT_ENABLE_DUMMY:
+ dummy_enable();
+ break;
+
case '?':
exit(EXIT_FAILURE);