#endif
#include <vlc_common.h>
+#include <stdlib.h>
+#include <vlc_network.h>
+
+
+#ifdef HAVE_MAEMO
+# include <signal.h>
+# include <errno.h>
+# include <poll.h>
+
+int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
+{
+ struct timespec tsbuf, *ts;
+ sigset_t set;
+ int canc, ret;
-#ifdef HAVE_POLL
+ if (timeout != -1)
+ {
+ div_t d = div (timeout, 1000);
+ tsbuf.tv_sec = d.quot;
+ tsbuf.tv_nsec = d.rem * 1000000;
+ ts = &tsbuf;
+ }
+ else
+ ts = NULL;
+
+ pthread_sigmask (SIG_BLOCK, NULL, &set);
+ sigdelset (&set, SIGRTMIN);
+
+ canc = vlc_savecancel ();
+ ret = ppoll (fds, nfds, ts, &set);
+ vlc_restorecancel (canc);
+
+ vlc_testcancel ();
+ return ret;
+}
+
+#elif defined (HAVE_POLL)
struct pollfd;
int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
abort ();
}
#else /* !HAVE_POLL */
+
#include <string.h>
-#include <stdlib.h>
-#include <vlc_network.h>
int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
{
fd_set rdset, wrset, exset;
struct timeval tv = { 0, 0 };
- int val = -1;
+ int val;
+
+resume:
+ val = -1;
+ vlc_testcancel ();
FD_ZERO (&rdset);
FD_ZERO (&wrset);
FD_SET (fd, &exset);
}
+#ifndef HAVE_ALERTABLE_SELECT
+# warning FIXME! Fix cancellation and remove this crap.
+ if ((timeout < 0) || (timeout > 50))
+ {
+ tv.tv_sec = 0;
+ tv.tv_usec = 50000;
+ }
+ else
+#endif
if (timeout >= 0)
{
div_t d = div (timeout, 1000);
}
val = select (val + 1, &rdset, &wrset, &exset,
- (timeout >= 0) ? &tv : NULL);
+ /*(timeout >= 0) ?*/ &tv /*: NULL*/);
+
+#ifndef HAVE_ALERTABLE_SELECT
+ if (val == 0)
+ {
+ if (timeout > 0)
+ timeout -= (timeout > 50) ? 50 : timeout;
+ if (timeout != 0)
+ goto resume;
+ }
+#endif
+
if (val == -1)
return -1;