| Message ID | bc984dc5ea308ffef5939073e0f9212afd971d4e.1502899087.git.shaw.leon@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, Aug 17, 2017 at 12:06:25AM +0800, Xiao Liang wrote: > Poll-loop is the core to implement main loop. It should be available in > libopenvswitch. > > Signed-off-by: Xiao Liang <shaw.leon@gmail.com> I'm concerned about the way that this adds a definition of HANDLE in a public header. That seems unfriendly to code that might want to include both this header and Win32 headers that properly define HANDLE. Alin, what's the right thing to do here?
> -----Original Message----- > From: Ben Pfaff [mailto:blp@ovn.org] > Sent: Tuesday, October 31, 2017 9:34 PM > To: Xiao Liang <shaw.leon@gmail.com>; Alin Serdean > <aserdean@cloudbasesolutions.com> > Cc: dev@openvswitch.org > Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to > include/openvswitch > > On Thu, Aug 17, 2017 at 12:06:25AM +0800, Xiao Liang wrote: > > Poll-loop is the core to implement main loop. It should be available > > in libopenvswitch. > > > > Signed-off-by: Xiao Liang <shaw.leon@gmail.com> > > I'm concerned about the way that this adds a definition of HANDLE in a public > header. That seems unfriendly to code that might want to include both this > header and Win32 headers that properly define HANDLE. > > Alin, what's the right thing to do here? [Alin Serdean] First the type definition is wrong (HANDLE is VOID*). I would avoid adding the definition to HANDLE. Maybe add an include to <windows.h> or <windefs.h> to include/windows/poll.h .
On Thu, Nov 2, 2017 at 5:51 AM, Alin Serdean <aserdean@cloudbasesolutions.com> wrote: > > >> -----Original Message----- >> From: Ben Pfaff [mailto:blp@ovn.org] >> Sent: Tuesday, October 31, 2017 9:34 PM >> To: Xiao Liang <shaw.leon@gmail.com>; Alin Serdean >> <aserdean@cloudbasesolutions.com> >> Cc: dev@openvswitch.org >> Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to >> include/openvswitch >> >> On Thu, Aug 17, 2017 at 12:06:25AM +0800, Xiao Liang wrote: >> > Poll-loop is the core to implement main loop. It should be available >> > in libopenvswitch. >> > >> > Signed-off-by: Xiao Liang <shaw.leon@gmail.com> >> >> I'm concerned about the way that this adds a definition of HANDLE in a public >> header. That seems unfriendly to code that might want to include both this >> header and Win32 headers that properly define HANDLE. >> >> Alin, what's the right thing to do here? > [Alin Serdean] First the type definition is wrong (HANDLE is VOID*). > I would avoid adding the definition to HANDLE. Maybe add an include to <windows.h> or <windefs.h> to include/windows/poll.h . Since include/windows is not installed as public header, is it safe to remove inclusion of poll.h and add windows.h in poll-loop.h?
> -----Original Message----- > From: Xiao Liang [mailto:shaw.leon@gmail.com] > Sent: Thursday, November 2, 2017 4:32 AM > To: Alin Serdean <aserdean@cloudbasesolutions.com> > Cc: Ben Pfaff <blp@ovn.org>; dev@openvswitch.org > Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to > include/openvswitch > > On Thu, Nov 2, 2017 at 5:51 AM, Alin Serdean > <aserdean@cloudbasesolutions.com> wrote: > > > > > >> -----Original Message----- > >> From: Ben Pfaff [mailto:blp@ovn.org] > >> Sent: Tuesday, October 31, 2017 9:34 PM > >> To: Xiao Liang <shaw.leon@gmail.com>; Alin Serdean > >> <aserdean@cloudbasesolutions.com> > >> Cc: dev@openvswitch.org > >> Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to > >> include/openvswitch > >> > >> On Thu, Aug 17, 2017 at 12:06:25AM +0800, Xiao Liang wrote: > >> > Poll-loop is the core to implement main loop. It should be > >> > available in libopenvswitch. > >> > > >> > Signed-off-by: Xiao Liang <shaw.leon@gmail.com> > >> > >> I'm concerned about the way that this adds a definition of HANDLE in > >> a public header. That seems unfriendly to code that might want to > >> include both this header and Win32 headers that properly define HANDLE. > >> > >> Alin, what's the right thing to do here? > > [Alin Serdean] First the type definition is wrong (HANDLE is VOID*). > > I would avoid adding the definition to HANDLE. Maybe add an include to > <windows.h> or <windefs.h> to include/windows/poll.h . > > Since include/windows is not installed as public header, is it safe to remove > inclusion of poll.h and add windows.h in poll-loop.h? That sounds reasonable to me. Ben do you agree?
On Thu, Nov 02, 2017 at 01:35:11PM +0000, Alin Serdean wrote: > > > > -----Original Message----- > > From: Xiao Liang [mailto:shaw.leon@gmail.com] > > Sent: Thursday, November 2, 2017 4:32 AM > > To: Alin Serdean <aserdean@cloudbasesolutions.com> > > Cc: Ben Pfaff <blp@ovn.org>; dev@openvswitch.org > > Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to > > include/openvswitch > > > > On Thu, Nov 2, 2017 at 5:51 AM, Alin Serdean > > <aserdean@cloudbasesolutions.com> wrote: > > > > > > > > >> -----Original Message----- > > >> From: Ben Pfaff [mailto:blp@ovn.org] > > >> Sent: Tuesday, October 31, 2017 9:34 PM > > >> To: Xiao Liang <shaw.leon@gmail.com>; Alin Serdean > > >> <aserdean@cloudbasesolutions.com> > > >> Cc: dev@openvswitch.org > > >> Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to > > >> include/openvswitch > > >> > > >> On Thu, Aug 17, 2017 at 12:06:25AM +0800, Xiao Liang wrote: > > >> > Poll-loop is the core to implement main loop. It should be > > >> > available in libopenvswitch. > > >> > > > >> > Signed-off-by: Xiao Liang <shaw.leon@gmail.com> > > >> > > >> I'm concerned about the way that this adds a definition of HANDLE in > > >> a public header. That seems unfriendly to code that might want to > > >> include both this header and Win32 headers that properly define HANDLE. > > >> > > >> Alin, what's the right thing to do here? > > > [Alin Serdean] First the type definition is wrong (HANDLE is VOID*). > > > I would avoid adding the definition to HANDLE. Maybe add an include to > > <windows.h> or <windefs.h> to include/windows/poll.h . > > > > Since include/windows is not installed as public header, is it safe to remove > > inclusion of poll.h and add windows.h in poll-loop.h? > That sounds reasonable to me. Ben do you agree? <poll.h> is definitely needed on non-Windows platforms for the definition of POLLIN and POLLOUT, so it would have to be conditional. I don't object to including <windows.h>, on Windows, but I don't know the full implications of doing it.
On Fri, Nov 3, 2017 at 1:12 AM, Ben Pfaff <blp@ovn.org> wrote: > On Thu, Nov 02, 2017 at 01:35:11PM +0000, Alin Serdean wrote: >> >> >> > -----Original Message----- >> > From: Xiao Liang [mailto:shaw.leon@gmail.com] >> > Sent: Thursday, November 2, 2017 4:32 AM >> > To: Alin Serdean <aserdean@cloudbasesolutions.com> >> > Cc: Ben Pfaff <blp@ovn.org>; dev@openvswitch.org >> > Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to >> > include/openvswitch >> > >> > On Thu, Nov 2, 2017 at 5:51 AM, Alin Serdean >> > <aserdean@cloudbasesolutions.com> wrote: >> > > >> > > >> > >> -----Original Message----- >> > >> From: Ben Pfaff [mailto:blp@ovn.org] >> > >> Sent: Tuesday, October 31, 2017 9:34 PM >> > >> To: Xiao Liang <shaw.leon@gmail.com>; Alin Serdean >> > >> <aserdean@cloudbasesolutions.com> >> > >> Cc: dev@openvswitch.org >> > >> Subject: Re: [ovs-dev] [PATCH 2/2] lib: Move lib/poll-loop.h to >> > >> include/openvswitch >> > >> >> > >> On Thu, Aug 17, 2017 at 12:06:25AM +0800, Xiao Liang wrote: >> > >> > Poll-loop is the core to implement main loop. It should be >> > >> > available in libopenvswitch. >> > >> > >> > >> > Signed-off-by: Xiao Liang <shaw.leon@gmail.com> >> > >> >> > >> I'm concerned about the way that this adds a definition of HANDLE in >> > >> a public header. That seems unfriendly to code that might want to >> > >> include both this header and Win32 headers that properly define HANDLE. >> > >> >> > >> Alin, what's the right thing to do here? >> > > [Alin Serdean] First the type definition is wrong (HANDLE is VOID*). >> > > I would avoid adding the definition to HANDLE. Maybe add an include to >> > <windows.h> or <windefs.h> to include/windows/poll.h . >> > >> > Since include/windows is not installed as public header, is it safe to remove >> > inclusion of poll.h and add windows.h in poll-loop.h? >> That sounds reasonable to me. Ben do you agree? > > <poll.h> is definitely needed on non-Windows platforms for the > definition of POLLIN and POLLOUT, so it would have to be conditional. I > don't object to including <windows.h>, on Windows, but I don't know the > full implications of doing it. Thanks. I submitted a new patch.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index cb0080d53..392dcf983 100644 --- a/include/openvswitch/automake.mk +++ b/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 \ diff --git a/lib/poll-loop.h b/include/openvswitch/poll-loop.h similarity index 99% rename from lib/poll-loop.h rename to include/openvswitch/poll-loop.h index 84082f001..b45c25dd5 100644 --- a/lib/poll-loop.h +++ b/include/openvswitch/poll-loop.h @@ -34,7 +34,6 @@ #define POLL_LOOP_H 1 #include <poll.h> -#include "util.h" #ifdef __cplusplus extern "C" { @@ -54,6 +53,7 @@ void poll_fd_wait_at(int fd, short int events, const char *where); #define poll_fd_wait(fd, events) poll_fd_wait_at(fd, events, OVS_SOURCE_LOCATOR) #ifdef _WIN32 +typedef uint32_t HANDLE; void poll_wevent_wait_at(HANDLE wevent, const char *where); #define poll_wevent_wait(wevent) poll_wevent_wait_at(wevent, OVS_SOURCE_LOCATOR) #endif /* _WIN32 */ diff --git a/lib/bfd.c b/lib/bfd.c index 4174e8b8e..40cd0beb9 100644 --- a/lib/bfd.c +++ b/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" diff --git a/lib/cfm.c b/lib/cfm.c index b6cfe4b11..984ff11a1 100644 --- a/lib/cfm.c +++ b/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" diff --git a/lib/conntrack.c b/lib/conntrack.c index 1c0e02351..13f58d14b 100644 --- a/lib/conntrack.c +++ b/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" diff --git a/lib/daemon-windows.c b/lib/daemon-windows.c index 1ba714dac..0e85191d2 100644 --- a/lib/daemon-windows.c +++ b/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); diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index e2cd9310d..9afb31474 100644 --- a/lib/dpif-netdev.c +++ b/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" diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index 29001fbe4..c265909f8 100644 --- a/lib/dpif-netlink.c +++ b/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" diff --git a/lib/dpif.c b/lib/dpif.c index 4c5eac60a..2428d421f 100644 --- a/lib/dpif.c +++ b/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" diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 7b9813dd5..3b905b6de 100644 --- a/lib/fatal-signal.c +++ b/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" diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index 2fae057de..b456e83b8 100644 --- a/lib/jsonrpc.c +++ b/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" diff --git a/lib/lacp.c b/lib/lacp.c index e6ad7b934..c510e6fe5 100644 --- a/lib/lacp.c +++ b/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" diff --git a/lib/latch-unix.c b/lib/latch-unix.c index bf518b9ca..2995076d6 100644 --- a/lib/latch-unix.c +++ b/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. */ diff --git a/lib/latch-windows.c b/lib/latch-windows.c index 3160527b5..67c0592a0 100644 --- a/lib/latch-windows.c +++ b/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. */ diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 16d1feadf..6b02e9389 100644 --- a/lib/learning-switch.c +++ b/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" diff --git a/lib/mac-learning.c b/lib/mac-learning.c index 44c49622b..215caf0ba 100644 --- a/lib/mac-learning.c +++ b/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" diff --git a/lib/mcast-snooping.c b/lib/mcast-snooping.c index a3163f57f..6730301b6 100644 --- a/lib/mcast-snooping.c +++ b/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" diff --git a/lib/memory.c b/lib/memory.c index 6a6a55014..da97476c6 100644 --- a/lib/memory.c +++ b/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" diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 8a4cdb3fa..65c5674a5 100644 --- a/lib/netdev-bsd.c +++ b/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" diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index f731af1df..750fb3ae6 100644 --- a/lib/netdev-dummy.c +++ b/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" diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 2ff3e2bcc..58fb52808 100644 --- a/lib/netdev-linux.c +++ b/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" diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index d11c5ccdd..518058a1f 100644 --- a/lib/netdev-vport.c +++ b/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" diff --git a/lib/netdev-windows.c b/lib/netdev-windows.c index f90a4391c..4ad45ffa1 100644 --- a/lib/netdev-windows.c +++ b/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" diff --git a/lib/netdev.c b/lib/netdev.c index b4e570baf..151c060f5 100644 --- a/lib/netdev.c +++ b/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" diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c index ac48b15bd..1e1bb2f79 100644 --- a/lib/netlink-conntrack.c +++ b/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" diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c index ccfd55e92..317bf907f 100644 --- a/lib/netlink-socket.c +++ b/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" diff --git a/lib/ovs-lldp.c b/lib/ovs-lldp.c index 711f9b4fe..43dd06d6f 100644 --- a/lib/ovs-lldp.c +++ b/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" diff --git a/lib/ovs-rcu.c b/lib/ovs-rcu.c index dac38447a..05a46d452 100644 --- a/lib/ovs-rcu.c +++ b/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" diff --git a/lib/ovs-thread.c b/lib/ovs-thread.c index 1f4995b84..d0c0c09bd 100644 --- a/lib/ovs-thread.c +++ b/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" diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c index af1821bff..f69743ad4 100644 --- a/lib/ovsdb-idl.c +++ b/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" diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 4f32189a9..ec5c8197e 100644 --- a/lib/poll-loop.c +++ b/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> diff --git a/lib/process.c b/lib/process.c index 3e119b59b..dd678cd02 100644 --- a/lib/process.c +++ b/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" diff --git a/lib/rconn.c b/lib/rconn.c index 673ee1cea..2eebbff70 100644 --- a/lib/rconn.c +++ b/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" diff --git a/lib/reconnect.c b/lib/reconnect.c index 471fb7fc8..04cb15b7c 100644 --- a/lib/reconnect.c +++ b/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" diff --git a/lib/rtbsd.c b/lib/rtbsd.c index aa9cc9b5a..c98f3052f 100644 --- a/lib/rtbsd.c +++ b/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); diff --git a/lib/seq.c b/lib/seq.c index 6e2f596ea..a39c809fc 100644 --- a/lib/seq.c +++ b/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); diff --git a/lib/signals.c b/lib/signals.c index 36c640b3e..70c53adc6 100644 --- a/lib/signals.c +++ b/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" diff --git a/lib/socket-util.c b/lib/socket-util.c index 85ed54c05..a79aa67f7 100644 --- a/lib/socket-util.c +++ b/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__ diff --git a/lib/stream-fd.c b/lib/stream-fd.c index 95373db11..46ee7ae27 100644 --- a/lib/stream-fd.c +++ b/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" diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index 13803014b..e80c5292c 100644 --- a/lib/stream-ssl.c +++ b/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" diff --git a/lib/stream-unix.c b/lib/stream-unix.c index 40ded1952..f8c5ad046 100644 --- a/lib/stream-unix.c +++ b/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" diff --git a/lib/stream-windows.c b/lib/stream-windows.c index b4b2aa7f3..d908ee972 100644 --- a/lib/stream-windows.c +++ b/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" diff --git a/lib/stream.c b/lib/stream.c index ec33a690e..9cef18e84 100644 --- a/lib/stream.c +++ b/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" diff --git a/lib/timer.c b/lib/timer.c index e90355bdb..815ec3599 100644 --- a/lib/timer.c +++ b/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. */ diff --git a/lib/tnl-neigh-cache.c b/lib/tnl-neigh-cache.c index a28ce1de8..5ddd53976 100644 --- a/lib/tnl-neigh-cache.c +++ b/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" diff --git a/lib/token-bucket.c b/lib/token-bucket.c index 29f516589..0badeb46b 100644 --- a/lib/token-bucket.c +++ b/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" diff --git a/lib/unixctl.c b/lib/unixctl.c index 33c5412f1..06566937a 100644 --- a/lib/unixctl.c +++ b/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" diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c index 33f1388a2..0794ecc05 100644 --- a/lib/vconn-stream.c +++ b/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" diff --git a/lib/vconn.c b/lib/vconn.c index 17ecdab5c..13623d87a 100644 --- a/lib/vconn.c +++ b/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" diff --git a/ofproto/bond.c b/ofproto/bond.c index 365a3ca7f..d5d7cd017 100644 --- a/ofproto/bond.c +++ b/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" diff --git a/ofproto/bundles.c b/ofproto/bundles.c index 2fcc32369..849f99a15 100644 --- a/ofproto/bundles.c +++ b/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" diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 5c908f605..2892212c0 100644 --- a/ofproto/connmgr.c +++ b/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" diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c index be993249f..71cdc1212 100644 --- a/ofproto/fail-open.c +++ b/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" diff --git a/ofproto/in-band.c b/ofproto/in-band.c index 3d3675ed0..343dcfa17 100644 --- a/ofproto/in-band.c +++ b/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); diff --git a/ofproto/netflow.c b/ofproto/netflow.c index cd4aa7e17..783b9c945 100644 --- a/ofproto/netflow.c +++ b/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" diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 472c27281..645268d21 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/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" diff --git a/ofproto/ofproto-dpif-monitor.c b/ofproto/ofproto-dpif-monitor.c index 623d51706..bb0e49091 100644 --- a/ofproto/ofproto-dpif-monitor.c +++ b/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" diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c index 65a2003a7..ccf89645b 100644 --- a/ofproto/ofproto-dpif-sflow.c +++ b/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" diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c index 4a71bbe25..14c7ef2a9 100644 --- a/ofproto/ofproto-dpif-upcall.c +++ b/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" diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 1a8e829e5..48c153a31 100644 --- a/ofproto/ofproto-dpif.c +++ b/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" diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 7541af0b2..75bdf90b4 100644 --- a/ofproto/ofproto.c +++ b/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" diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c index 35716ea89..59561f076 100644 --- a/ofproto/pinsched.c +++ b/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" diff --git a/ovn/controller-vtep/gateway.c b/ovn/controller-vtep/gateway.c index f91ed9567..619c3c49a 100644 --- a/ovn/controller-vtep/gateway.c +++ b/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" diff --git a/ovn/controller-vtep/ovn-controller-vtep.c b/ovn/controller-vtep/ovn-controller-vtep.c index 19f333d68..c1c2e68cb 100644 --- a/ovn/controller-vtep/ovn-controller-vtep.c +++ b/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" diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c index 32309e9e3..52a37d251 100644 --- a/ovn/controller/binding.c +++ b/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" diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index 436df8d5a..90afddbb3 100644 --- a/ovn/controller/ofctrl.c +++ b/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" diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index e2c965290..7d9cc87a3 100644 --- a/ovn/controller/ovn-controller.c +++ b/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" diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index df71979f9..faeed2208 100644 --- a/ovn/controller/physical.c +++ b/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" diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index f9b2e0caf..e0307a859 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -43,7 +43,7 @@ #include "ovn/lib/logical-fields.h" #include "ovn/lib/ovn-dhcp.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" diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index 49e4ac338..94ee403a5 100644 --- a/ovn/northd/ovn-northd.c +++ b/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" diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 46ede4e50..04ad00cf0 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/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" diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c index 7af5863b0..d3d682b0f 100644 --- a/ovn/utilities/ovn-sbctl.c +++ b/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" diff --git a/ovn/utilities/ovn-trace.c b/ovn/utilities/ovn-trace.c index 59083eebe..be307f5d4 100644 --- a/ovn/utilities/ovn-trace.c +++ b/ovn/utilities/ovn-trace.c @@ -40,7 +40,7 @@ #include "ovn/lib/ovn-dhcp.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" diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 27cbd8449..da3b3835f 100644 --- a/ovsdb/jsonrpc-server.c +++ b/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" diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 76c2cdf4d..7d9018384 100644 --- a/ovsdb/ovsdb-client.c +++ b/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" diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 030d86ba4..dfa02669e 100644 --- a/ovsdb/ovsdb-server.c +++ b/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" diff --git a/ovsdb/trigger.c b/ovsdb/trigger.c index 1b960f572..165cd6ebb 100644 --- a/ovsdb/trigger.c +++ b/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 *); diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c index a7ca69148..14c3ef175 100644 --- a/tests/test-jsonrpc.c +++ b/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" diff --git a/tests/test-netflow.c b/tests/test-netflow.c index 692c4ddd2..d2322d450 100644 --- a/tests/test-netflow.c +++ b/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" diff --git a/tests/test-netlink-conntrack.c b/tests/test-netlink-conntrack.c index 0d9dacee9..2a62615b2 100644 --- a/tests/test-netlink-conntrack.c +++ b/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 { diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 1760268b6..74f6b2546 100644 --- a/tests/test-ovsdb.c +++ b/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" diff --git a/tests/test-sflow.c b/tests/test-sflow.c index 039a1b111..b70336b45 100644 --- a/tests/test-sflow.c +++ b/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" diff --git a/tests/test-unixctl.c b/tests/test-unixctl.c index bf35b195b..3eadf54cd 100644 --- a/tests/test-unixctl.c +++ b/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" diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 96e31832c..07997a1bc 100644 --- a/tests/test-vconn.c +++ b/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" diff --git a/utilities/nlmon.c b/utilities/nlmon.c index 2e16222cb..b91fa09b3 100644 --- a/utilities/nlmon.c +++ b/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" diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 5b7f1b021..953184da4 100644 --- a/utilities/ovs-ofctl.c +++ b/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" diff --git a/utilities/ovs-testcontroller.c b/utilities/ovs-testcontroller.c index 9b9903ba5..8f8fc2bb1 100644 --- a/utilities/ovs-testcontroller.c +++ b/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" diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 548992e42..7b909431d 100644 --- a/utilities/ovs-vsctl.c +++ b/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" diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index a8cbae78c..1e7b92295 100644 --- a/vswitchd/bridge.c +++ b/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" diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 7de6d89ab..d5e07c037 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/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" diff --git a/vswitchd/system-stats.c b/vswitchd/system-stats.c index c53a9a8ce..b780476cc 100644 --- a/vswitchd/system-stats.c +++ b/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" diff --git a/vtep/vtep-ctl.c b/vtep/vtep-ctl.c index 0b984f0a5..3af71498b 100644 --- a/vtep/vtep-ctl.c +++ b/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"
Poll-loop is the core to implement main loop. It should be available in libopenvswitch. Signed-off-by: Xiao Liang <shaw.leon@gmail.com> --- include/openvswitch/automake.mk | 1 + {lib => include/openvswitch}/poll-loop.h | 2 +- lib/bfd.c | 2 +- lib/cfm.c | 2 +- lib/conntrack.c | 2 +- lib/daemon-windows.c | 2 +- lib/dpif-netdev.c | 2 +- lib/dpif-netlink.c | 2 +- lib/dpif.c | 2 +- lib/fatal-signal.c | 2 +- lib/jsonrpc.c | 2 +- lib/lacp.c | 2 +- lib/latch-unix.c | 2 +- lib/latch-windows.c | 2 +- lib/learning-switch.c | 2 +- lib/mac-learning.c | 2 +- lib/mcast-snooping.c | 2 +- lib/memory.c | 2 +- lib/netdev-bsd.c | 2 +- lib/netdev-dummy.c | 2 +- lib/netdev-linux.c | 2 +- lib/netdev-vport.c | 2 +- lib/netdev-windows.c | 2 +- lib/netdev.c | 2 +- lib/netlink-conntrack.c | 2 +- lib/netlink-socket.c | 2 +- lib/ovs-lldp.c | 2 +- lib/ovs-rcu.c | 2 +- lib/ovs-thread.c | 2 +- lib/ovsdb-idl.c | 2 +- lib/poll-loop.c | 2 +- lib/process.c | 2 +- lib/rconn.c | 2 +- lib/reconnect.c | 2 +- lib/rtbsd.c | 2 +- lib/seq.c | 2 +- lib/signals.c | 2 +- lib/socket-util.c | 2 +- lib/stream-fd.c | 2 +- lib/stream-ssl.c | 2 +- lib/stream-unix.c | 2 +- lib/stream-windows.c | 2 +- lib/stream.c | 2 +- lib/timer.c | 2 +- lib/tnl-neigh-cache.c | 2 +- lib/token-bucket.c | 2 +- lib/unixctl.c | 2 +- lib/vconn-stream.c | 2 +- lib/vconn.c | 2 +- ofproto/bond.c | 2 +- ofproto/bundles.c | 2 +- ofproto/connmgr.c | 2 +- ofproto/fail-open.c | 2 +- ofproto/in-band.c | 2 +- ofproto/netflow.c | 2 +- ofproto/ofproto-dpif-ipfix.c | 2 +- ofproto/ofproto-dpif-monitor.c | 2 +- ofproto/ofproto-dpif-sflow.c | 2 +- ofproto/ofproto-dpif-upcall.c | 2 +- ofproto/ofproto-dpif.c | 2 +- ofproto/ofproto.c | 2 +- ofproto/pinsched.c | 2 +- ovn/controller-vtep/gateway.c | 2 +- ovn/controller-vtep/ovn-controller-vtep.c | 2 +- ovn/controller/binding.c | 2 +- ovn/controller/ofctrl.c | 2 +- ovn/controller/ovn-controller.c | 2 +- ovn/controller/physical.c | 2 +- ovn/controller/pinctrl.c | 2 +- ovn/northd/ovn-northd.c | 2 +- ovn/utilities/ovn-nbctl.c | 2 +- ovn/utilities/ovn-sbctl.c | 2 +- ovn/utilities/ovn-trace.c | 2 +- ovsdb/jsonrpc-server.c | 2 +- ovsdb/ovsdb-client.c | 2 +- ovsdb/ovsdb-server.c | 2 +- ovsdb/trigger.c | 3 ++- tests/test-jsonrpc.c | 2 +- tests/test-netflow.c | 2 +- tests/test-netlink-conntrack.c | 2 +- tests/test-ovsdb.c | 2 +- tests/test-sflow.c | 2 +- tests/test-unixctl.c | 2 +- tests/test-vconn.c | 2 +- utilities/nlmon.c | 2 +- utilities/ovs-ofctl.c | 2 +- utilities/ovs-testcontroller.c | 2 +- utilities/ovs-vsctl.c | 2 +- vswitchd/bridge.c | 2 +- vswitchd/ovs-vswitchd.c | 2 +- vswitchd/system-stats.c | 2 +- vtep/vtep-ctl.c | 2 +- 92 files changed, 93 insertions(+), 91 deletions(-) rename {lib => include/openvswitch}/poll-loop.h (99%)