mirror of
https://github.com/openvswitch/ovs
synced 2025-08-31 14:25:26 +00:00
poll-loop: Create Windows event handles for sockets automatically.
We currently have a poll_fd_wait_event(fd, wevent, events) function that is used at places common to Windows and Linux where we have to wait on sockets. On Linux, 'wevent' is always set as zero. On Windows, for sockets, when we send both 'fd' and 'wevent', we associate them with each other for 'events' and then wait on 'wevent'. Also on Windows, when we only send 'wevent' to this function, we would simply wait for all events for that 'wevent'. There is a disadvantage with this approach. * Windows clients need to create a 'wevent' and then pass it along. This means that at a lot of places where we create sockets, we also are forced to create a 'wevent'. With this commit, we pass the responsibility of creating a 'wevent' to poll_fd_wait() in case of sockets. That way, a client using poll_fd_wait() is only concerned about sockets and not about 'wevents'. There is a potential disadvantage with this change in that we create events more often and that may have a performance penalty. If that turns out to be the case, we will eventually need to create a pool of wevents that can be re-used. In Windows, there are cases where we want to wait on a event (not associated with any sockets) and then control it using functions like SetEvent() etc. For that purpose, introduce a new function poll_wevent_wait(). For this function, the client needs to create a event and then pass it along as an argument. Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-By: Ben Pfaff <blp@nicira.com>
This commit is contained in:
@@ -59,9 +59,12 @@ static struct hook hooks[MAX_HOOKS];
|
||||
static size_t n_hooks;
|
||||
|
||||
static int signal_fds[2];
|
||||
static HANDLE wevent;
|
||||
static volatile sig_atomic_t stored_sig_nr = SIG_ATOMIC_MAX;
|
||||
|
||||
#ifdef _WIN32
|
||||
static HANDLE wevent;
|
||||
#endif
|
||||
|
||||
static struct ovs_mutex mutex;
|
||||
|
||||
static void call_hooks(int sig_nr);
|
||||
@@ -215,7 +218,11 @@ void
|
||||
fatal_signal_wait(void)
|
||||
{
|
||||
fatal_signal_init();
|
||||
poll_fd_wait_event(signal_fds[0], wevent, POLLIN);
|
||||
#ifdef _WIN32
|
||||
poll_wevent_wait(wevent);
|
||||
#else
|
||||
poll_fd_wait(signal_fds[0], POLLIN);
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
Reference in New Issue
Block a user