lib: Move lib/poll-loop.h to include/openvswitch

Poll-loop is the core to implement main loop. It should be available in
libopenvswitch.

Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

include/openvswitch/automake.mk

@@ -20,6 +20,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/ofp-prop.h \
 	include/openvswitch/ofp-util.h \
 	include/openvswitch/packets.h \
+	include/openvswitch/poll-loop.h \
 	include/openvswitch/rconn.h \
 	include/openvswitch/shash.h \
 	include/openvswitch/thread.h \

include/openvswitch/poll-loop.h

@@ -33,8 +33,13 @@
 #ifndef POLL_LOOP_H
 #define POLL_LOOP_H 1
 
+#ifndef _WIN32
 #include <poll.h>
-#include "util.h"
+#endif
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 #ifdef  __cplusplus
 extern "C" {

lib/bfd.c

@@ -37,7 +37,7 @@
 #include "ovs-thread.h"
 #include "openvswitch/types.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "seq.h"
 #include "smap.h"

lib/cfm.c

@@ -31,7 +31,7 @@
 #include "netdev.h"
 #include "ovs-atomic.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "seq.h"
 #include "timer.h"

lib/conntrack.c

@@ -36,7 +36,7 @@
 #include "openvswitch/vlog.h"
 #include "ovs-rcu.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "timeval.h"
 

lib/daemon-windows.c

@@ -24,7 +24,7 @@
 #include "dirs.h"
 #include "fatal-signal.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(daemon_windows);

lib/dpif-netdev.c

@@ -66,7 +66,7 @@
 #include "ovs-numa.h"
 #include "ovs-rcu.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "pvector.h"
 #include "random.h"
 #include "seq.h"

lib/dpif-netlink.c

@@ -49,7 +49,7 @@
 #include "odp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "openvswitch/shash.h"
 #include "sset.h"

lib/dpif.c

@@ -37,7 +37,7 @@
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "route-table.h"
 #include "seq.h"
 #include "openvswitch/shash.h"

lib/fatal-signal.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "sset.h"
 #include "signals.h"

lib/jsonrpc.c

@@ -27,7 +27,7 @@
 #include "openvswitch/list.h"
 #include "openvswitch/ofpbuf.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "reconnect.h"
 #include "stream.h"
 #include "timeval.h"

lib/lacp.c

@@ -25,7 +25,7 @@
 #include "dp-packet.h"
 #include "ovs-atomic.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "openvswitch/shash.h"
 #include "timer.h"

lib/latch-unix.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <poll.h>
 #include <unistd.h>
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 
 /* Initializes 'latch' as initially unset. */

lib/latch-windows.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <poll.h>
 #include <unistd.h>
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 
 /* Initializes 'latch' as initially unset. */

lib/learning-switch.c

@@ -39,7 +39,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/rconn.h"
 #include "openvswitch/shash.h"
 #include "simap.h"

lib/mac-learning.c

@@ -24,7 +24,7 @@
 #include "coverage.h"
 #include "hash.h"
 #include "openvswitch/list.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "timeval.h"
 #include "unaligned.h"
 #include "util.h"

lib/mcast-snooping.c

@@ -27,7 +27,7 @@
 #include "coverage.h"
 #include "hash.h"
 #include "openvswitch/list.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "timeval.h"
 #include "entropy.h"
 #include "unaligned.h"

lib/memory.c

@@ -20,7 +20,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "openvswitch/dynamic-string.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "simap.h"
 #include "timeval.h"
 #include "unixctl.h"

lib/netdev-bsd.c

@@ -56,7 +56,7 @@
 #include "openflow/openflow.h"
 #include "ovs-thread.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "socket-util.h"
 #include "svec.h"

lib/netdev-dummy.c

@@ -35,7 +35,7 @@
 #include "ovs-atomic.h"
 #include "packets.h"
 #include "pcap-file.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "sset.h"
 #include "stream.h"

lib/netdev-linux.c

@@ -64,7 +64,7 @@
 #include "openflow/openflow.h"
 #include "ovs-atomic.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "rtnetlink.h"
 #include "openvswitch/shash.h"
 #include "socket-util.h"

lib/netdev-vport.c

@@ -38,7 +38,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "ovs-router.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "route-table.h"
 #include "smap.h"
 #include "socket-util.h"

lib/netdev-windows.c

@@ -26,7 +26,7 @@
 #include "netdev-provider.h"
 #include "openvswitch/ofpbuf.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "svec.h"
 #include "openvswitch/vlog.h"

lib/netdev.c

@@ -45,7 +45,7 @@
 #include "odp-netlink.h"
 #include "openflow/openflow.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "openvswitch/shash.h"
 #include "smap.h"

lib/netlink-conntrack.c

@@ -32,7 +32,7 @@
 #include "netlink-socket.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"

lib/netlink-socket.c

@@ -31,7 +31,7 @@
 #include "odp-netlink.h"
 #include "openvswitch/ofpbuf.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "socket-util.h"
 #include "util.h"

lib/ovs-lldp.c

@@ -42,7 +42,7 @@
 #include "netdev.h"
 #include "openvswitch/types.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "smap.h"
 #include "unixctl.h"
 #include "util.h"

lib/ovs-rcu.c

@@ -21,7 +21,7 @@
 #include "guarded-list.h"
 #include "openvswitch/list.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "timeval.h"
 #include "util.h"

lib/ovs-thread.c

@@ -29,7 +29,7 @@
 #include "openvswitch/list.h"
 #include "netdev-dpdk.h"
 #include "ovs-rcu.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "socket-util.h"
 #include "util.h"

lib/ovsdb-idl.c

@@ -36,7 +36,7 @@
 #include "ovsdb-error.h"
 #include "ovsdb-idl-provider.h"
 #include "ovsdb-parser.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "skiplist.h"
 #include "sset.h"

lib/poll-loop.c

@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include <errno.h>
 #include <inttypes.h>
 #include <poll.h>

lib/process.c

@@ -30,7 +30,7 @@
 #include "fatal-signal.h"
 #include "openvswitch/list.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "signals.h"
 #include "socket-util.h"
 #include "timeval.h"

lib/rconn.c

@@ -27,7 +27,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "sat-math.h"
 #include "stream.h"
 #include "timeval.h"

lib/reconnect.c

@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "util.h"
 #include "openvswitch/vlog.h"
 

lib/rtbsd.c

@@ -27,7 +27,7 @@
 
 #include "coverage.h"
 #include "socket-util.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(rtbsd);

lib/seq.c

@@ -26,7 +26,7 @@
 #include "latch.h"
 #include "openvswitch/list.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 
 COVERAGE_DEFINE(seq_change);
 

lib/signals.c

@@ -21,7 +21,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "openvswitch/type-props.h"
 #include "util.h"

lib/socket-util.c

@@ -36,7 +36,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "ovs-thread.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "util.h"
 #include "openvswitch/vlog.h"
 #ifdef __linux__

lib/stream-fd.c

@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include "fatal-signal.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "util.h"
 #include "stream-provider.h"

lib/stream-ssl.c

@@ -38,7 +38,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "socket-util.h"
 #include "util.h"

lib/stream-unix.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "dirs.h"
 #include "util.h"

lib/stream-windows.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "dirs.h"
 #include "fatal-signal.h"
 #include "util.h"

lib/stream.c

@@ -34,7 +34,7 @@
 #include "openvswitch/vlog.h"
 #include "ovs-thread.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "socket-util.h"
 #include "util.h"

lib/timer.c

@@ -18,7 +18,7 @@
 
 #include "timer.h"
 
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "timeval.h"
 
 /* Returns the number of milliseconds until 'timer' expires. */

lib/tnl-neigh-cache.c

@@ -34,7 +34,7 @@
 #include "netdev.h"
 #include "ovs-thread.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "socket-util.h"
 #include "timeval.h"

lib/token-bucket.c

@@ -18,7 +18,7 @@
 
 #include "openvswitch/token-bucket.h"
 
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "sat-math.h"
 #include "timeval.h"
 #include "util.h"

lib/unixctl.c

@@ -24,7 +24,7 @@
 #include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "openvswitch/list.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "stream.h"
 #include "stream-provider.h"

lib/vconn-stream.c

@@ -24,7 +24,7 @@
 #include "fatal-signal.h"
 #include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "stream.h"
 #include "util.h"

lib/vconn.c

@@ -35,7 +35,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "util.h"
 #include "socket-util.h"

ofproto/bond.c

@@ -42,7 +42,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "openvswitch/shash.h"
 #include "timeval.h"

ofproto/bundles.c

@@ -31,7 +31,7 @@
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 #include "pinsched.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/rconn.h"
 #include "openvswitch/shash.h"
 #include "simap.h"

ofproto/connmgr.c

@@ -34,7 +34,7 @@
 #include "openvswitch/vlog.h"
 #include "ovs-atomic.h"
 #include "pinsched.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/rconn.h"
 #include "openvswitch/shash.h"
 #include "simap.h"

ofproto/fail-open.c

@@ -31,7 +31,7 @@
 #include "openvswitch/vlog.h"
 #include "ofproto.h"
 #include "ofproto-provider.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/rconn.h"
 #include "timeval.h"
 

ofproto/in-band.c

@@ -36,7 +36,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "timeval.h"
 
 VLOG_DEFINE_THIS_MODULE(in_band);

ofproto/netflow.c

@@ -29,7 +29,7 @@
 #include "ofproto.h"
 #include "ofproto/netflow.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "timeval.h"
 #include "util.h"

ofproto/ofproto-dpif-ipfix.c

@@ -29,7 +29,7 @@
 #include "ofproto-dpif.h"
 #include "dp-packet.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "sset.h"
 #include "util.h"
 #include "timeval.h"

ofproto/ofproto-dpif-monitor.c

@@ -31,7 +31,7 @@
 #include "ofproto-dpif.h"
 #include "ovs-lldp.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "timeval.h"
 #include "util.h"

ofproto/ofproto-dpif-sflow.c

@@ -32,7 +32,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "ofproto.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "ovs-router.h"
 #include "route-table.h"
 #include "sflow_api.h"

ofproto/ofproto-dpif-upcall.c

@@ -36,7 +36,7 @@
 #include "ofproto-dpif-xlate-cache.h"
 #include "ovs-rcu.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "unixctl.h"
 #include "openvswitch/vlog.h"

ofproto/ofproto-dpif.c

@@ -62,7 +62,7 @@
 #include "ovs-lldp.h"
 #include "ovs-rcu.h"
 #include "ovs-router.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "simap.h"
 #include "smap.h"

ofproto/ofproto.c

@@ -50,7 +50,7 @@
 #include "ovs-rcu.h"
 #include "packets.h"
 #include "pinsched.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "seq.h"
 #include "openvswitch/shash.h"

ofproto/pinsched.c

@@ -26,7 +26,7 @@
 #include "openvswitch/hmap.h"
 #include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "openvswitch/rconn.h"
 #include "sat-math.h"

ovn/controller-vtep/gateway.c

@@ -16,7 +16,7 @@
 #include <config.h>
 #include "gateway.h"
 
-#include "lib/poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "lib/simap.h"
 #include "lib/sset.h"
 #include "lib/util.h"

ovn/controller-vtep/ovn-controller-vtep.c

@@ -27,7 +27,7 @@
 #include "dirs.h"
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "stream.h"
 #include "stream-ssl.h"
 #include "unixctl.h"

ovn/controller/binding.c

@@ -20,7 +20,7 @@
 #include "lport.h"
 
 #include "lib/bitmap.h"
-#include "lib/poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "lib/sset.h"
 #include "lib/util.h"
 #include "lib/netdev.h"

ovn/controller/ofctrl.c

@@ -36,7 +36,7 @@
 #include "openvswitch/vlog.h"
 #include "ovn-controller.h"
 #include "ovn/actions.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "physical.h"
 #include "openvswitch/rconn.h"
 #include "socket-util.h"

ovn/controller/ovn-controller.c

@@ -47,7 +47,7 @@
 #include "patch.h"
 #include "physical.h"
 #include "pinctrl.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "lib/bitmap.h"
 #include "lib/hash.h"
 #include "smap.h"

ovn/controller/physical.c

@@ -21,7 +21,7 @@
 #include "lflow.h"
 #include "lport.h"
 #include "lib/bundle.h"
-#include "lib/poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "lib/uuid.h"
 #include "ofctrl.h"
 #include "openvswitch/list.h"

ovn/controller/pinctrl.c

@@ -43,7 +43,7 @@
 #include "ovn/lib/logical-fields.h"
 #include "ovn/lib/ovn-l7.h"
 #include "ovn/lib/ovn-util.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/rconn.h"
 #include "socket-util.h"
 #include "timeval.h"

ovn/northd/ovn-northd.c

@@ -36,7 +36,7 @@
 #include "ovn/lib/ovn-util.h"
 #include "ovn/actions.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "smap.h"
 #include "sset.h"
 #include "stream.h"

ovn/utilities/ovn-nbctl.c

@@ -28,7 +28,7 @@
 #include "ovn/lib/ovn-nb-idl.h"
 #include "ovn/lib/ovn-util.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "process.h"
 #include "smap.h"
 #include "sset.h"

ovn/utilities/ovn-sbctl.c

@@ -44,7 +44,7 @@
 #include "ovn/lib/ovn-util.h"
 #include "ovsdb-data.h"
 #include "ovsdb-idl.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "process.h"
 #include "sset.h"
 #include "stream-ssl.h"

ovn/utilities/ovn-trace.c

@@ -40,7 +40,7 @@
 #include "ovn/lib/ovn-sb-idl.h"
 #include "ovn/lib/ovn-util.h"
 #include "ovsdb-idl.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "stream-ssl.h"
 #include "stream.h"
 #include "unixctl.h"

ovsdb/jsonrpc-server.c

@@ -29,7 +29,7 @@
 #include "ovsdb-parser.h"
 #include "ovsdb.h"
 #include "condition.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "reconnect.h"
 #include "row.h"
 #include "server.h"

ovsdb/ovsdb-client.c

@@ -38,7 +38,7 @@
 #include "ovsdb.h"
 #include "ovsdb-data.h"
 #include "ovsdb-error.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "sort.h"
 #include "svec.h"
 #include "stream.h"

ovsdb/ovsdb-server.c

@@ -40,7 +40,7 @@
 #include "ovsdb-data.h"
 #include "ovsdb-types.h"
 #include "ovsdb-error.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "process.h"
 #include "replication.h"
 #include "row.h"

ovsdb/trigger.c

@@ -22,8 +22,9 @@
 #include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "ovsdb.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "server.h"
+#include "util.h"
 
 static bool ovsdb_trigger_try(struct ovsdb_trigger *, long long int now);
 static void ovsdb_trigger_complete(struct ovsdb_trigger *);

tests/test-jsonrpc.c

@@ -26,7 +26,7 @@
 #include "daemon.h"
 #include "openvswitch/json.h"
 #include "ovstest.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "stream-ssl.h"
 #include "stream.h"
 #include "timeval.h"

tests/test-netflow.c

@@ -28,7 +28,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "ovstest.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "unixctl.h"
 #include "util.h"

tests/test-netlink-conntrack.c

@@ -23,7 +23,7 @@
 #include "netlink-conntrack.h"
 #include "netlink-notifier.h"
 #include "ovstest.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 
 /* Monitor command */
 struct test_change {

tests/test-ovsdb.c

@@ -43,7 +43,7 @@
 #include "ovsdb/table.h"
 #include "ovsdb/transaction.h"
 #include "ovsdb/trigger.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "stream.h"
 #include "svec.h"
 #include "tests/idltest.h"

tests/test-sflow.c

@@ -31,7 +31,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "ovstest.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "unixctl.h"
 #include "util.h"

tests/test-unixctl.c

@@ -22,7 +22,7 @@
 #include "fatal-signal.h"
 #include "openvswitch/vlog.h"
 #include "ovstest.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "unixctl.h"
 #include "util.h"
 

tests/test-vconn.c

@@ -31,7 +31,7 @@
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 #include "ovstest.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "socket-util.h"
 #include "stream.h"
 #include "stream-ssl.h"

utilities/nlmon.c

@@ -26,7 +26,7 @@
 #include "netlink.h"
 #include "netlink-socket.h"
 #include "openvswitch/ofpbuf.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "timeval.h"
 #include "util.h"
 #include "openvswitch/vlog.h"

utilities/ovs-ofctl.c

@@ -58,7 +58,7 @@
 #include "openvswitch/vlog.h"
 #include "packets.h"
 #include "pcap-file.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "random.h"
 #include "sort.h"
 #include "stream-ssl.h"

utilities/ovs-testcontroller.c

@@ -32,7 +32,7 @@
 #include "ofp-version-opt.h"
 #include "openvswitch/ofpbuf.h"
 #include "openflow/openflow.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/rconn.h"
 #include "simap.h"
 #include "stream-ssl.h"

utilities/ovs-vsctl.c

@@ -38,7 +38,7 @@
 #include "openvswitch/json.h"
 #include "ovsdb-data.h"
 #include "ovsdb-idl.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "process.h"
 #include "stream.h"
 #include "stream-ssl.h"

vswitchd/bridge.c

@@ -51,7 +51,7 @@
 #include "ovs-lldp.h"
 #include "ovs-numa.h"
 #include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "seq.h"
 #include "sflow_api.h"
 #include "sha1.h"

vswitchd/ovs-vswitchd.c

@@ -37,7 +37,7 @@
 #include "netdev.h"
 #include "openflow/openflow.h"
 #include "ovsdb-idl.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "simap.h"
 #include "stream-ssl.h"
 #include "stream.h"

vswitchd/system-stats.c

@@ -39,7 +39,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "ovs-rcu.h"
 #include "ovs-thread.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "openvswitch/shash.h"
 #include "process.h"
 #include "smap.h"

vtep/vtep-ctl.c

@@ -37,7 +37,7 @@
 #include "openvswitch/json.h"
 #include "ovsdb-data.h"
 #include "ovsdb-idl.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
 #include "process.h"
 #include "stream.h"
 #include "stream-ssl.h"