From cf059ac9ece88a70eb4f582f3f9cf80186cc69a1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 22 Feb 2023 18:34:14 -0800 Subject: [PATCH] QThread/Unix: move qt_nanosleep to qthread_unix.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's the only place that uses it. Pick-to: 6.5 Change-Id: Ieec322d73c1e40ad95c8fffd17465370ac209c2f Reviewed-by: Tor Arne Vestbø Reviewed-by: Ahmad Samir --- src/corelib/kernel/qcore_unix_p.h | 1 - src/corelib/kernel/qelapsedtimer_unix.cpp | 14 -------------- src/corelib/thread/qthread_unix.cpp | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 0705ee3bcd3..c02910b8794 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -373,7 +373,6 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options) // in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp timespec qt_gettime() noexcept; -void qt_nanosleep(timespec amount); QByteArray qt_readlink(const char *path); /* non-static */ diff --git a/src/corelib/kernel/qelapsedtimer_unix.cpp b/src/corelib/kernel/qelapsedtimer_unix.cpp index 9f2d75d0b8d..f11ebc00a4e 100644 --- a/src/corelib/kernel/qelapsedtimer_unix.cpp +++ b/src/corelib/kernel/qelapsedtimer_unix.cpp @@ -139,20 +139,6 @@ struct timespec qt_gettime() noexcept return tv; } -void qt_nanosleep(timespec amount) -{ - // We'd like to use clock_nanosleep. - // - // But clock_nanosleep is from POSIX.1-2001 and both are *not* - // affected by clock changes when using relative sleeps, even for - // CLOCK_REALTIME. - // - // nanosleep is POSIX.1-1993 - - int r; - EINTR_LOOP(r, nanosleep(&amount, &amount)); -} - static qint64 elapsedAndRestart(qint64 sec, qint64 frac, qint64 *nowsec, qint64 *nowfrac) { diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 0bf7c9e27f8..b569da53f12 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -491,6 +491,20 @@ void QThread::yieldCurrentThread() #endif // QT_CONFIG(thread) +static void qt_nanosleep(timespec amount) +{ + // We'd like to use clock_nanosleep. + // + // But clock_nanosleep is from POSIX.1-2001 and both are *not* + // affected by clock changes when using relative sleeps, even for + // CLOCK_REALTIME. + // + // nanosleep is POSIX.1-1993 + + int r; + EINTR_LOOP(r, nanosleep(&amount, &amount)); +} + void QThread::sleep(unsigned long secs) { qt_nanosleep(durationToTimespec(std::chrono::seconds{secs}));