From a73338e1885c8542737920a6353869e2e60222eb Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 23 Sep 2021 18:38:08 +0200 Subject: [PATCH] Debugger: Remove unused shared/backtrace.{h,cpp} Part of that was used in QTC_ASSERT now. Change-Id: I2d5fafa0dacad6bc099a00c080189b3fd3964098 Reviewed-by: Eike Ziller --- src/plugins/debugger/CMakeLists.txt | 1 - src/plugins/debugger/debugger.qbs | 1 - src/plugins/debugger/shared/backtrace.cpp | 81 ----------------------- src/plugins/debugger/shared/backtrace.h | 34 ---------- src/plugins/debugger/shared/shared.pri | 6 +- 5 files changed, 2 insertions(+), 121 deletions(-) delete mode 100644 src/plugins/debugger/shared/backtrace.cpp delete mode 100644 src/plugins/debugger/shared/backtrace.h diff --git a/src/plugins/debugger/CMakeLists.txt b/src/plugins/debugger/CMakeLists.txt index c750945026f..4d7830dcd4f 100644 --- a/src/plugins/debugger/CMakeLists.txt +++ b/src/plugins/debugger/CMakeLists.txt @@ -69,7 +69,6 @@ add_qtc_plugin(Debugger qml/qmlinspectoragent.cpp qml/qmlinspectoragent.h qml/qmlv8debuggerclientconstants.h registerhandler.cpp registerhandler.h - shared/backtrace.cpp shared/backtrace.h shared/cdbsymbolpathlisteditor.cpp shared/cdbsymbolpathlisteditor.h shared/hostutils.cpp shared/hostutils.h shared/peutils.cpp shared/peutils.h diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 56f8adc29e3..0e4143a6e21 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -165,7 +165,6 @@ Project { name: "shared" prefix: "shared/" files: [ - "backtrace.cpp", "backtrace.h", "cdbsymbolpathlisteditor.cpp", "cdbsymbolpathlisteditor.h", "hostutils.cpp", "hostutils.h", diff --git a/src/plugins/debugger/shared/backtrace.cpp b/src/plugins/debugger/shared/backtrace.cpp deleted file mode 100644 index bbd121504fc..00000000000 --- a/src/plugins/debugger/shared/backtrace.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include -#include -#include - -#if defined(Q_OS_LINUX) -#include -#include -#include -#endif - -namespace Debugger { -namespace Internal { - -void dumpBacktrace(int maxdepth) -{ - if (maxdepth == -1) - maxdepth = 200; -#if defined(Q_OS_LINUX) - void *bt[200] = {nullptr}; - qDebug() << "BACKTRACE:"; - int size = backtrace(bt, sizeof(bt) / sizeof(bt[0])); - for (int i = 0; i < qMin(size, maxdepth); i++) - qDebug() << "0x" + QByteArray::number(quintptr(bt[i]), 16); - QProcess proc; - QStringList args; - args.append("-e"); - args.append(QCoreApplication::arguments().at(0)); - proc.start("addr2line", args); - proc.waitForStarted(); - for (int i = 0; i < qMin(size, maxdepth); i++) - proc.write("0x" + QByteArray::number(quintptr(bt[i]), 16) + '\n'); - proc.closeWriteChannel(); - proc.waitForFinished(); - QByteArray out = proc.readAllStandardOutput(); - qDebug() << QCoreApplication::arguments().at(0); - qDebug() << out; -#endif -} - -/* -void installSignalHandlers() -{ -#if defined(Q_OS_LINUX) - struct sigaction SignalAction; - - SignalAction.sa_sigaction = handler; - sigemptyset(&SignalAction.sa_mask); - SignalAction.sa_flags = SA_SIGINFO; - sigaction(SIGSEGV, &SignalAction, NULL); - sigaction(SIGABRT, &SignalAction, NULL); -#endif -} -*/ - -} // namespace Internal -} // namespace Debugger diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h deleted file mode 100644 index ea4ec142eb7..00000000000 --- a/src/plugins/debugger/shared/backtrace.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -namespace Debugger { -namespace Internal { - -void dumpBacktrace(int maxdepth = -1); - -} // namespace Internal -} // namespace Debugger diff --git a/src/plugins/debugger/shared/shared.pri b/src/plugins/debugger/shared/shared.pri index 074e22cd17e..6e78916a024 100644 --- a/src/plugins/debugger/shared/shared.pri +++ b/src/plugins/debugger/shared/shared.pri @@ -1,11 +1,9 @@ -SOURCES += $$PWD/backtrace.cpp \ - $$PWD/cdbsymbolpathlisteditor.cpp \ +SOURCES += $$PWD/cdbsymbolpathlisteditor.cpp \ $$PWD/hostutils.cpp \ $$PWD/peutils.cpp \ shared/symbolpathsdialog.cpp -HEADERS += $$PWD/backtrace.h \ - $$PWD/cdbsymbolpathlisteditor.h \ +HEADERS += $$PWD/cdbsymbolpathlisteditor.h \ $$PWD/hostutils.h \ $$PWD/peutils.h \ shared/symbolpathsdialog.h