aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2025-12-17 13:50:46 +0000
committerDavid Schulz <david.schulz@qt.io>2025-12-17 14:54:38 +0000
commit11a84f04b42b7b705b0cae6e22028f56ad23d547 (patch)
treed75f19d9ca5dd4071af6f600b6bac50bef493add /src/plugins
parent5794640176de17f54a544028e4fca95fb802eaf1 (diff)
Revert "Debugger: make gdb and lldb auto detection async"HEADmaster
This reverts commit 9b4d217a27ea5d679c8efa3149543b8dfe4a09da. Reason for revert: This causes QTCREATORBUG-33849 as well as issues with the crash dialog blocker on windows. Change-Id: I8a4fa45f7aeeb89d1ba1365c69dd166b06eda9ef Fixes: QTCREATORBUG-33849 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/debugger/debuggeritemmanager.cpp90
1 files changed, 34 insertions, 56 deletions
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index 67009dd517f..d4312e47b6f 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -211,13 +211,14 @@ public:
QVariant registerDebugger(const DebuggerItem &item);
void readDebuggers(const FilePath &fileName, bool isSdk);
void autoDetectCdbDebuggers();
- void autoDetectGdbOrLldbDebuggers(const FilePaths &searchPaths, const QString &detectionSource);
+ void autoDetectGdbOrLldbDebuggers(const FilePaths &searchPaths,
+ const QString &detectionSource,
+ QString *logMessage = nullptr);
void autoDetectUvscDebuggers();
QString uniqueDisplayName(const QString &base);
PersistentSettingsWriter m_writer{userSettingsFileName(), "QtCreatorDebuggers"};
QPersistentModelIndex m_currentIndex;
- QSingleTaskTreeRunner m_detectGdbLldbRunner;
};
static DebuggerItemModel &itemModel()
@@ -635,12 +636,9 @@ static Utils::FilePaths searchGdbPathsFromRegistry()
return searchPaths;
}
-static QList<DebuggerItem> autoDetectGdbOrLldbDebuggersImpl(
- const FilePaths &searchPaths,
- const QString &detectionSourceId,
- const QList<DebuggerItem> &existingDebuggers)
+void DebuggerItemModel::autoDetectGdbOrLldbDebuggers(
+ const FilePaths &searchPaths, const QString &detectionSourceId, QString *logMessage)
{
- QList<DebuggerItem> result;
const DetectionSource detectionSource{DetectionSource::FromSystem, detectionSourceId};
QStringList filters
@@ -667,7 +665,7 @@ static QList<DebuggerItem> autoDetectGdbOrLldbDebuggersImpl(
}
if (searchPaths.isEmpty())
- return result;
+ return;
FilePaths suspects;
@@ -698,23 +696,15 @@ static QList<DebuggerItem> autoDetectGdbOrLldbDebuggersImpl(
for (const FilePath &path : paths)
suspects.append(path.dirEntries({filters, QDir::Files | QDir::Executable}));
- auto findItem = [&](auto predicate) -> DebuggerItem {
- return Utils::findOrDefault(existingDebuggers + result, predicate);
- };
-
+ QStringList logMessages{Tr::tr("Searching debuggers...")};
for (const FilePath &command : std::as_const(suspects)) {
- const auto commandMatches = [command](const DebuggerItem item) {
- return item.command() == command;
+ const auto commandMatches = [command](const DebuggerTreeItem *titem) {
+ return titem->m_item.command() == command;
};
- DebuggerItem existingItem = findItem(commandMatches);
- if (existingItem.isValid()) {
- if (command.lastModified() != existingItem.lastModified()) {
- DebuggerItem updatedItem = existingItem;
- updatedItem.reinitializeFromFile();
- if (updatedItem != existingItem)
- result.append(updatedItem);
- existingItem = updatedItem;
- }
+ if (DebuggerTreeItem *existingTreeItem = findItemAtLevel<2>(commandMatches)) {
+ DebuggerItem &existingItem = existingTreeItem->m_item;
+ if (command.lastModified() != existingItem.lastModified())
+ existingItem.reinitializeFromFile();
if (doEnableNativeDapDebuggers()) {
if (existingItem.engineType() != GdbEngineType)
@@ -727,14 +717,16 @@ static QList<DebuggerItem> autoDetectGdbOrLldbDebuggersImpl(
continue;
// This is the "update" path: there's already a capable GDB in the settings,
// we only need to add a corresponding DAP entry if it's missing.
- const auto commandMatchesAndIsDap = [commandMatches](const DebuggerItem item) {
- return commandMatches(item) && item.engineType() == GdbDapEngineType;
+ const auto commandMatchesAndIsDap = [command, commandMatches](
+ const DebuggerTreeItem *titem) {
+ return commandMatches(titem) && titem->m_item.engineType() == GdbDapEngineType;
};
- DebuggerItem dapItem = findItem(commandMatchesAndIsDap);
- if (dapItem.isValid())
+ const DebuggerTreeItem *existingDapTreeItem = findItemAtLevel<2>(
+ commandMatchesAndIsDap);
+ if (existingDapTreeItem)
continue;
- dapItem = makeAutoDetectedDebuggerItem(
+ const DebuggerItem dapItem = makeAutoDetectedDebuggerItem(
command,
{
.engineType = GdbDapEngineType,
@@ -742,17 +734,23 @@ static QList<DebuggerItem> autoDetectGdbOrLldbDebuggersImpl(
.version = existingItem.version(),
},
detectionSource);
- result.append(dapItem);
+ addDebuggerItem(dapItem);
+ logMessages.append(
+ Tr::tr("Added a surrogate GDB DAP item for existing entry \"%1\".")
+ .arg(command.toUserOutput()));
}
continue;
}
const Result<DebuggerItem> item
= makeAutoDetectedDebuggerItem(command, detectionSource);
- if (!item)
+ if (!item) {
+ logMessages.append(item.error());
continue;
+ }
- result.append(*item);
+ addDebuggerItem(*item);
+ logMessages.append(Tr::tr("Found: \"%1\".").arg(command.toUserOutput()));
if (doEnableNativeDapDebuggers()) {
if (item->engineType() != GdbEngineType)
continue;
@@ -771,33 +769,13 @@ static QList<DebuggerItem> autoDetectGdbOrLldbDebuggersImpl(
.version = item->version(),
},
detectionSource);
- result.append(dapItem);
+ addDebuggerItem(dapItem);
+ logMessages.append(
+ Tr::tr("Added a surrogate GDB DAP item for \"%1\".").arg(command.toUserOutput()));
}
}
-
- return result;
-}
-
-void DebuggerItemModel::autoDetectGdbOrLldbDebuggers(
- const FilePaths &searchPaths, const QString &detectionSourceId)
-{
- auto setupSearch = [searchPaths, detectionSourceId](Async<QList<DebuggerItem>> &async) {
- async.setConcurrentCallData(
- &autoDetectGdbOrLldbDebuggersImpl,
- searchPaths,
- detectionSourceId,
- DebuggerItemManager::debuggers());
- };
-
- auto searchDone = [this](const Async<QList<DebuggerItem>> &async) {
- const QList<DebuggerItem> items = async.result();
- for (const DebuggerItem &item : items) {
- if (item.isValid() && item.engineType() != NoEngineType)
- registerDebugger(item);
- }
- };
-
- m_detectGdbLldbRunner.start({AsyncTask<QList<DebuggerItem>>(setupSearch, searchDone)});
+ if (logMessage)
+ *logMessage = logMessages.join('\n');
}
void DebuggerItemModel::autoDetectUvscDebuggers()
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 17:59:52 +0000