1 files changed, 67 insertions, 31 deletions

diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp
index 5695cb3ec5..97c0efc36f 100644
--- a/src/corelib/kernel/qcore_unix.cpp
+++ b/src/corelib/kernel/qcore_unix.cpp
@@ -50,12 +50,13 @@
 #include <mach/mach_time.h>
 #endif
 
-#ifdef Q_OS_BLACKBERRY
-#include <qsocketnotifier.h>
-#endif // Q_OS_BLACKBERRY
-
 QT_BEGIN_NAMESPACE
 
+#if !defined(QT_HAVE_PPOLL) && defined(QT_HAVE_POLLTS)
+# define ppoll pollts
+# define QT_HAVE_PPOLL
+#endif
+
 static inline bool time_update(struct timespec *tv, const struct timespec &start,
                                const struct timespec &timeout)
 {
@@ -85,9 +86,7 @@ int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
 #ifndef Q_OS_QNX
         ret = ::pselect(nfds, fdread, fdwrite, fdexcept, &timeout, 0);
 #else
-        timeval timeoutVal;
-        timeoutVal.tv_sec = timeout.tv_sec;
-        timeoutVal.tv_usec = timeout.tv_nsec / 1000;
+        timeval timeoutVal = timespecToTimeval(timeout);
         ret = ::select(nfds, fdread, fdwrite, fdexcept, &timeoutVal);
 #endif
         if (ret != -1 || errno != EINTR)
@@ -102,43 +101,80 @@ int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
     }
 }
 
+static inline struct timespec millisecsToTimespec(const unsigned int ms)
+{
+    struct timespec tv;
+
+    tv.tv_sec = ms / 1000;
+    tv.tv_nsec = (ms % 1000) * 1000 * 1000;
+
+    return tv;
+}
+
 int qt_select_msecs(int nfds, fd_set *fdread, fd_set *fdwrite, int timeout)
 {
     if (timeout < 0)
         return qt_safe_select(nfds, fdread, fdwrite, 0, 0);
 
-    struct timespec tv;
-    tv.tv_sec = timeout / 1000;
-    tv.tv_nsec = (timeout % 1000) * 1000 * 1000;
+    struct timespec tv = millisecsToTimespec(timeout);
     return qt_safe_select(nfds, fdread, fdwrite, 0, &tv);
 }
 
-#ifdef Q_OS_BLACKBERRY
-// The BlackBerry event dispatcher uses bps_get_event. Unfortunately, already registered
-// socket notifiers are disabled by a call to select. This is to rearm the standard streams.
-int bb_select(QList<QSocketNotifier *> socketNotifiers, int nfds, fd_set *fdread, fd_set *fdwrite,
-              int timeout)
+#if !defined(QT_HAVE_PPOLL) && defined(QT_HAVE_POLL)
+static inline int timespecToMillisecs(const struct timespec *ts)
 {
-    QList<bool> socketNotifiersEnabled;
-    socketNotifiersEnabled.reserve(socketNotifiers.count());
-    for (int a = 0; a < socketNotifiers.count(); ++a) {
-        if (socketNotifiers.at(a) && socketNotifiers.at(a)->isEnabled()) {
-            socketNotifiersEnabled.append(true);
-            socketNotifiers.at(a)->setEnabled(false);
-        } else {
-            socketNotifiersEnabled.append(false);
-        }
-    }
+    return (ts == NULL) ? -1 :
+           (ts->tv_sec * 1000) + (ts->tv_nsec / 1000000);
+}
+#endif
+
+// defined in qpoll.cpp
+int qt_poll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout_ts);
+
+static inline int qt_ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout_ts)
+{
+#if defined(QT_HAVE_PPOLL)
+    return ::ppoll(fds, nfds, timeout_ts, Q_NULLPTR);
+#elif defined(QT_HAVE_POLL)
+    return ::poll(fds, nfds, timespecToMillisecs(timeout_ts));
+#else
+    return qt_poll(fds, nfds, timeout_ts);
+#endif
+}
+
 
-    const int ret = qt_select_msecs(nfds, fdread, fdwrite, timeout);
+/*!
+    \internal
 
-    for (int a = 0; a < socketNotifiers.count(); ++a) {
-        if (socketNotifiersEnabled.at(a) == true)
-            socketNotifiers.at(a)->setEnabled(true);
+    Behaves as close to POSIX poll(2) as practical but may be implemented
+    using select(2) where necessary. In that case, returns -1 and sets errno
+    to EINVAL if passed any descriptor greater than or equal to FD_SETSIZE.
+*/
+int qt_safe_poll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout_ts)
+{
+    if (!timeout_ts) {
+        // no timeout -> block forever
+        int ret;
+        EINTR_LOOP(ret, qt_ppoll(fds, nfds, Q_NULLPTR));
+        return ret;
     }
 
-    return ret;
+    timespec start = qt_gettime();
+    timespec timeout = *timeout_ts;
+
+    // loop and recalculate the timeout as needed
+    forever {
+        const int ret = qt_ppoll(fds, nfds, &timeout);
+        if (ret != -1 || errno != EINTR)
+            return ret;
+
+        // recalculate the timeout
+        if (!time_update(&timeout, start, *timeout_ts)) {
+            // timeout during update
+            // or clock reset, fake timeout error
+            return 0;
+        }
+    }
 }
-#endif // Q_OS_BLACKBERRY
 
 QT_END_NAMESPACE