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

Debugger: Use Barrier for debugServerRecipe

Browse Source 
In order to enable start of further tasks in the recipe.

Change-Id: Id2011214d8c4bb8c99df2048f46b5bf73b3024f6
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-03-10 15:29:36 +01:00
parent d614e1aa85
commit 61dd3f520e
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -100,7 +100,7 @@ public:
ExecutableItem coreFileRecipe(); ExecutableItem coreFileRecipe();
ExecutableItem terminalRecipe(const SingleBarrier &barrier); ExecutableItem terminalRecipe(const SingleBarrier &barrier);
ExecutableItem fixupParamsRecipe(); ExecutableItem fixupParamsRecipe();
ExecutableItem debugServerRecipe(); ExecutableItem debugServerRecipe(const SingleBarrier &barrier);
int snapshotCounter = 0; int snapshotCounter = 0;
// int engineStartsNeeded = 0; // int engineStartsNeeded = 0;
@@ -122,15 +122,21 @@ void DebuggerRunTool::start()
{ {
d->m_glue.reset(new GlueInterface); d->m_glue.reset(new GlueInterface);
const auto barrierKicker = [this](const SingleBarrier &barrier) { const auto terminalKicker = [this](const SingleBarrier &barrier) {
return d->terminalRecipe(barrier); return d->terminalRecipe(barrier);
}; };
const auto debugServerKicker = [this](const SingleBarrier &barrier) {
return d->debugServerRecipe(barrier);
};
const Group recipe { const Group recipe {
d->coreFileRecipe(), d->coreFileRecipe(),
When (barrierKicker) >> Do { When (terminalKicker) >> Do {
d->fixupParamsRecipe(), d->fixupParamsRecipe(),
d->debugServerRecipe() When (debugServerKicker) >> Do {
Sync([this] { continueAfterDebugServerStart(); })
}
} }
}; };
d->m_taskTreeRunner.start(recipe); d->m_taskTreeRunner.start(recipe);
@@ -301,13 +307,13 @@ ExecutableItem DebuggerRunToolPrivate::fixupParamsRecipe()
}); });
} }
ExecutableItem DebuggerRunToolPrivate::debugServerRecipe() ExecutableItem DebuggerRunToolPrivate::debugServerRecipe(const SingleBarrier &barrier)
{ {
const auto useDebugServer = [this] { const auto useDebugServer = [this] {
return q->runControl()->usesDebugChannel() && !m_runParameters.skipDebugServer(); return q->runControl()->usesDebugChannel() && !m_runParameters.skipDebugServer();
}; };
const auto onSetup = [this](Process &process) { const auto onSetup = [this, barrier](Process &process) {
process.setUtf8Codec(); process.setUtf8Codec();
CommandLine commandLine = m_runParameters.inferior().command; CommandLine commandLine = m_runParameters.inferior().command;
CommandLine cmd; CommandLine cmd;
@@ -414,8 +420,8 @@ ExecutableItem DebuggerRunToolPrivate::debugServerRecipe()
q->runControl()->postMessage(msg, StdErrFormat, false); q->runControl()->postMessage(msg, StdErrFormat, false);
}); });
QObject::connect(&process, &Process::started, q, [this] { QObject::connect(&process, &Process::started, q, [barrier = barrier->barrier()] {
q->continueAfterDebugServerStart(); barrier->advance();
}); });
return SetupResult::Continue; return SetupResult::Continue;
@@ -432,7 +438,7 @@ ExecutableItem DebuggerRunToolPrivate::debugServerRecipe()
If (useDebugServer) >> Then { If (useDebugServer) >> Then {
ProcessTask(onSetup, onDone) ProcessTask(onSetup, onDone)
} >> Else { } >> Else {
Sync([this] { q->continueAfterDebugServerStart(); }) Sync([barrier] { barrier->barrier()->advance(); })
} }
}; };
} }