git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
timeval.c
diff --git
a/lib/timeval.c
b/lib/timeval.c
index
691cf74
..
3e7719f
100644
(file)
--- a/
lib/timeval.c
+++ b/
lib/timeval.c
@@
-282,7
+282,12
@@
time_poll(struct pollfd *pollfds, int n_pollfds, HANDLE *handles OVS_UNUSED,
#endif
if (deadline <= time_msec()) {
+#ifndef _WIN32
fatal_signal_handler(SIGALRM);
+#else
+ VLOG_ERR("wake up from WaitForMultipleObjects after deadline");
+ fatal_signal_handler(SIGTERM);
+#endif
if (retval < 0) {
retval = 0;
}