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

TaskTree: Simplify calling storage done handlers on destruction

Browse Source 
Get rid of callStorageDoneHandlers() function which is very
similar to the d'tor's body.
Introduce m_callStorageDoneHandlersOnDestruction flag instead.

Change-Id: Ib9ca3e5fb3e2c5bc7fb8de8f305244bbd5558f4e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-11-05 00:03:13 +01:00
parent c4070da464
commit a0db7c7991
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1056,13 +1056,13 @@ public:
~RuntimeData(); ~RuntimeData();
static QList<int> createStorages(const TaskContainer::ConstData &constData); static QList<int> createStorages(const TaskContainer::ConstData &constData);
void callStorageDoneHandlers();
bool updateSuccessBit(bool success); bool updateSuccessBit(bool success);
int currentLimit() const; int currentLimit() const;
const ConstData &m_constData; const ConstData &m_constData;
const QList<int> m_storageIdList; const QList<int> m_storageIdList;
bool m_successBit = true; bool m_successBit = true;
bool m_callStorageDoneHandlersOnDestruction = false;
int m_doneCount = 0; int m_doneCount = 0;
Guard m_startGuard; Guard m_startGuard;
}; };
@@ -1237,15 +1237,6 @@ QList<int> TaskContainer::RuntimeData::createStorages(const TaskContainer::Const
return storageIdList; return storageIdList;
} }
void TaskContainer::RuntimeData::callStorageDoneHandlers()
{
for (int i = m_constData.m_storageList.size() - 1; i >= 0; --i) { // iterate in reverse order
const TreeStorageBase storage = m_constData.m_storageList[i];
const int storageId = m_storageIdList.value(i);
m_constData.m_taskTreePrivate->callDoneHandler(storage, storageId);
}
}
static bool initialSuccessBit(WorkflowPolicy workflowPolicy) static bool initialSuccessBit(WorkflowPolicy workflowPolicy)
{ {
switch (workflowPolicy) { switch (workflowPolicy) {
@@ -1274,6 +1265,8 @@ TaskContainer::RuntimeData::~RuntimeData()
for (int i = m_constData.m_storageList.size() - 1; i >= 0; --i) { // iterate in reverse order for (int i = m_constData.m_storageList.size() - 1; i >= 0; --i) { // iterate in reverse order
const TreeStorageBase storage = m_constData.m_storageList[i]; const TreeStorageBase storage = m_constData.m_storageList[i];
const int storageId = m_storageIdList.value(i); const int storageId = m_storageIdList.value(i);
if (m_callStorageDoneHandlersOnDestruction)
m_constData.m_taskTreePrivate->callDoneHandler(storage, storageId);
storage.deleteStorage(storageId); storage.deleteStorage(storageId);
} }
} }
@@ -1418,7 +1411,7 @@ bool TaskContainer::invokeDoneHandler(DoneWith result)
const GroupItem::GroupHandler &groupHandler = m_constData.m_groupHandler; const GroupItem::GroupHandler &groupHandler = m_constData.m_groupHandler;
if (groupHandler.m_doneHandler && shouldCall(groupHandler.m_callDoneIf, result)) if (groupHandler.m_doneHandler && shouldCall(groupHandler.m_callDoneIf, result))
success = invokeHandler(this, groupHandler.m_doneHandler, result); success = invokeHandler(this, groupHandler.m_doneHandler, result);
m_runtimeData->callStorageDoneHandlers(); m_runtimeData->m_callStorageDoneHandlersOnDestruction = true;
m_runtimeData.reset(); m_runtimeData.reset();
return success; return success;
} }