From: Ben Pfaff <blp@nicira.com>
Date: Thu, 16 Apr 2009 00:21:26 +0000 (-0700)
Subject: vswitch: Fix indefinite wait on reload.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=778a396796f263be29b9f74f8da44e0ee1ed92b1;p=openvswitch

vswitch: Fix indefinite wait on reload.

If a "reload" command was sent to vswitchd via the unixctl library, then
the reconfiguration would not actually happen until another round trip
through the vswitchd poll loop.  Ordinarily this happens quickly but if
nothing is going on it can become an indefinite wait.

Fix by forcing another round trip if we need to reconfigure.
---

diff --git a/vswitchd/vswitchd.c b/vswitchd/vswitchd.c
index f3049b02..ba0acf07 100644
--- a/vswitchd/vswitchd.c
+++ b/vswitchd/vswitchd.c
@@ -109,6 +109,9 @@ main(int argc, char *argv[])
         }
         unixctl_server_run(unixctl);
 
+        if (need_reconfigure) {
+            poll_immediate_wake();
+        }
         signal_wait(sighup);
         mgmt_wait();
         bridge_wait();