X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=84e5ad113302ea3e2573d1a06dcd43f4174521ab;hb=d91cf14f5bdab1e513fc3520649e38f3617ac3b9;hp=3b6517884498b3591a419b6baab609d1c4d06b45;hpb=a890678229e7e72703ef3b27d8a98ccd9d7c4446;p=openvswitch diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 3b651788..84e5ad11 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -52,6 +52,7 @@ #include "vconn.h" #include "vlog.h" #include "lib/vswitch-idl.h" +#include "worker.h" VLOG_DEFINE_THIS_MODULE(vswitchd); @@ -85,8 +86,6 @@ main(int argc, char *argv[]) daemonize_start(); - VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION); - if (want_mlockall) { #ifdef HAVE_MLOCKALL if (mlockall(MCL_CURRENT | MCL_FUTURE)) { @@ -97,6 +96,8 @@ main(int argc, char *argv[]) #endif } + worker_start(); + retval = unixctl_server_create(unixctl_path, &unixctl); if (retval) { exit(EXIT_FAILURE); @@ -108,6 +109,7 @@ main(int argc, char *argv[]) exiting = false; while (!exiting) { + worker_run(); if (signal_poll(sighup)) { vlog_reopen_log_file(); } @@ -126,6 +128,7 @@ main(int argc, char *argv[]) unixctl_server_run(unixctl); netdev_run(); + worker_wait(); signal_wait(sighup); memory_wait(); bridge_wait();