Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
6089bc1b
Commit
6089bc1b
authored
Jul 09, 2010
by
hjk
Browse files
debugger: rename EngineStart to EngineSetup
parent
3fcafefa
Changes
18
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/cdb/cdbengine.cpp
View file @
6089bc1b
...
...
@@ -376,7 +376,7 @@ void CdbEngine::startupChecks()
void
CdbEngine
::
setupEngine
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
const
DebuggerStartParameters
&
sp
=
startParameters
();
if
(
debugCDBExecution
)
qDebug
()
<<
"startDebugger"
;
...
...
@@ -385,14 +385,14 @@ void CdbEngine::setupEngine()
m_d
->
checkVersion
();
if
(
m_d
->
m_hDebuggeeProcess
)
{
warning
(
QLatin1String
(
"Internal error: Attempt to start debugger while another process is being debugged."
));
notifyEngineS
tart
Failed
();
notifyEngineS
etup
Failed
();
return
;
}
switch
(
sp
.
startMode
)
{
case
AttachCore
:
case
AttachToRemote
:
warning
(
QLatin1String
(
"Internal error: Mode not supported."
));
notifyEngineS
tart
Failed
();
notifyEngineS
etup
Failed
();
break
;
default:
break
;
...
...
@@ -421,7 +421,7 @@ void CdbEngine::setupEngine()
}
}
m_d
->
m_dumper
->
reset
(
dumperLibName
,
dumperEnabled
);
notifyEngineS
tart
Ok
();
notifyEngineS
etup
Ok
();
}
void
CdbEngine
::
setupInferior
()
...
...
src/plugins/debugger/debuggerconstants.h
View file @
6089bc1b
...
...
@@ -79,9 +79,9 @@ enum DebuggerState
{
DebuggerNotReady
,
// Debugger not started
EngineSt
ar
ting
,
// Engine starts
EngineS
tart
Failed
,
EngineS
tarted
,
EngineS
e
tting
Up
,
// Engine starts
EngineS
etup
Failed
,
EngineS
etupOk
,
InferiorUnrunnable
,
// Used in the core dump adapter
InferiorSettingUp
,
...
...
src/plugins/debugger/debuggerengine.cpp
View file @
6089bc1b
...
...
@@ -143,9 +143,9 @@ const char *DebuggerEngine::stateName(int s)
# define SN(x) case x: return #x;
switch
(
s
)
{
SN
(
DebuggerNotReady
)
SN
(
EngineSt
ar
ting
)
SN
(
EngineS
tarted
)
SN
(
EngineS
tart
Failed
)
SN
(
EngineS
e
tting
Up
)
SN
(
EngineS
etupOk
)
SN
(
EngineS
etup
Failed
)
SN
(
InferiorSettingUp
)
SN
(
InferiorSetupFailed
)
SN
(
InferiorSetupOk
)
...
...
@@ -228,6 +228,7 @@ public slots:
void
doSetupInferior
();
void
doRunEngine
();
void
doShutdown
();
void
doInterruptInferior
();
public:
DebuggerEngine
*
m_engine
;
// Not owned.
...
...
@@ -372,7 +373,7 @@ void DebuggerEngine::handleCommand(int role, const QVariant &value)
break
;
case
RequestExecInterruptRole
:
i
nterruptInferior
();
d
->
doI
nterruptInferior
();
break
;
case
RequestExecResetRole
:
...
...
@@ -613,12 +614,12 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
void
DebuggerEngine
::
startDebugger
(
DebuggerRunControl
*
runControl
)
{
QTC_ASSERT
(
runControl
,
notifyEngineS
tart
Failed
();
return
);
QTC_ASSERT
(
!
d
->
m_runControl
,
notifyEngineS
tart
Failed
();
return
);
QTC_ASSERT
(
runControl
,
notifyEngineS
etup
Failed
();
return
);
QTC_ASSERT
(
!
d
->
m_runControl
,
notifyEngineS
etup
Failed
();
return
);
DebuggerEngine
*
sessionTemplate
=
plugin
()
->
sessionTemplate
();
QTC_ASSERT
(
sessionTemplate
,
notifyEngineS
tart
Failed
();
return
);
QTC_ASSERT
(
sessionTemplate
!=
this
,
notifyEngineS
tart
Failed
();
return
);
QTC_ASSERT
(
sessionTemplate
,
notifyEngineS
etup
Failed
();
return
);
QTC_ASSERT
(
sessionTemplate
!=
this
,
notifyEngineS
etup
Failed
();
return
);
breakHandler
()
->
initializeFromTemplate
(
sessionTemplate
->
breakHandler
());
watchHandler
()
->
initializeFromTemplate
(
sessionTemplate
->
watchHandler
());
...
...
@@ -640,7 +641,7 @@ void DebuggerEngine::startDebugger(DebuggerRunControl *runControl)
theDebuggerAction
(
OperateByInstruction
)
->
setEnabled
(
engineCapabilities
&
DisassemblerCapability
);
setState
(
EngineSt
ar
ting
);
setState
(
EngineS
e
tting
Up
);
setupEngine
();
}
...
...
@@ -911,13 +912,13 @@ static bool isAllowedTransition(int from, int to)
return
to
==
DebuggerNotReady
;
case
DebuggerNotReady
:
return
to
==
EngineSt
ar
ting
||
to
==
DebuggerNotReady
;
return
to
==
EngineS
e
tting
Up
||
to
==
DebuggerNotReady
;
case
EngineSt
ar
ting
:
return
to
==
EngineS
tarted
||
to
==
EngineS
tart
Failed
;
case
EngineS
tart
Failed
:
case
EngineS
e
tting
Up
:
return
to
==
EngineS
etupOk
||
to
==
EngineS
etup
Failed
;
case
EngineS
etup
Failed
:
return
to
==
DebuggerNotReady
;
case
EngineS
tarted
:
case
EngineS
etupOk
:
return
to
==
InferiorSettingUp
||
to
==
EngineShuttingDown
;
case
InferiorSettingUp
:
...
...
@@ -963,26 +964,26 @@ static bool isAllowedTransition(int from, int to)
return
false
;
}
void
DebuggerEngine
::
notifyEngineS
tart
Failed
()
void
DebuggerEngine
::
notifyEngineS
etup
Failed
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
setState
(
EngineS
tart
Failed
);
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
setState
(
EngineS
etup
Failed
);
d
->
m_runControl
->
debuggingFinished
();
d
->
m_runControl
->
startFailed
();
QTimer
::
singleShot
(
0
,
this
,
SLOT
(
doShutdown
()));
}
void
DebuggerEngine
::
notifyEngineS
tart
Ok
()
void
DebuggerEngine
::
notifyEngineS
etup
Ok
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
setState
(
EngineS
tarted
);
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
setState
(
EngineS
etupOk
);
d
->
m_runControl
->
startSuccessful
();
QTimer
::
singleShot
(
0
,
d
,
SLOT
(
doSetupInferior
()));
}
void
DebuggerEnginePrivate
::
doSetupInferior
()
{
QTC_ASSERT
(
m_state
==
EngineS
tarted
,
qDebug
()
<<
m_state
);
QTC_ASSERT
(
m_state
==
EngineS
etupOk
,
qDebug
()
<<
m_state
);
m_engine
->
setState
(
InferiorSettingUp
);
m_engine
->
setupInferior
();
}
...
...
@@ -990,7 +991,7 @@ void DebuggerEnginePrivate::doSetupInferior()
// Default implemention, can be overridden.
void
DebuggerEngine
::
setupInferior
()
{
QTC_ASSERT
(
state
()
==
EngineS
tarted
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
etupOk
,
qDebug
()
<<
state
());
notifyInferiorSetupOk
();
}
...
...
@@ -1020,6 +1021,24 @@ void DebuggerEngine::runEngine()
QTC_ASSERT
(
state
()
==
InferiorSetupOk
,
qDebug
()
<<
state
());
}
void
DebuggerEngine
::
notifyInferiorRunning
()
{
QTC_ASSERT
(
m_state
==
InferiorRunningRequested
,
qDebug
()
<<
m_state
);
setState
(
InferiorRunning
);
}
void
DebuggerEngine
::
notifyInferiorStopped
()
{
QTC_ASSERT
(
m_state
==
InferiorRunningStoppint
,
qDebug
()
<<
m_state
);
setState
(
InferiorStopped
);
}
void
DebuggerEnginePrivate
::
doInterruptInferior
()
{
QTC_ASSERT
(
m_state
==
InferiorRunning
,
qDebug
()
<<
m_state
);
m_engine
->
interruptInferior
();
}
void
DebuggerEnginePrivate
::
doShutdown
()
{
m_engine
->
shutdown
();
...
...
@@ -1064,9 +1083,9 @@ bool DebuggerEngine::debuggerActionsEnabled(DebuggerState state)
case
InferiorStopped
:
return
true
;
case
DebuggerNotReady
:
case
EngineSt
ar
ting
:
case
EngineS
tarted
:
case
EngineS
tart
Failed
:
case
EngineS
e
tting
Up
:
case
EngineS
etupOk
:
case
EngineS
etup
Failed
:
case
InferiorSetupOk
:
case
InferiorSetupFailed
:
case
InferiorRunningRequested_Kill
:
...
...
src/plugins/debugger/debuggerengine.h
View file @
6089bc1b
...
...
@@ -189,11 +189,6 @@ protected:
virtual
void
frameUp
();
virtual
void
frameDown
();
public
slots
:
// Convenience
void
showMessage
(
const
QString
&
msg
,
int
channel
=
LogDebug
,
int
timeout
=
-
1
)
const
;
void
showStatusMessage
(
const
QString
&
msg
,
int
timeout
=
-
1
)
const
;
public:
DebuggerPlugin
*
plugin
()
const
;
const
DebuggerStartParameters
&
startParameters
()
const
;
...
...
@@ -248,7 +243,10 @@ public:
bool
isReverseDebugging
()
const
;
void
handleCommand
(
int
role
,
const
QVariant
&
value
);
public
slots
:
// Convenience
void
showMessage
(
const
QString
&
msg
,
int
channel
=
LogDebug
,
int
timeout
=
-
1
)
const
;
void
showStatusMessage
(
const
QString
&
msg
,
int
timeout
=
-
1
)
const
;
void
resetLocation
();
void
openFile
(
const
QString
&
fileName
,
int
lineNumber
=
-
1
);
void
gotoLocation
(
const
QString
&
fileName
,
int
lineNumber
,
bool
setMarker
);
...
...
@@ -257,12 +255,18 @@ public slots:
virtual
void
quitDebugger
()
{
exitDebugger
();
}
// called by DebuggerRunControl
protected:
void
notifyEngineS
tart
Ok
();
void
notifyEngineS
tart
Failed
();
void
notifyEngineS
etup
Ok
();
void
notifyEngineS
etup
Failed
();
void
notifyInferiorSetupOk
();
void
notifyInferiorSetupFailed
();
void
notifyInferiorRunning
();
void
notifyInferiorStopped
();
// Called to initiate shutdown.
void
notifyInferiorIll
();
virtual
void
setupInferior
();
virtual
void
runEngine
();
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
6089bc1b
...
...
@@ -167,7 +167,7 @@
// DebuggerNotReady
// +
// +
// EngineSt
ar
ting
// EngineS
e
tting
Up
// +
// +
// (calls *Engine->setupEngine())
...
...
@@ -176,13 +176,13 @@
// Engine- Engine-
// StartOk} StartFailed}
// | |
// | `---> EngineS
tart
Failed
// | `---> EngineS
etup
Failed
// | +
// | [calls RunControl->startFailed]
// | +
// | DebuggerNotReady
// v
// EngineS
tarted
// EngineS
etupOk
// +
// [calls RunControl->StartSuccessful]
// +
...
...
@@ -222,7 +222,7 @@
// DebuggerNotReady
//
// GdbEngine specific startup. All happens in EngineSt
ar
ting state
// GdbEngine specific startup. All happens in EngineS
e
tting
Up
state
//
// Transitions marked by '---' are done in the individual adapters.
// Transitions marked by '+-+' are done in the GdbEngine.
...
...
@@ -234,7 +234,7 @@
// | |
// | `---> handleAdapterStartFailed()
// | +
// | EngineS
tart
Failed
// | EngineS
etup
Failed
// |
// handleAdapterStarted()
// +
...
...
@@ -242,11 +242,11 @@
// | |
// | `---> handleAdapterStartFailed()
// | +
// | EngineS
tart
Failed
// | EngineS
etup
Failed
// |
// handleInferiorPrepared()
// +
// EngineS
tarted
// EngineS
etupOk
...
...
@@ -2120,7 +2120,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
||
m_state
==
InferiorStopping
||
m_state
==
InferiorStopped
;
const
bool
starting
=
m_state
==
EngineSt
ar
ting
;
const
bool
starting
=
m_state
==
EngineS
e
tting
Up
;
//const bool running = m_state == InferiorRunning;
m_startExternalAction
->
setEnabled
(
!
started
&&
!
starting
);
...
...
@@ -2686,8 +2686,8 @@ bool DebuggerListener::coreAboutToClose()
switch
(
plugin
->
state
())
{
case
DebuggerNotReady
:
return
true
;
case
EngineS
tarted
:
// Most importantly, terminating a running
case
EngineS
tart
Failed
:
// debuggee can cause problems.
case
EngineS
etupOk
:
// Most importantly, terminating a running
case
EngineS
etup
Failed
:
// debuggee can cause problems.
case
InferiorUnrunnable
:
case
InferiorSetupFailed
:
case
InferiorStopped
:
...
...
src/plugins/debugger/gdb/attachgdbadapter.cpp
View file @
6089bc1b
...
...
@@ -56,7 +56,7 @@ AttachGdbAdapter::AttachGdbAdapter(GdbEngine *engine, QObject *parent)
void
AttachGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
if
(
!
m_engine
->
startGdb
())
...
...
src/plugins/debugger/gdb/coregdbadapter.cpp
View file @
6089bc1b
...
...
@@ -59,7 +59,7 @@ CoreGdbAdapter::CoreGdbAdapter(GdbEngine *engine, QObject *parent)
void
CoreGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
if
(
!
m_engine
->
startGdb
())
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
6089bc1b
...
...
@@ -122,9 +122,9 @@ QByteArray GdbEngine::tooltipIName(const QString &exp)
static
bool
stateAcceptsGdbCommands
(
DebuggerState
state
)
{
switch
(
state
)
{
case
EngineSt
ar
ting
:
case
EngineS
tarted
:
case
EngineS
tart
Failed
:
case
EngineS
e
tting
Up
:
case
EngineS
etupOk
:
case
EngineS
etup
Failed
:
case
InferiorUnrunnable
:
case
InferiorSettingUp
:
case
InferiorSetupFailed
:
...
...
@@ -737,7 +737,7 @@ void GdbEngine::postCommandHelper(const GdbCommand &cmd)
}
else
if
((
cmd
.
flags
&
NeedsStop
)
||
!
m_commandsToRunOnTemporaryBreak
.
isEmpty
())
{
if
(
state
()
==
InferiorStopped
||
state
()
==
InferiorUnrunnable
||
state
()
==
InferiorSettingUp
||
state
()
==
EngineS
tarted
)
{
||
state
()
==
InferiorSettingUp
||
state
()
==
EngineS
etupOk
)
{
// Can be safely sent now.
flushCommand
(
cmd
);
}
else
{
...
...
@@ -1603,11 +1603,11 @@ void GdbEngine::shutdown()
case
InferiorRunningRequested_Kill
:
case
InferiorStopping_Kill
:
break
;
case
EngineSt
ar
ting
:
// GDB is up, adapter is "doing something"
setState
(
EngineS
tart
Failed
);
case
EngineS
e
tting
Up
:
// GDB is up, adapter is "doing something"
setState
(
EngineS
etup
Failed
);
m_gdbAdapter
->
shutdown
();
// fall-through
case
EngineS
tart
Failed
:
// Adapter "did something", but it did not help
case
EngineS
etup
Failed
:
// Adapter "did something", but it did not help
if
(
gdbProc
()
->
state
()
==
QProcess
::
Running
)
{
m_commandsToRunOnTemporaryBreak
.
clear
();
postCommand
(
"-gdb-exit"
,
GdbEngine
::
ExitRequest
,
CB
(
handleGdbExit
));
...
...
@@ -1623,7 +1623,7 @@ void GdbEngine::shutdown()
postCommand
(
m_gdbAdapter
->
inferiorShutdownCommand
(),
NeedsStop
|
LosesChild
,
CB
(
handleInferiorShutdown
));
break
;
case
EngineS
tarted
:
// We can't get here, really
case
EngineS
etupOk
:
// We can't get here, really
case
InferiorSetupOk
:
case
InferiorSetupFailed
:
case
InferiorShutDown
:
...
...
@@ -1764,7 +1764,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
void
GdbEngine
::
setupEngine
()
{
//qDebug() << "GDB START DEBUGGER";
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
QTC_ASSERT
(
m_debuggingHelperState
==
DebuggingHelperUninitialized
,
/**/
);
QTC_ASSERT
(
m_gdbAdapter
==
0
,
/**/
);
...
...
@@ -1788,7 +1788,7 @@ void GdbEngine::setupEngine()
}
m_progress
->
setProgressValue
(
20
);
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
/**/
);
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
/**/
);
m_gdbAdapter
->
startAdapter
();
}
...
...
@@ -3055,7 +3055,7 @@ void GdbEngine::activateSnapshot2()
{
// Otherwise the stack data might be stale.
// See http://sourceware.org/bugzilla/show_bug.cgi?id=1124.
setState
(
EngineSt
ar
ting
);
setState
(
EngineS
e
tting
Up
);
postCommand
(
"set stack-cache off"
);
handleAdapterStarted
();
}
...
...
@@ -4177,7 +4177,7 @@ void GdbEngine::handleGdbFinished(int code, QProcess::ExitStatus type)
}
else
if
(
state
()
==
EngineShuttingDown
)
{
showMessage
(
_
(
"GOING TO SHUT DOWN ADAPTER"
));
m_gdbAdapter
->
shutdown
();
}
else
if
(
state
()
!=
EngineS
tart
Failed
)
{
}
else
if
(
state
()
!=
EngineS
etup
Failed
)
{
QString
msg
=
tr
(
"The gdb process exited unexpectedly (%1)."
)
.
arg
((
type
==
QProcess
::
CrashExit
)
?
tr
(
"crashed"
)
:
tr
(
"code %1"
).
arg
(
code
));
...
...
@@ -4191,7 +4191,7 @@ void GdbEngine::handleGdbFinished(int code, QProcess::ExitStatus type)
void
GdbEngine
::
handleAdapterStartFailed
(
const
QString
&
msg
,
const
QString
&
settingsIdHint
)
{
setState
(
EngineS
tart
Failed
);
setState
(
EngineS
etup
Failed
);
showMessage
(
_
(
"ADAPTER START FAILED"
));
if
(
!
msg
.
isEmpty
())
{
const
QString
title
=
tr
(
"Adapter start failed"
);
...
...
@@ -4210,7 +4210,7 @@ void GdbEngine::handleAdapterStarted()
if
(
m_progress
)
m_progress
->
setProgressValue
(
25
);
showMessage
(
_
(
"ADAPTER SUCCESSFULLY STARTED"
));
notifyEngineS
tart
Ok
();
notifyEngineS
etup
Ok
();
}
void
GdbEngine
::
setupInferior
()
...
...
@@ -4264,7 +4264,7 @@ void GdbEngine::runEngine()
void
GdbEngine
::
handleInferiorSetupFailed
(
const
QString
&
msg
)
{
showStatusMessage
(
tr
(
"Failed to start application: "
)
+
msg
);
if
(
state
()
==
EngineS
tart
Failed
)
{
if
(
state
()
==
EngineS
etup
Failed
)
{
showMessage
(
_
(
"INFERIOR START FAILED, BUT ADAPTER DIED ALREADY"
));
return
;
// Adapter crashed meanwhile, so this notification is meaningless.
}
...
...
@@ -4282,7 +4282,7 @@ void GdbEngine::handleAdapterCrashed(const QString &msg)
// Don't bother with state transitions - this can happen in any state and
// the end result is always the same, so it makes little sense to find a
// "path" which does not assert.
notifyEngineS
tart
Failed
();
notifyEngineS
etup
Failed
();
// No point in being friendly here ...
gdbProc
()
->
kill
();
...
...
src/plugins/debugger/gdb/localplaingdbadapter.cpp
View file @
6089bc1b
...
...
@@ -68,7 +68,7 @@ AbstractGdbAdapter::DumperHandling LocalPlainGdbAdapter::dumperHandling() const
void
LocalPlainGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
QStringList
gdbArgs
;
...
...
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View file @
6089bc1b
...
...
@@ -84,7 +84,7 @@ AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() cons
void
RemoteGdbServerAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
// FIXME: make asynchroneous
...
...
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
View file @
6089bc1b
...
...
@@ -45,7 +45,7 @@ RemotePlainGdbAdapter::RemotePlainGdbAdapter(GdbEngine *engine, QObject *parent)
void
RemotePlainGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
QLatin1String
(
"TRYING TO START ADAPTER"
));
if
(
!
startParameters
().
workingDirectory
.
isEmpty
())
...
...
src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
View file @
6089bc1b
...
...
@@ -337,7 +337,7 @@ void TcfTrkGdbAdapter::startGdb()
void
TcfTrkGdbAdapter
::
tcftrkDeviceError
(
const
QString
&
errorString
)
{
logMessage
(
errorString
);
if
(
state
()
==
EngineSt
ar
ting
)
{
if
(
state
()
==
EngineS
e
tting
Up
)
{
m_engine
->
handleAdapterStartFailed
(
errorString
,
QString
());
}
else
{
m_engine
->
handleAdapterCrashed
(
errorString
);
...
...
@@ -956,7 +956,7 @@ void TcfTrkGdbAdapter::startAdapter()
// Unixish gdbs accept only forward slashes
m_symbolFile
.
replace
(
QLatin1Char
(
'\\'
),
QLatin1Char
(
'/'
));
// Start
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
logMessage
(
QLatin1String
(
"### Starting TcfTrkGdbAdapter"
));
...
...
src/plugins/debugger/gdb/termgdbadapter.cpp
View file @
6089bc1b
...
...
@@ -81,7 +81,7 @@ AbstractGdbAdapter::DumperHandling TermGdbAdapter::dumperHandling() const
void
TermGdbAdapter
::
startAdapter
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
// Currently, adapters are not re-used
...
...
@@ -111,7 +111,7 @@ void TermGdbAdapter::startAdapter()
void
TermGdbAdapter
::
handleInferiorSetupOk
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
m_engine
->
handleAdapterStarted
();
}
...
...
@@ -172,7 +172,7 @@ void TermGdbAdapter::stubMessage(const QString &msg, bool)
void
TermGdbAdapter
::
stubExited
()
{
showMessage
(
_
(
"STUB EXITED"
));
if
(
state
()
!=
EngineSt
ar
ting
// From previous instance
if
(
state
()
!=
EngineS
e
tting
Up
// From previous instance
&&
state
()
!=
EngineShuttingDown
&&
state
()
!=
DebuggerNotReady
)
m_engine
->
handleAdapterCrashed
(
QString
());
}
...
...
src/plugins/debugger/gdb/trkgdbadapter.cpp
View file @
6089bc1b
...
...
@@ -1501,7 +1501,7 @@ void TrkGdbAdapter::startAdapter()
// Unixish gdbs accept only forward slashes
m_symbolFile
.
replace
(
QLatin1Char
(
'\\'
),
QLatin1Char
(
'/'
));
// Start
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
showMessage
(
_
(
"TRYING TO START ADAPTER"
));
logMessage
(
QLatin1String
(
"### Starting TrkGdbAdapter"
));
...
...
src/plugins/debugger/pdb/pdbengine.cpp
View file @
6089bc1b
...
...
@@ -140,7 +140,7 @@ void PdbEngine::exitDebugger()
void
PdbEngine
::
setupEngine
()
{
QTC_ASSERT
(
state
()
==
EngineSt
ar
ting
,
qDebug
()
<<
state
());
QTC_ASSERT
(
state
()
==
EngineS
e
tting
Up
,
qDebug
()
<<
state
());
m_scriptFileName
=
QFileInfo
(
startParameters
().
executable
).
absoluteFilePath
();
QFile
scriptFile
(
m_scriptFileName
);
...
...
@@ -148,7 +148,7 @@ void PdbEngine::setupEngine()
//showMessage("STARTING " +m_scriptFileName + "FAILED");
showMessage
(
QString
::
fromLatin1
(
"Cannot open %1: %2"
).
arg
(
m_scriptFileName
,
scriptFile
.
errorString
()),
LogError
);
notifyEngineS
tart
Failed
();
notifyEngineS
etup
Failed
();
return
;
}
m_pdbProc
.
disconnect
();
// From any previous runs
...
...
@@ -181,17 +181,17 @@ void PdbEngine::setupEngine()
if
(
!
m_pdbProc
.
waitForStarted
())
{
const
QString
msg
=
tr
(
"Unable to start pdb '%1': %2"
)
.
arg
(
m_pdb
,
m_pdbProc
.
errorString
());
setState
(
EngineS
tart
Failed
);
setState
(
EngineS
etup
Failed
);
showMessage
(
_
(
"ADAPTER START FAILED"
));
if
(
!
msg
.
isEmpty
())
{
const
QString
title
=
tr
(
"Adapter start failed"
);
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
title
,
msg
);
}
shutdown
();
notifyEngineS
tart
Failed
();
notifyEngineS
etup
Failed
();
return
;
}
notifyEngineS
tart
Ok
();
notifyEngineS
etup
Ok
();
}
void
PdbEngine
::
setupInferior
()
...
...
src/plugins/debugger/qml/qmlengine.cpp
View file @
6089bc1b
...
...
@@ -251,11 +251,11 @@ void QmlEngine::setupEngine()
m_proc.start(sp.executable, sp.processArgs);
if (!m_proc.waitForStarted()) {
notifyEngineS
tart
Failed();
notifyEngineS
etup
Failed();
return;
}
#endif
notifyEngineS
tart
Ok
();
notifyEngineS
etup
Ok
();
//m_frameRate = new CanvasFrameRate(0);
//m_frameRate->show();
}
...
...
@@ -295,12 +295,12 @@ void QmlEngine::setupConnection()
if (!m_conn->waitForConnected()) {
qDebug() << "CONNECTION FAILED";
notifyEngineS
tart
Failed();
notifyEngineS
etup
Failed();
return;
}
#endif
notifyEngineS
tart
Ok
();
notifyEngineS
etup
Ok
();
qDebug
()
<<
"CONNECTION SUCCESSFUL"
;
setState
(
InferiorRunningRequested
);