Signed-off-by: Linda Sun <l...@vmware.com>
---
lib/dpif-linux.c | 2 +-
lib/fatal-signal.c | 2 +-
lib/latch.c | 37 ++++++++++++++++++++++++++++++++++++-
lib/latch.h | 3 +++
lib/netdev-linux.c | 2 +-
lib/netlink-socket.c | 2 +-
lib/poll-loop.c | 18 +++++++++++++++---
lib/poll-loop.h | 4 ++--
lib/process.c | 2 +-
lib/signals.c | 2 +-
lib/socket-util.c | 2 +-
lib/stream-fd.c | 6 +++---
lib/timeval.c | 15 ++++++++++++---
lib/timeval.h | 4 ++--
tests/test-netflow.c | 2 +-
tests/test-sflow.c | 2 +-
16 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index 25715f4..a8246f3 100644
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -1482,7 +1482,7 @@ dpif_linux_recv_wait(struct dpif *dpif_)
ovs_mutex_lock(&dpif->upcall_lock);
if (dpif->epoll_fd >= 0) {
- poll_fd_wait(dpif->epoll_fd, POLLIN);
+ poll_fd_wait(dpif->epoll_fd, 0, POLLIN);
}
ovs_mutex_unlock(&dpif->upcall_lock);
}
diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index e980f4b..052ca26 100644
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -182,7 +182,7 @@ void
fatal_signal_wait(void)
{
fatal_signal_init();
- poll_fd_wait(signal_fds[0], POLLIN);
+ poll_fd_wait(signal_fds[0], 0, POLLIN);
}
static void
diff --git a/lib/latch.c b/lib/latch.c
index bf518b9..5bc97b4 100644
--- a/lib/latch.c
+++ b/lib/latch.c
@@ -27,15 +27,28 @@
void
latch_init(struct latch *latch)
{
+#ifndef WIN32
xpipe_nonblocking(latch->fds);
+ latch->wevent = 0;
+#else
+ latch->fds[0] = 0;
+ latch->is_set = FALSE;
+ latch->wevent = CreateEvent(NULL, TRUE, FALSE, NULL);
+#endif
}
/* Destroys 'latch'. */
void
latch_destroy(struct latch *latch)
{
+#ifndef WIN32
close(latch->fds[0]);
close(latch->fds[1]);
+#else
+ latch->fds[0] = 0;
+ latch->is_set = FALSE;
+ CloseHandle(latch->wevent);
+#endif
}
/* Resets 'latch' to the unset state. Returns true if 'latch' was previously
@@ -43,9 +56,18 @@ latch_destroy(struct latch *latch)
bool
latch_poll(struct latch *latch)
{
+#ifndef WIN32
char buffer[_POSIX_PIPE_BUF];
return read(latch->fds[0], buffer, sizeof buffer) > 0;
+#else
+ bool is_set;
+
+ is_set = latch->is_set;
+ latch->is_set = FALSE;
+ ResetEvent(latch->wevent);
+ return is_set;
+#endif
}
/* Sets 'latch'.
@@ -55,7 +77,12 @@ latch_poll(struct latch *latch)
void
latch_set(struct latch *latch)
{
+#ifndef WIN32
ignore(write(latch->fds[1], "", 1));
+#else
+ latch->is_set = TRUE;
+ SetEvent(latch->wevent);
+#endif
}
/* Returns true if 'latch' is set, false otherwise. Does not reset 'latch'
@@ -63,6 +90,7 @@ latch_set(struct latch *latch)
bool
latch_is_set(const struct latch *latch)
{
+#ifndef WIN32
struct pollfd pfd;
int retval;
@@ -73,6 +101,9 @@ latch_is_set(const struct latch *latch)
} while (retval < 0 && errno == EINTR);
return pfd.revents & POLLIN;
+#else
+ return latch->is_set;
+#endif
}
/* Causes the next poll_block() to wake up when 'latch' is set.
@@ -83,5 +114,9 @@ latch_is_set(const struct latch *latch)
void
latch_wait_at(const struct latch *latch, const char *where)
{
- poll_fd_wait_at(latch->fds[0], POLLIN, where);
+#ifndef WIN32
+ poll_fd_wait_at(latch->fds[0], latch->wevent, POLLIN, where);
+#else
+ poll_fd_wait_at(latch->fds[0], latch->wevent, POLLIN, where);
+#endif
}
diff --git a/lib/latch.h b/lib/latch.h
index 0b6e8a3..3c27f86 100644
--- a/lib/latch.h
+++ b/lib/latch.h
@@ -24,9 +24,12 @@
#include <stdbool.h>
#include "util.h"
+#include "ovs-thread.h"
struct latch {
int fds[2];
+ uint32_t wevent;
+ bool is_set;
};
void latch_init(struct latch *);
diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index 3e0da48..755e9da 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -878,7 +878,7 @@ static void
netdev_linux_rx_wait(struct netdev_rx *rx_)
{
struct netdev_rx_linux *rx = netdev_rx_linux_cast(rx_);
- poll_fd_wait(rx->fd, POLLIN);
+ poll_fd_wait(rx->fd, 0, POLLIN);
}
static int
diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
index 4bd6d36..c015d93 100644
--- a/lib/netlink-socket.c
+++ b/lib/netlink-socket.c
@@ -802,7 +802,7 @@ nl_dump_done(struct nl_dump *dump)
void
nl_sock_wait(const struct nl_sock *sock, short int events)
{
- poll_fd_wait(sock->fd, events);
+ poll_fd_wait(sock->fd, 0, events);
}
/* Returns the underlying fd for 'sock', for use in "poll()"-like operations
diff --git a/lib/poll-loop.c b/lib/poll-loop.c
index 5e3618b..fe0b4f7 100644
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.c
@@ -39,6 +39,11 @@ COVERAGE_DEFINE(poll_zero_timeout);
struct poll_loop {
/* All active poll waiters. */
struct pollfd *pollfds; /* Events to pass to poll(). */
+#ifdef WIN32
+ HANDLE *wevents;
+#else
+ uint32_t *wevents;
+#endif
const char **where; /* Where each pollfd was created. */
size_t n_waiters; /* Number of elems in 'where' and 'pollfds'. */
size_t allocated_waiters; /* Allocated elems in 'where' and 'pollfds'. */
@@ -63,7 +68,7 @@ static struct poll_loop *poll_loop(void);
* automatically provide the caller's source file and line number for
* 'where'.) */
void
-poll_fd_wait_at(int fd, short int events, const char *where)
+poll_fd_wait_at(int fd, uint32_t wevent, short int events, const char *where)
{
struct poll_loop *loop = poll_loop();
@@ -74,11 +79,17 @@ poll_fd_wait_at(int fd, short int events, const char *where)
loop->pollfds = xrealloc(loop->pollfds,
(loop->allocated_waiters
* sizeof *loop->pollfds));
+ loop->wevents = xrealloc(loop->wevents,
+ (loop->allocated_waiters
+ * sizeof *loop->wevents));
}
loop->where[loop->n_waiters] = where;
loop->pollfds[loop->n_waiters].fd = fd;
loop->pollfds[loop->n_waiters].events = events;
+#ifdef WIN32
+ loop->wevents[loop->n_waiters] = wevent;
+#endif
loop->n_waiters++;
}
@@ -227,7 +238,7 @@ poll_block(void)
}
timewarp_wait();
- retval = time_poll(loop->pollfds, loop->n_waiters,
+ retval = time_poll(loop->pollfds, loop->n_waiters, loop->wevents,
loop->timeout_when, &elapsed);
if (retval < 0) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
@@ -244,7 +255,7 @@ poll_block(void)
}
}
- loop->timeout_when = LLONG_MAX;
+ loop->timeout_when = LLONG_MIN;
loop->timeout_where = NULL;
loop->n_waiters = 0;
@@ -261,6 +272,7 @@ free_poll_loop(void *loop_)
free(loop->pollfds);
free(loop->where);
+ free(loop->wevents);
free(loop);
}
diff --git a/lib/poll-loop.h b/lib/poll-loop.h
index 0397853..f5c5665 100644
--- a/lib/poll-loop.h
+++ b/lib/poll-loop.h
@@ -50,8 +50,8 @@ extern "C" {
* caller to supply a location explicitly, which is useful if the caller's own
* caller would be more useful in log output. See timer_wait_at() for an
* example. */
-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, SOURCE_LOCATOR)
+void poll_fd_wait_at(int fd, uint32_t wevent, short int events, const char
*where);
+#define poll_fd_wait(fd, wevent, events) poll_fd_wait_at(fd, wevent, events,
SOURCE_LOCATOR)
void poll_timer_wait_at(long long int msec, const char *where);
#define poll_timer_wait(msec) poll_timer_wait_at(msec, SOURCE_LOCATOR)
diff --git a/lib/process.c b/lib/process.c
index 5dd34b3..e0a2166 100644
--- a/lib/process.c
+++ b/lib/process.c
@@ -333,7 +333,7 @@ process_wait(struct process *p)
if (p->exited) {
poll_immediate_wake();
} else {
- poll_fd_wait(fds[0], POLLIN);
+ poll_fd_wait(fds[0], 0, POLLIN);
}
}
diff --git a/lib/signals.c b/lib/signals.c
index 27da5d6..cc56375 100644
--- a/lib/signals.c
+++ b/lib/signals.c
@@ -88,7 +88,7 @@ signal_poll(struct signal *s)
void
signal_wait(struct signal *s)
{
- poll_fd_wait(s->fds[0], POLLIN);
+ poll_fd_wait(s->fds[0], 0, POLLIN);
}
static void
diff --git a/lib/socket-util.c b/lib/socket-util.c
index bb48ade..6c5d0ba 100644
--- a/lib/socket-util.c
+++ b/lib/socket-util.c
@@ -1354,7 +1354,7 @@ send_iovec_and_fds_fully_block(int sock,
if (error != EAGAIN) {
return error;
}
- poll_fd_wait(sock, POLLOUT);
+ poll_fd_wait(sock, 0, POLLOUT);
poll_block();
}
}
diff --git a/lib/stream-fd.c b/lib/stream-fd.c
index 1171f32..3520201 100644
--- a/lib/stream-fd.c
+++ b/lib/stream-fd.c
@@ -117,11 +117,11 @@ fd_wait(struct stream *stream, enum stream_wait_type wait)
switch (wait) {
case STREAM_CONNECT:
case STREAM_SEND:
- poll_fd_wait(s->fd, POLLOUT);
+ poll_fd_wait(s->fd, 0, POLLOUT);
break;
case STREAM_RECV:
- poll_fd_wait(s->fd, POLLIN);
+ poll_fd_wait(s->fd, 0, POLLIN);
break;
default:
@@ -235,7 +235,7 @@ static void
pfd_wait(struct pstream *pstream)
{
struct fd_pstream *ps = fd_pstream_cast(pstream);
- poll_fd_wait(ps->fd, POLLIN);
+ poll_fd_wait(ps->fd, 0, POLLIN);
}
static int
diff --git a/lib/timeval.c b/lib/timeval.c
index 2ce45fc..445232e 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -232,12 +232,12 @@ time_alarm(unsigned int secs)
*
* Stores the number of milliseconds elapsed during poll in '*elapsed'. */
int
-time_poll(struct pollfd *pollfds, int n_pollfds, long long int timeout_when,
- int *elapsed)
+time_poll(struct pollfd *pollfds, int n_pollfds, void *handles,
+ long long int timeout_when, int *elapsed)
{
long long int *last_wakeup = last_wakeup_get();
long long int start;
- int retval;
+ int retval = 0;
time_init();
coverage_clear();
@@ -261,10 +261,19 @@ time_poll(struct pollfd *pollfds, int n_pollfds, long
long int timeout_when,
time_left = timeout_when - now;
}
+#ifndef WIN32
retval = poll(pollfds, n_pollfds, time_left);
if (retval < 0) {
retval = -errno;
}
+#else
+ if (n_pollfds != 0) {
+ retval = WaitForMultipleObjects(n_pollfds, handles, FALSE,
time_left);
+ }
+ if (retval < 0) {
+ retval = -WSAGetLastError();
+ }
+#endif
if (deadline <= time_msec()) {
fatal_signal_handler(SIGALRM);
diff --git a/lib/timeval.h b/lib/timeval.h
index 1bbfd5c..3c700c5 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -52,8 +52,8 @@ long long int time_wall_msec(void);
void time_timespec(struct timespec *);
void time_wall_timespec(struct timespec *);
void time_alarm(unsigned int secs);
-int time_poll(struct pollfd *, int n_pollfds, long long int timeout_when,
- int *elapsed);
+int time_poll(struct pollfd *, int n_pollfds, void *handles,
+ long long int timeout_when, int *elapsed);
long long int timespec_to_msec(const struct timespec *);
long long int timeval_to_msec(const struct timeval *);
diff --git a/tests/test-netflow.c b/tests/test-netflow.c
index b6c3109..38486ac 100644
--- a/tests/test-netflow.c
+++ b/tests/test-netflow.c
@@ -228,7 +228,7 @@ main(int argc, char *argv[])
break;
}
- poll_fd_wait(sock, POLLIN);
+ poll_fd_wait(sock, 0, POLLIN);
unixctl_server_wait(server);
poll_block();
}
diff --git a/tests/test-sflow.c b/tests/test-sflow.c
index cba01b9..634ca4a 100644
--- a/tests/test-sflow.c
+++ b/tests/test-sflow.c
@@ -544,7 +544,7 @@ main(int argc, char *argv[])
break;
}
- poll_fd_wait(sock, POLLIN);
+ poll_fd_wait(sock, 0, POLLIN);
unixctl_server_wait(server);
poll_block();
}
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
