diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-07-12 21:54:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 12:09:42 +0200 |
| commit | 95b6826ed47b0341d21b631712c65f895b4c38e0 (patch) | |
| tree | a2edb998feea258e91952687e1133d1570b6a4b9 /src | |
| parent | f9a17d7f0f02f7af849afdf653a763ffdaf78a1b (diff) | |
statemachine: Make signal transition registration thread-safe
Since Qt's connections are thread-safe, QStateMachine's plumbing
around them should be thread-safe too.
Change-Id: I8ae91c2edc2d32ca4ed4258b71e5da22de30ed91
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/statemachine/qstatemachine_p.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index ec4f3dea4c..72f4a123e6 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1739,6 +1739,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio while (meta->method(signalIndex).attributes() & QMetaMethod::Cloned) --signalIndex; + connectionsMutex.lock(); QVector<int> &connectedSignalIndexes = connections[sender]; if (connectedSignalIndexes.size() <= signalIndex) connectedSignalIndexes.resize(signalIndex+1); @@ -1757,6 +1758,8 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio } } ++connectedSignalIndexes[signalIndex]; + connectionsMutex.unlock(); + QSignalTransitionPrivate::get(transition)->signalIndex = signalIndex; QSignalTransitionPrivate::get(transition)->originalSignalIndex = originalSignalIndex; #ifdef QSTATEMACHINE_DEBUG @@ -1777,6 +1780,8 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit if (!sender || (sender->thread() != q->thread())) return; QSignalTransitionPrivate::get(transition)->signalIndex = -1; + + connectionsMutex.lock(); QVector<int> &connectedSignalIndexes = connections[sender]; Q_ASSERT(connectedSignalIndexes.size() > signalIndex); Q_ASSERT(connectedSignalIndexes.at(signalIndex) != 0); @@ -1790,6 +1795,7 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit if (sum == 0) connections.remove(sender); } + connectionsMutex.unlock(); } void QStateMachinePrivate::unregisterAllTransitions() @@ -1878,7 +1884,11 @@ void QStateMachinePrivate::handleFilteredEvent(QObject *watched, QEvent *event) void QStateMachinePrivate::handleTransitionSignal(QObject *sender, int signalIndex, void **argv) { +#ifndef QT_NO_DEBUG + connectionsMutex.lock(); Q_ASSERT(connections[sender].at(signalIndex) != 0); + connectionsMutex.unlock(); +#endif const QMetaObject *meta = sender->metaObject(); QMetaMethod method = meta->method(signalIndex); QList<QByteArray> parameterTypes = method.parameterTypes(); diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index f3291e7d35..9e1f425779 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -257,6 +257,7 @@ public: QSignalEventGenerator *signalEventGenerator; QHash<const QObject*, QVector<int> > connections; + QMutex connectionsMutex; #ifndef QT_NO_STATEMACHINE_EVENTFILTER QHash<QObject*, QHash<QEvent::Type, int> > qobjectEvents; #endif |