feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TaskTree: Use QMutex consistently

Browse Source 
There is no noticeable difference between using QMutex vs std::mutex
in release build.

It looks like std::mutex is about 15% faster than QMutex in debug
build, but that's not relevant.

Get rid of #include <atomic>.

Change-Id: Iae67d5028c5ae3cb412e50d629bfc09b38417dfc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-01-02 19:06:41 +01:00
parent 7c246f025c
commit e826e3ad7e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/solutions/tasking/tasktree.cpp
View File

@@ -13,8 +13,6 @@
#include <QSet> #include <QSet>
#include <QTimer> #include <QTimer>
#include <atomic>
using namespace std::chrono; using namespace std::chrono;
namespace Tasking { namespace Tasking {
@@ -1244,14 +1242,14 @@ class LoopData
{ {
public: public:
LoopThreadData &threadData() { LoopThreadData &threadData() {
const std::lock_guard lock(m_threadDataMutex); QMutexLocker lock(&m_threadDataMutex);
return m_threadDataMap.try_emplace(QThread::currentThread()).first->second; return m_threadDataMap.try_emplace(QThread::currentThread()).first->second;
} }
const std::optional<int> m_loopCount = {}; const std::optional<int> m_loopCount = {};
const Loop::ValueGetter m_valueGetter = {}; const Loop::ValueGetter m_valueGetter = {};
const Loop::Condition m_condition = {}; const Loop::Condition m_condition = {};
std::mutex m_threadDataMutex = {}; QMutex m_threadDataMutex = {};
// Use std::map on purpose, so that it doesn't invalidate references on modifications. // Use std::map on purpose, so that it doesn't invalidate references on modifications.
// Don't optimize it by using std::unordered_map. // Don't optimize it by using std::unordered_map.
std::map<QThread *, LoopThreadData> m_threadDataMap = {}; std::map<QThread *, LoopThreadData> m_threadDataMap = {};