forked from qt-creator/qt-creator
3b5ecac238
This is a step towards properly supporting multiple debugger
sessions side-by-side.
The combined C++-and-QML engine has been removed, instead a
combined setup creates now two individual engines, under a single
DebuggerRunTool but mostly independent with no combined state
machine. This requires a few more clicks in some cases, but
makes it easier to direct e.g. interrupt requests to the
interesting engine.
Care has been taken to not change the UX of the single debugger
session use case if possible. The fat debug button operates
as-before in that case, i.e. switches to Interrupt if the
single active runconfiguration runs in the debugger etc.
Most views are made per-engine, running an engine creates
a new Perspective, which is destroyed when the run control dies.
The snapshot view remains global and becomes primary source
of information on a "current engine" that receives all menu
and otherwise global input.
There is a new global "Breakpoint Preset" view containing
all "static" breakpoint data. When an engine starts up it
"claims" breakpoint it believes it can handle, but operates
on a copy of the static data. The markers of the static
version are suppressed as long as an engine controls a
breakpoint (that inclusive all resolved locations), but are
re-instatet once the engine quits.
The old Breakpoint class that already contained this split
per-instance was split into a new Breakpoint and a
GlobalBreakpoint class, with a per-engine model for Breakpoints,
and a singleton model containing GlobalBreakpoints.
There is a new CppDebuggerEngine intermediate level serving as
base for C++ (or, rather, "compiled") binary debugging, i.e.
{Gdb,Lldb,Cdb}Engine, taking over bits of the current DebuggerEngine
base that are not applicable to non-binary debuggers.
Change-Id: I9994f4c188379b4aee0c4f379edd4759fbb0bd43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
95 lines
2.6 KiB
C++
95 lines
2.6 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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
|
|
|
|
#include <QCoreApplication>
|
|
#include <QSocketNotifier>
|
|
|
|
#include <projectexplorer/runconfiguration.h>
|
|
|
|
#include <utils/consoleprocess.h>
|
|
|
|
namespace Debugger {
|
|
|
|
class DebuggerRunTool;
|
|
|
|
namespace Internal {
|
|
|
|
class Terminal : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
Terminal(QObject *parent = nullptr);
|
|
|
|
void setup();
|
|
bool isUsable() const;
|
|
|
|
QByteArray slaveDevice() const { return m_slaveName; }
|
|
|
|
int write(const QByteArray &msg);
|
|
bool sendInterrupt();
|
|
|
|
signals:
|
|
void stdOutReady(const QString &);
|
|
void stdErrReady(const QString &);
|
|
void error(const QString &);
|
|
|
|
private:
|
|
void onSlaveReaderActivated(int fd);
|
|
|
|
bool m_isUsable = false;
|
|
int m_masterFd = -1;
|
|
QSocketNotifier *m_masterReader = nullptr;
|
|
QByteArray m_slaveName;
|
|
};
|
|
|
|
|
|
class TerminalRunner : public ProjectExplorer::RunWorker
|
|
{
|
|
public:
|
|
TerminalRunner(ProjectExplorer::RunControl *runControl,
|
|
const ProjectExplorer::Runnable &stubRunnable);
|
|
|
|
qint64 applicationPid() const { return m_applicationPid; }
|
|
qint64 applicationMainThreadId() const { return m_applicationMainThreadId; }
|
|
|
|
private:
|
|
void start() final;
|
|
void stop() final;
|
|
|
|
void stubStarted();
|
|
void stubError(const QString &msg);
|
|
|
|
Utils::ConsoleProcess m_stubProc;
|
|
ProjectExplorer::Runnable m_stubRunnable;
|
|
qint64 m_applicationPid = 0;
|
|
qint64 m_applicationMainThreadId = 0;
|
|
};
|
|
|
|
} // namespace Internal
|
|
} // namespace Debugger
|