Commit e9c23e95 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Win32: wake up select every split tenth of seconds (fix #1949)

parent 700b2282
...@@ -85,6 +85,18 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout) ...@@ -85,6 +85,18 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
FD_SET (fd, &exset); FD_SET (fd, &exset);
} }
#ifndef HAVE_ALERTABLE_SELECT
# warning FIXME! Fix cancellation and remove this crap.
resume:
vlc_testcancel ();
if ((timeout < 0) || (timeout > 50))
{
tv.tv_sec = 0;
tv.tv_usec = 50;
}
else
#endif
if (timeout >= 0) if (timeout >= 0)
{ {
div_t d = div (timeout, 1000); div_t d = div (timeout, 1000);
...@@ -94,6 +106,18 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout) ...@@ -94,6 +106,18 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
val = select (val + 1, &rdset, &wrset, &exset, val = select (val + 1, &rdset, &wrset, &exset,
(timeout >= 0) ? &tv : NULL); (timeout >= 0) ? &tv : NULL);
#ifndef HAVE_ALERTABLE_SELECT
# warning FIXME! Fix cancellation and remove this crap.
if (val == 0)
{
if (timeout > 0)
timeout -= (timeout > 50) ? 50 : timeout;
if (timeout != 0)
goto resume;
}
#endif
if (val == -1) if (val == -1)
return -1; return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment