Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace _POSIX_MONOTONIC_CLOCK definition with QElapsedTimer::isMonotonic() result checks

Browse source 
in addition to the compile-time check, QElapsedTimer::isMonotonic() does
runtime check via sysconf() and is guarded by QT_NO_CLOCK_MONOTONIC option
definition check

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-12 16:04:25 +00:00
parent 19650be3c5
commit 7577d86088
2 changed files with 13 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/kernel/qcore_unix_p.h
View file

@ -292,10 +292,6 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options)
return ret; return ret;
} }
#if !defined(_POSIX_MONOTONIC_CLOCK)
# define _POSIX_MONOTONIC_CLOCK -1
#endif
timeval qt_gettime(); // in qelapsedtimer_unix.cpp timeval qt_gettime(); // in qelapsedtimer_unix.cpp
Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,

40
src/core/kernel/qeventdispatcher_unix.cpp
View file

@ -45,10 +45,7 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/times.h>
#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED)
# include <sys/times.h>
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -83,9 +80,7 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate()
QEventDispatcherUNIXPrivate::~QEventDispatcherUNIXPrivate() QEventDispatcherUNIXPrivate::~QEventDispatcherUNIXPrivate()
{ {
#if defined(Q_OS_NACL) #ifndef Q_OS_NACL
// do nothing.
#else
// cleanup the common parts of the event loop // cleanup the common parts of the event loop
close(thread_pipe[0]); close(thread_pipe[0]);
close(thread_pipe[1]); close(thread_pipe[1]);
@ -238,8 +233,14 @@ int QEventDispatcherUNIXPrivate::processThreadWakeUp(int nsel)
QTimerInfoList::QTimerInfoList() QTimerInfoList::QTimerInfoList()
{ {
#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_NACL) #ifndef Q_OS_NACL
if (!QElapsedTimer::isMonotonic()) { if (Q_LIKELY(QElapsedTimer::isMonotonic())) {
// detected monotonic timers
previousTime.tv_sec = previousTime.tv_usec = 0;
previousTicks = 0;
ticksPerSecond = 0;
msPerTick = 0;
} else {
// not using monotonic timers, initialize the timeChanged() machinery // not using monotonic timers, initialize the timeChanged() machinery
previousTime = qt_gettime(); previousTime = qt_gettime();
@ -248,12 +249,6 @@ QTimerInfoList::QTimerInfoList()
ticksPerSecond = sysconf(_SC_CLK_TCK); ticksPerSecond = sysconf(_SC_CLK_TCK);
msPerTick = 1000/ticksPerSecond; msPerTick = 1000/ticksPerSecond;
} else {
// detected monotonic timers
previousTime.tv_sec = previousTime.tv_usec = 0;
previousTicks = 0;
ticksPerSecond = 0;
msPerTick = 0;
} }
#endif #endif
@ -265,8 +260,6 @@ timeval QTimerInfoList::updateCurrentTime()
return (currentTime = qt_gettime()); return (currentTime = qt_gettime());
} }
#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED)
timeval qAbsTimeval(const timeval &t) timeval qAbsTimeval(const timeval &t)
{ {
timeval tmp = t; timeval tmp = t;
@ -292,7 +285,7 @@ bool QTimerInfoList::timeChanged(timeval *delta)
#ifdef Q_OS_NACL #ifdef Q_OS_NACL
Q_UNUSED(delta) Q_UNUSED(delta)
return false; // Calling "times" crashes. return false; // Calling "times" crashes.
#endif #else
struct tms unused; struct tms unused;
clock_t currentTicks = times(&unused); clock_t currentTicks = times(&unused);
@ -317,25 +310,18 @@ bool QTimerInfoList::timeChanged(timeval *delta)
tickGranularity.tv_sec = 0; tickGranularity.tv_sec = 0;
tickGranularity.tv_usec = msPerTick * 1000; tickGranularity.tv_usec = msPerTick * 1000;
return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10);
#endif // Q_OS_NACL
} }
void QTimerInfoList::repairTimersIfNeeded() void QTimerInfoList::repairTimersIfNeeded()
{ {
if (QElapsedTimer::isMonotonic()) if (Q_LIKELY(QElapsedTimer::isMonotonic()))
return; return;
timeval delta; timeval delta;
if (timeChanged(&delta)) if (timeChanged(&delta))
timerRepair(delta); timerRepair(delta);
} }
#else // !(_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(QT_BOOTSTRAPPED)
void QTimerInfoList::repairTimersIfNeeded()
{
}
#endif
/* /*
insert timer info into list insert timer info into list
*/ */