Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
2385e15b
Commit
2385e15b
authored
Jul 08, 2010
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugger: merge 'AdapterStarting' into 'EngineStarting' state
parent
76e85abf
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
6 additions
and
26 deletions
+6
-26
src/plugins/debugger/debuggerconstants.h
src/plugins/debugger/debuggerconstants.h
+1
-2
src/plugins/debugger/debuggerengine.cpp
src/plugins/debugger/debuggerengine.cpp
+0
-5
src/plugins/debugger/gdb/attachgdbadapter.cpp
src/plugins/debugger/gdb/attachgdbadapter.cpp
+0
-1
src/plugins/debugger/gdb/coregdbadapter.cpp
src/plugins/debugger/gdb/coregdbadapter.cpp
+0
-1
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/gdbengine.cpp
+2
-5
src/plugins/debugger/gdb/localplaingdbadapter.cpp
src/plugins/debugger/gdb/localplaingdbadapter.cpp
+0
-1
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+0
-1
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
+0
-1
src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
+1
-2
src/plugins/debugger/gdb/termgdbadapter.cpp
src/plugins/debugger/gdb/termgdbadapter.cpp
+2
-3
src/plugins/debugger/gdb/trkgdbadapter.cpp
src/plugins/debugger/gdb/trkgdbadapter.cpp
+0
-1
src/plugins/debugger/pdb/pdbengine.cpp
src/plugins/debugger/pdb/pdbengine.cpp
+0
-1
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlengine.cpp
+0
-1
src/plugins/debugger/script/scriptengine.cpp
src/plugins/debugger/script/scriptengine.cpp
+0
-1
No files found.
src/plugins/debugger/debuggerconstants.h
View file @
2385e15b
...
...
@@ -80,10 +80,9 @@ enum DebuggerState
DebuggerNotReady
,
// Debugger not started
EngineStarting
,
// Engine starts
AdapterStarting
,
EngineStarted
,
EngineStartFailed
,
InferiorUnrunnable
,
// Used in the core dump adapter
InferiorStarting
,
// InferiorStarted, // Use InferiorRunningRequested or InferiorStopped
...
...
src/plugins/debugger/debuggerengine.cpp
View file @
2385e15b
...
...
@@ -144,7 +144,6 @@ const char *DebuggerEngine::stateName(int s)
switch
(
s
)
{
SN
(
DebuggerNotReady
)
SN
(
EngineStarting
)
SN
(
AdapterStarting
)
SN
(
EngineStarted
)
SN
(
EngineStartFailed
)
SN
(
InferiorStarting
)
...
...
@@ -909,9 +908,6 @@ static bool isAllowedTransition(int from, int to)
return
to
==
EngineStarting
||
to
==
DebuggerNotReady
;
case
EngineStarting
:
return
to
==
AdapterStarting
||
to
==
DebuggerNotReady
;
case
AdapterStarting
:
return
to
==
EngineStarted
||
to
==
EngineStartFailed
;
case
EngineStarted
:
return
to
==
InferiorStarting
||
to
==
EngineShuttingDown
;
...
...
@@ -996,7 +992,6 @@ bool DebuggerEngine::debuggerActionsEnabled(DebuggerState state)
return
true
;
case
DebuggerNotReady
:
case
EngineStarting
:
case
AdapterStarting
:
case
EngineStarted
:
case
EngineStartFailed
:
case
InferiorStartFailed
:
...
...
src/plugins/debugger/gdb/attachgdbadapter.cpp
View file @
2385e15b
...
...
@@ -57,7 +57,6 @@ AttachGdbAdapter::AttachGdbAdapter(GdbEngine *engine, QObject *parent)
void
AttachGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
if
(
!
m_engine
->
startGdb
())
...
...
src/plugins/debugger/gdb/coregdbadapter.cpp
View file @
2385e15b
...
...
@@ -60,7 +60,6 @@ CoreGdbAdapter::CoreGdbAdapter(GdbEngine *engine, QObject *parent)
void
CoreGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
if
(
!
m_engine
->
startGdb
())
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
2385e15b
...
...
@@ -122,7 +122,6 @@ QByteArray GdbEngine::tooltipIName(const QString &exp)
static
bool
stateAcceptsGdbCommands
(
DebuggerState
state
)
{
switch
(
state
)
{
case
AdapterStarting
:
case
EngineStarted
:
case
EngineStartFailed
:
case
InferiorUnrunnable
:
...
...
@@ -142,7 +141,7 @@ static bool stateAcceptsGdbCommands(DebuggerState state)
case
EngineStarting
:
case
InferiorStopFailed
:
case
EngineShuttingDown
:
break
;
return
false
;
}
return
false
;
}
...
...
@@ -1629,13 +1628,12 @@ void GdbEngine::shutdown()
}
switch
(
state
())
{
case
DebuggerNotReady
:
// Nothing to do! :)
case
EngineStarting
:
// We can't get here, really
case
InferiorShuttingDown
:
// Will auto-trigger further shutdown steps
case
EngineShuttingDown
:
// Do not disturb! :)
case
InferiorRunningRequested_Kill
:
case
InferiorStopping_Kill
:
break
;
case
Adapter
Starting
:
// GDB is up, adapter is "doing something"
case
Engine
Starting
:
// GDB is up, adapter is "doing something"
setState
(
EngineStartFailed
);
m_gdbAdapter
->
shutdown
();
// fall-through
...
...
@@ -3085,7 +3083,6 @@ void GdbEngine::activateSnapshot2()
// Otherwise the stack data might be stale.
// See http://sourceware.org/bugzilla/show_bug.cgi?id=1124.
setState
(
EngineStarting
);
setState
(
AdapterStarting
);
postCommand
(
"set stack-cache off"
);
handleAdapterStarted
();
}
...
...
src/plugins/debugger/gdb/localplaingdbadapter.cpp
View file @
2385e15b
...
...
@@ -69,7 +69,6 @@ AbstractGdbAdapter::DumperHandling LocalPlainGdbAdapter::dumperHandling() const
void
LocalPlainGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
QStringList
gdbArgs
;
...
...
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View file @
2385e15b
...
...
@@ -85,7 +85,6 @@ AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() cons
void
RemoteGdbServerAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
// FIXME: make asynchroneous
...
...
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
View file @
2385e15b
...
...
@@ -47,7 +47,6 @@ RemotePlainGdbAdapter::RemotePlainGdbAdapter(GdbEngine *engine,
void
RemotePlainGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
QLatin1String
(
"TRYING TO START ADAPTER"
));
if
(
!
startParameters
().
workingDirectory
.
isEmpty
())
...
...
src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
View file @
2385e15b
...
...
@@ -330,7 +330,7 @@ void TcfTrkGdbAdapter::startGdb()
void
TcfTrkGdbAdapter
::
tcftrkDeviceError
(
const
QString
&
errorString
)
{
logMessage
(
errorString
);
if
(
state
()
==
Adapter
Starting
)
{
if
(
state
()
==
Engine
Starting
)
{
emit
adapterStartFailed
(
errorString
,
QString
());
}
else
{
emit
adapterCrashed
(
errorString
);
...
...
@@ -949,7 +949,6 @@ void TcfTrkGdbAdapter::startAdapter()
m_symbolFile
.
replace
(
QLatin1Char
(
'\\'
),
QLatin1Char
(
'/'
));
// Start
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
logMessage
(
QLatin1String
(
"### Starting TcfTrkGdbAdapter"
));
...
...
src/plugins/debugger/gdb/termgdbadapter.cpp
View file @
2385e15b
...
...
@@ -82,7 +82,6 @@ AbstractGdbAdapter::DumperHandling TermGdbAdapter::dumperHandling() const
void
TermGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
// Currently, adapters are not re-used
...
...
@@ -112,7 +111,7 @@ void TermGdbAdapter::startAdapter()
void
TermGdbAdapter
::
handleInferiorStarted
()
{
QTC_ASSERT
(
state
()
==
Adapter
Starting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
Engine
Starting
,
qDebug
()
<<
state
());
emit
adapterStarted
();
}
...
...
@@ -173,7 +172,7 @@ void TermGdbAdapter::stubMessage(const QString &msg, bool)
void
TermGdbAdapter
::
stubExited
()
{
showMessage
(
_
(
"STUB EXITED"
));
if
(
state
()
!=
Adapter
Starting
// From previous instance
if
(
state
()
!=
Engine
Starting
// From previous instance
&&
state
()
!=
EngineShuttingDown
&&
state
()
!=
DebuggerNotReady
)
emit
adapterCrashed
(
QString
());
}
...
...
src/plugins/debugger/gdb/trkgdbadapter.cpp
View file @
2385e15b
...
...
@@ -1502,7 +1502,6 @@ void TrkGdbAdapter::startAdapter()
m_symbolFile
.
replace
(
QLatin1Char
(
'\\'
),
QLatin1Char
(
'/'
));
// Start
QTC_ASSERT
(
state
()
==
EngineStarting
,
qDebug
()
<<
state
());
setState
(
AdapterStarting
);
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
logMessage
(
QLatin1String
(
"### Starting TrkGdbAdapter"
));
...
...
src/plugins/debugger/pdb/pdbengine.cpp
View file @
2385e15b
...
...
@@ -141,7 +141,6 @@ void PdbEngine::exitDebugger()
void
PdbEngine
::
startDebugger
()
{
setState
(
EngineStarting
);
setState
(
AdapterStarting
);
m_scriptFileName
=
QFileInfo
(
startParameters
().
executable
).
absoluteFilePath
();
QFile
scriptFile
(
m_scriptFileName
);
...
...
src/plugins/debugger/qml/qmlengine.cpp
View file @
2385e15b
...
...
@@ -249,7 +249,6 @@ void QmlEngine::startDebugger()
connect
(
&
m_proc
,
SIGNAL
(
readyReadStandardError
()),
SLOT
(
readProcStandardError
()));
setState
(
AdapterStarting
);
m_proc
.
setEnvironment
(
env
.
toStringList
());
m_proc
.
setWorkingDirectory
(
sp
.
workingDirectory
);
m_proc
.
start
(
sp
.
executable
,
sp
.
processArgs
);
...
...
src/plugins/debugger/script/scriptengine.cpp
View file @
2385e15b
...
...
@@ -234,7 +234,6 @@ void ScriptEngine::startDebugger()
showMessage
(
_
(
"STARTING SCRIPT DEBUGGER"
),
LogMisc
);
QTC_ASSERT
(
state
()
==
DebuggerNotReady
,
setState
(
DebuggerNotReady
));
setState
(
EngineStarting
);
setState
(
AdapterStarting
);
if
(
m_scriptEngine
.
isNull
())
m_scriptEngine
=
Core
::
ICore
::
instance
()
->
scriptManager
()
->
scriptEngine
();
if
(
!
m_scriptAgent
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment