AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Q_LIKELY instead of doing an #ifdef for GCC

Browse Source 
This code predated the Q_LIKELY macro. Now that we have it, use the
official macro.

Change-Id: I0e43609f8d6827f8fef7b928655a965cba579b8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Thiago Macieira 2012-08-10 11:51:42 +02:00 committed by Qt by Nokia
parent 478c21239a
commit 276f7ee4ad
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/tools/qelapsedtimer_unix.cpp
View File

@ -62,18 +62,13 @@ static int monotonicClockChecked = false;
static int monotonicClockAvailable = false; static int monotonicClockAvailable = false;
#endif #endif
#ifdef Q_CC_GNU
# define is_likely(x) __builtin_expect((x), 1)
#else
# define is_likely(x) (x)
#endif
#define load_acquire(x) ((volatile const int&)(x)) #define load_acquire(x) ((volatile const int&)(x))
#define store_release(x,v) ((volatile int&)(x) = (v)) #define store_release(x,v) ((volatile int&)(x) = (v))
static void unixCheckClockType() static void unixCheckClockType()
{ {
#if (_POSIX_MONOTONIC_CLOCK-0 == 0) #if (_POSIX_MONOTONIC_CLOCK-0 == 0)
if (is_likely(load_acquire(monotonicClockChecked))) if (Q_LIKELY(load_acquire(monotonicClockChecked)))
return; return;
# if defined(_SC_MONOTONIC_CLOCK) # if defined(_SC_MONOTONIC_CLOCK)
@ -118,7 +113,7 @@ static inline void do_gettime(qint64 *sec, qint64 *frac)
{ {
#if (_POSIX_MONOTONIC_CLOCK-0 >= 0) #if (_POSIX_MONOTONIC_CLOCK-0 >= 0)
unixCheckClockType(); unixCheckClockType();
if (is_likely(monotonicClockAvailable)) { if (Q_LIKELY(monotonicClockAvailable)) {
timespec ts; timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
*sec = ts.tv_sec; *sec = ts.tv_sec;