1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the creation of QElapsedTimer out of the inner function in QMutex

Browse Source 
Makes it possible for QElapsedTimer to be non-POD.

Change-Id: I5ffc59c7a93c187a4a814e6959f8383fa8d4cc44
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
This commit is contained in:
Thiago Macieira 2013-08-23 13:01:18 -07:00 committed by The Qt Project
parent a7ba0ad93e
commit 77e8ff66f0
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/corelib/thread/qmutex_linux.cpp
View File

@ -54,21 +54,6 @@
#include <errno.h> #include <errno.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
// C++11 mode
# include <type_traits>
static void checkElapsedTimerIsTrivial()
{
Q_STATIC_ASSERT(std::has_trivial_default_constructor<QT_PREPEND_NAMESPACE(QElapsedTimer)>::value);
}
#else
static void checkElapsedTimerIsTrivial()
{
}
#endif
#ifndef QT_LINUX_FUTEX #ifndef QT_LINUX_FUTEX
# error "Qt build is broken: qmutex_linux.cpp is being built but futex support is not wanted" # error "Qt build is broken: qmutex_linux.cpp is being built but futex support is not wanted"
#endif #endif
@ -175,7 +160,7 @@ static inline QMutexData *dummyFutexValue()
} }
template <bool IsTimed> static inline template <bool IsTimed> static inline
bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -1) Q_DECL_NOTHROW bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -1, QElapsedTimer *elapsedTimer = 0) Q_DECL_NOTHROW
{ {
if (!IsTimed) if (!IsTimed)
timeout = -1; timeout = -1;
@ -185,12 +170,9 @@ bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -
return false; return false;
struct timespec ts, *pts = 0; struct timespec ts, *pts = 0;
QElapsedTimer elapsedTimer;
checkElapsedTimerIsTrivial();
if (IsTimed && timeout > 0) { if (IsTimed && timeout > 0) {
ts.tv_sec = timeout / 1000; ts.tv_sec = timeout / 1000;
ts.tv_nsec = (timeout % 1000) * 1000 * 1000; ts.tv_nsec = (timeout % 1000) * 1000 * 1000;
elapsedTimer.start();
} }
// the mutex is locked already, set a bit indicating we're waiting // the mutex is locked already, set a bit indicating we're waiting
@ -198,7 +180,7 @@ bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -
if (IsTimed && pts == &ts) { if (IsTimed && pts == &ts) {
// recalculate the timeout // recalculate the timeout
qint64 xtimeout = qint64(timeout) * 1000 * 1000; qint64 xtimeout = qint64(timeout) * 1000 * 1000;
xtimeout -= elapsedTimer.nsecsElapsed(); xtimeout -= elapsedTimer->nsecsElapsed();
if (xtimeout <= 0) { if (xtimeout <= 0) {
// timer expired after we returned // timer expired after we returned
return false; return false;
@ -232,7 +214,9 @@ void QBasicMutex::lockInternal() Q_DECL_NOTHROW
bool QBasicMutex::lockInternal(int timeout) Q_DECL_NOTHROW bool QBasicMutex::lockInternal(int timeout) Q_DECL_NOTHROW
{ {
Q_ASSERT(!isRecursive()); Q_ASSERT(!isRecursive());
return lockInternal_helper<true>(d_ptr, timeout); QElapsedTimer elapsedTimer;
elapsedTimer.start();
return lockInternal_helper<true>(d_ptr, timeout, &elapsedTimer);
} }
void QBasicMutex::unlockInternal() Q_DECL_NOTHROW void QBasicMutex::unlockInternal() Q_DECL_NOTHROW