An error occurred while loading the file. Please try again.
-
Roland Winklmeier authored
QTestEventLoop::exitLoop() is used by QSignalSpy to stop event processing when the connected signal has been received. The design of QSignalSpy requires QTestEventLoop::exitLoop() to be thread-safe, which it wasn't. When QSignalSpy is connected to a signal in a different thread, exitLoop() was called from the thread which emitted the signal and not the one in which QTestEventLoop is running. This caused troubles when killing the internal timer. This patch adds a check in the beginning of exitLoop(). If it is called from a different thread, it will post an event into the message queue in which QTestEventLoop is running and execute it there. Change-Id: Icb8c8ff2f5344800ee6c6125b98c677c7a196c32 Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
a8df9982
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtTest module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QTESTEVENTLOOP_H
#define QTESTEVENTLOOP_H
#include <QtTest/qtest_global.h>
#include <QtCore/qcoreapplication.h>
#include <QtCore/qeventloop.h>
#include <QtCore/qobject.h>
#include <QtCore/qpointer.h>
#include <QtCore/qthread.h>
QT_BEGIN_NAMESPACE
class Q_TESTLIB_EXPORT QTestEventLoop : public QObject
{
Q_OBJECT
public:
inline QTestEventLoop(QObject *aParent = 0)
: QObject(aParent), inLoop(false), _timeout(false), timerId(-1), loop(0) {}
inline void enterLoopMSecs(int ms);
inline void enterLoop(int secs) { enterLoopMSecs(secs * 1000); }
inline void changeInterval(int secs)
{ killTimer(timerId); timerId = startTimer(secs * 1000); }
inline bool timeout() const
{ return _timeout; }
inline static QTestEventLoop &instance()
{
static QPointer<QTestEventLoop> testLoop;
if (testLoop.isNull())
testLoop = new QTestEventLoop(QCoreApplication::instance());
return *static_cast<QTestEventLoop *>(testLoop);
7172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132
}
public Q_SLOTS:
inline void exitLoop();
protected:
inline void timerEvent(QTimerEvent *e);
private:
bool inLoop;
bool _timeout;
int timerId;
QEventLoop *loop;
};
inline void QTestEventLoop::enterLoopMSecs(int ms)
{
Q_ASSERT(!loop);
QEventLoop l;
inLoop = true;
_timeout = false;
timerId = startTimer(ms);
loop = &l;
l.exec();
loop = 0;
}
inline void QTestEventLoop::exitLoop()
{
if (thread() != QThread::currentThread())
{
QMetaObject::invokeMethod(this, "exitLoop", Qt::QueuedConnection);
return;
}
if (timerId != -1)
killTimer(timerId);
timerId = -1;
if (loop)
loop->exit();
inLoop = false;
}
inline void QTestEventLoop::timerEvent(QTimerEvent *e)
{
if (e->timerId() != timerId)
return;
_timeout = true;
exitLoop();
}
QT_END_NAMESPACE
#endif