nemiver r816 - in trunk: . src/dbgengine src/persp/dbgperspective tests
- From: dodji svn gnome org
- To: svn-commits-list gnome org
- Subject: nemiver r816 - in trunk: . src/dbgengine src/persp/dbgperspective tests
- Date: Sun, 18 May 2008 12:52:54 +0000 (UTC)
Author: dodji
Date: Sun May 18 12:52:54 2008
New Revision: 816
URL: http://svn.gnome.org/viewvc/nemiver?rev=816&view=rev
Log:
[stop reason] use StopReason enum, not strings.
* src/dbgengine/nmv-dbg-common.h,
src/dbgengine/nmv-gdb-engine.[cc,h],
src/dbgengine/nmv-gdbmi-parser.cc,
src/dbgengine/nmv-i-debugger.h,
src/persp/dbgperspective/nmv-call-stack.cc,
src/persp/dbgperspective/nmv-dbg-perspective.cc,
src/persp/dbgperspective/nmv-local-vars-inspector.cc,:
Replace stop reasons string use by the enum StopReason use.
Move StopReason from the OutOfBandRecord type to the IDebugger
interface type. That way, it can be used from within clients of
IDebugger. Change the code of the client code accordingly.
Modified:
trunk/ChangeLog
trunk/src/dbgengine/nmv-dbg-common.h
trunk/src/dbgengine/nmv-gdb-engine.cc
trunk/src/dbgengine/nmv-gdb-engine.h
trunk/src/dbgengine/nmv-gdbmi-parser.cc
trunk/src/dbgengine/nmv-i-debugger.h
trunk/src/persp/dbgperspective/nmv-call-stack.cc
trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc
trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
trunk/src/persp/dbgperspective/nmv-memory-view.cc
trunk/src/persp/dbgperspective/nmv-registers-view.cc
trunk/src/persp/dbgperspective/nmv-thread-list.cc
trunk/tests/test-breakpoint.cc
trunk/tests/test-core.cc
trunk/tests/test-deref.cc
trunk/tests/test-local-vars-list.cc
trunk/tests/test-var-list.cc
trunk/tests/test-var-walker.cc
Modified: trunk/src/dbgengine/nmv-dbg-common.h
==============================================================================
--- trunk/src/dbgengine/nmv-dbg-common.h (original)
+++ trunk/src/dbgengine/nmv-dbg-common.h Sun May 18 12:52:54 2008
@@ -161,27 +161,12 @@
class OutOfBandRecord {
public:
- enum StopReason {
- UNDEFINED=0,
- BREAKPOINT_HIT,
- WATCHPOINT_TRIGGER,
- READ_WATCHPOINT_TRIGGER,
- ACCESS_WATCHPOINT_TRIGGER,
- FUNCTION_FINISHED,
- LOCATION_REACHED,
- WATCHPOINT_SCOPE,
- END_STEPPING_RANGE,
- EXITED_SIGNALLED,
- EXITED,
- EXITED_NORMALLY,
- SIGNAL_RECEIVED
- };//end enum StopReason
private:
bool m_has_stream_record;
StreamRecord m_stream_record ;
bool m_is_stopped ;
- StopReason m_stop_reason ;
+ IDebugger::StopReason m_stop_reason ;
bool m_has_frame ;
IDebugger::Frame m_frame ;
long m_breakpoint_number ;
@@ -193,48 +178,48 @@
OutOfBandRecord () {clear ();}
- UString stop_reason_to_string (StopReason a_reason) const
+ UString stop_reason_to_string (IDebugger::StopReason a_reason) const
{
UString result ("undefined") ;
switch (a_reason) {
- case UNDEFINED:
+ case IDebugger::UNDEFINED_REASON:
return "undefined" ;
break ;
- case BREAKPOINT_HIT:
+ case IDebugger::BREAKPOINT_HIT:
return "breakpoint-hit" ;
break ;
- case WATCHPOINT_TRIGGER:
+ case IDebugger::WATCHPOINT_TRIGGER:
return "watchpoint-trigger" ;
break ;
- case READ_WATCHPOINT_TRIGGER:
+ case IDebugger::READ_WATCHPOINT_TRIGGER:
return "read-watchpoint-trigger" ;
break ;
- case ACCESS_WATCHPOINT_TRIGGER:
+ case IDebugger::ACCESS_WATCHPOINT_TRIGGER:
return "access-watchpoint-trigger" ;
break ;
- case FUNCTION_FINISHED:
+ case IDebugger::FUNCTION_FINISHED:
return "function-finished" ;
break ;
- case LOCATION_REACHED:
+ case IDebugger::LOCATION_REACHED:
return "location-reached" ;
break ;
- case WATCHPOINT_SCOPE:
+ case IDebugger::WATCHPOINT_SCOPE:
return "watchpoint-scope" ;
break ;
- case END_STEPPING_RANGE:
+ case IDebugger::END_STEPPING_RANGE:
return "end-stepping-range" ;
break ;
- case EXITED_SIGNALLED:
+ case IDebugger::EXITED_SIGNALLED:
return "exited-signaled" ;
break ;
- case EXITED:
+ case IDebugger::EXITED:
return "exited" ;
break ;
- case EXITED_NORMALLY:
+ case IDebugger::EXITED_NORMALLY:
return "exited-normally" ;
break ;
- case SIGNAL_RECEIVED:
+ case IDebugger::SIGNAL_RECEIVED:
return "signal-received" ;
break ;
}
@@ -255,12 +240,12 @@
bool is_stopped () const {return m_is_stopped;}
void is_stopped (bool a_in) {m_is_stopped = a_in;}
- StopReason stop_reason () const {return m_stop_reason ;}
+ IDebugger::StopReason stop_reason () const {return m_stop_reason ;}
UString stop_reason_as_str () const
{
return stop_reason_to_string (m_stop_reason) ;
}
- void stop_reason (StopReason a_in) {m_stop_reason = a_in;}
+ void stop_reason (IDebugger::StopReason a_in) {m_stop_reason = a_in;}
bool has_frame () const {return m_has_frame;}
void has_frame (bool a_in) {m_has_frame = a_in;}
@@ -290,7 +275,7 @@
m_has_stream_record = false ;
m_stream_record.clear () ;
m_is_stopped = false ;
- m_stop_reason = UNDEFINED ;
+ m_stop_reason = IDebugger::UNDEFINED_REASON ;
m_has_frame = false ;
m_frame.clear () ;
m_breakpoint_number = 0 ;
Modified: trunk/src/dbgengine/nmv-gdb-engine.cc
==============================================================================
--- trunk/src/dbgengine/nmv-gdb-engine.cc (original)
+++ trunk/src/dbgengine/nmv-gdb-engine.cc Sun May 18 12:52:54 2008
@@ -144,7 +144,7 @@
mutable sigc::signal<void, const IDebugger::BreakPoint&, int>
breakpoint_enabled_signal;
- mutable sigc::signal<void, const UString&,
+ mutable sigc::signal<void, IDebugger::StopReason,
bool, const IDebugger::Frame&,
int, const UString&> stopped_signal;
@@ -1079,18 +1079,19 @@
int thread_id = m_out_of_band_record.thread_id ();
m_engine->stopped_signal ().emit
- (m_out_of_band_record.stop_reason_as_str (),
+ (m_out_of_band_record.stop_reason (),
m_out_of_band_record.has_frame (),
m_out_of_band_record.frame (),
thread_id,
a_in.command ().cookie ());
- UString reason = m_out_of_band_record.stop_reason_as_str ();
+ IDebugger::StopReason reason = m_out_of_band_record.stop_reason ();
- if (reason == "exited-signalled"
- || reason == "exited-normally"
- || reason == "exited") {
+ if (reason == IDebugger::EXITED_SIGNALLED
+ || reason == IDebugger::EXITED_NORMALLY
+ || reason == IDebugger::EXITED) {
m_engine->set_state (IDebugger::PROGRAM_EXITED);
+ m_engine->detached_from_target_signal ().emit ();
m_engine->program_finished_signal ().emit ();
} else {
m_engine->set_state (IDebugger::READY);
@@ -1737,7 +1738,7 @@
for (it = a_in.output ().out_of_band_records ().begin ();
it != a_in.output ().out_of_band_records ().end ();
++it) {
- if (it->stop_reason () == Output::OutOfBandRecord::SIGNAL_RECEIVED) {
+ if (it->stop_reason () == IDebugger::SIGNAL_RECEIVED) {
oo_record = *it;
LOG_DD ("output handler selected");
return true;
@@ -2210,6 +2211,7 @@
LOG_FUNCTION_SCOPE_NORMAL_DD;
THROW_IF_FAIL (m_priv);
+ LOG_DD ("state: " << m_priv->state);
return m_priv->state;
}
@@ -2346,7 +2348,9 @@
return m_priv->got_overloads_choice_signal;
}
-sigc::signal<void, const UString&, bool, const IDebugger::Frame&, int, const UString&>&
+sigc::signal<void, IDebugger::StopReason,
+ bool, const IDebugger::Frame&,
+ int, const UString&>&
GDBEngine::stopped_signal () const
{
return m_priv->stopped_signal;
@@ -2548,7 +2552,7 @@
}
void
-GDBEngine::on_stopped_signal (const UString &a_reason,
+GDBEngine::on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -2560,9 +2564,9 @@
NEMIVER_TRY
- if (a_reason == "exited-signalled"
- || a_reason == "exited-normally"
- || a_reason == "exited") {
+ if (a_reason == IDebugger::EXITED_SIGNALLED
+ || a_reason == IDebugger::EXITED_NORMALLY
+ || a_reason == IDebugger::EXITED) {
return;
}
THROW_IF_FAIL (m_priv);
Modified: trunk/src/dbgengine/nmv-gdb-engine.h
==============================================================================
--- trunk/src/dbgengine/nmv-gdb-engine.h (original)
+++ trunk/src/dbgengine/nmv-gdb-engine.h Sun May 18 12:52:54 2008
@@ -85,7 +85,7 @@
sigc::signal<void,
- const UString&,
+ IDebugger::StopReason,
bool,
const IDebugger::Frame&,
int,
@@ -182,7 +182,7 @@
void on_debugger_stdout_signal (CommandAndOutput &a_cao) ;
void on_got_target_info_signal (int a_pid, const UString& a_exe_path) ;
- void on_stopped_signal (const UString &a_reason,
+ void on_stopped_signal (IDebugger::StopReason a_reason,
bool has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
Modified: trunk/src/dbgengine/nmv-gdbmi-parser.cc
==============================================================================
--- trunk/src/dbgengine/nmv-gdbmi-parser.cc (original)
+++ trunk/src/dbgengine/nmv-gdbmi-parser.cc Sun May 18 12:52:54 2008
@@ -2697,33 +2697,33 @@
return true;
}
-Output::OutOfBandRecord::StopReason
+IDebugger::StopReason
str_to_stopped_reason (const UString &a_str)
{
if (a_str == "breakpoint-hit") {
- return Output::OutOfBandRecord::BREAKPOINT_HIT;
+ return IDebugger::BREAKPOINT_HIT;
} else if (a_str == "watchpoint-trigger") {
- return Output::OutOfBandRecord::WATCHPOINT_TRIGGER;
+ return IDebugger::WATCHPOINT_TRIGGER;
} else if (a_str == "read-watchpoint-trigger") {
- return Output::OutOfBandRecord::READ_WATCHPOINT_TRIGGER;
+ return IDebugger::READ_WATCHPOINT_TRIGGER;
} else if (a_str == "function-finished") {
- return Output::OutOfBandRecord::FUNCTION_FINISHED;
+ return IDebugger::FUNCTION_FINISHED;
} else if (a_str == "location-reached") {
- return Output::OutOfBandRecord::LOCATION_REACHED;
+ return IDebugger::LOCATION_REACHED;
} else if (a_str == "watchpoint-scope") {
- return Output::OutOfBandRecord::WATCHPOINT_SCOPE;
+ return IDebugger::WATCHPOINT_SCOPE;
} else if (a_str == "end-stepping-range") {
- return Output::OutOfBandRecord::END_STEPPING_RANGE;
+ return IDebugger::END_STEPPING_RANGE;
} else if (a_str == "exited-signalled") {
- return Output::OutOfBandRecord::EXITED_SIGNALLED;
+ return IDebugger::EXITED_SIGNALLED;
} else if (a_str == "exited") {
- return Output::OutOfBandRecord::EXITED;
+ return IDebugger::EXITED;
} else if (a_str == "exited-normally") {
- return Output::OutOfBandRecord::EXITED_NORMALLY;
+ return IDebugger::EXITED_NORMALLY;
} else if (a_str == "signal-received") {
- return Output::OutOfBandRecord::SIGNAL_RECEIVED;
+ return IDebugger::SIGNAL_RECEIVED;
} else {
- return Output::OutOfBandRecord::UNDEFINED;
+ return IDebugger::UNDEFINED_REASON;
}
}
Modified: trunk/src/dbgengine/nmv-i-debugger.h
==============================================================================
--- trunk/src/dbgengine/nmv-i-debugger.h (original)
+++ trunk/src/dbgengine/nmv-i-debugger.h Sun May 18 12:52:54 2008
@@ -482,6 +482,21 @@
return str;
}
+ enum StopReason {
+ UNDEFINED_REASON=0,
+ BREAKPOINT_HIT,
+ WATCHPOINT_TRIGGER,
+ READ_WATCHPOINT_TRIGGER,
+ ACCESS_WATCHPOINT_TRIGGER,
+ FUNCTION_FINISHED,
+ LOCATION_REACHED,
+ WATCHPOINT_SCOPE,
+ END_STEPPING_RANGE,
+ EXITED_SIGNALLED,
+ EXITED,
+ EXITED_NORMALLY,
+ SIGNAL_RECEIVED
+ };//end enum StopReason
virtual ~IDebugger () {}
@@ -532,7 +547,7 @@
got_overloads_choice_signal () const=0;
virtual sigc::signal<void,
- const UString&/*reason*/,
+ IDebugger::StopReason /*reason*/,
bool /*has frame*/,
const IDebugger::Frame&/*the frame*/,
int /*thread id*/,
Modified: trunk/src/persp/dbgperspective/nmv-call-stack.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-call-stack.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-call-stack.cc Sun May 18 12:52:54 2008
@@ -207,7 +207,7 @@
}
- void on_debugger_stopped_signal (const UString &a_reason,
+ void on_debugger_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -220,9 +220,9 @@
if (a_has_frame || a_frame.line () || a_thread_id || a_cookie.empty ()) {}
- if (a_reason == "exited-signaled"
- || a_reason == "exited-normally"
- || a_reason == "exited") {
+ if (a_reason == IDebugger::EXITED_SIGNALLED
+ || a_reason == IDebugger::EXITED_NORMALLY
+ || a_reason == IDebugger::EXITED) {
return ;
}
Modified: trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc Sun May 18 12:52:54 2008
@@ -297,7 +297,7 @@
(const vector<IDebugger::OverloadsChoiceEntry> &entries,
const UString &a_cookie) ;
- void on_debugger_stopped_signal (const UString &a_reason,
+ void on_debugger_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &,
int a_thread_id,
@@ -1466,7 +1466,15 @@
if (a_is_ready) {
m_priv->target_connected_action_group->set_sensitive (true) ;
} else {
+ //reset to default cursor, in case the busy cursor was spinning
+ workbench ().get_root_window ().get_window ()->set_cursor ();
+ m_priv->throbber->stop () ;
m_priv->target_connected_action_group->set_sensitive (false) ;
+ m_priv->default_action_group->set_sensitive (true) ;
+ m_priv->target_not_started_action_group->set_sensitive (false) ;
+ m_priv->debugger_ready_action_group->set_sensitive (false) ;
+ m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ m_priv->opened_file_action_group->set_sensitive (false);
}
NEMIVER_CATCH
@@ -1597,11 +1605,14 @@
NEMIVER_TRY
if (get_contextual_menu ()
- && get_contextual_menu ()->is_visible ())
- {
+ && get_contextual_menu ()->is_visible ()) {
return false ;
}
+ if (!debugger ()->is_attached_to_target ()) {
+ return false;
+ }
+
try_to_request_show_variable_value_at_position
(m_priv->mouse_in_source_editor_x,
m_priv->mouse_in_source_editor_y) ;
@@ -1945,7 +1956,7 @@
void
-DBGPerspective::on_debugger_stopped_signal (const UString &a_reason,
+DBGPerspective::on_debugger_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -1953,11 +1964,11 @@
{
LOG_FUNCTION_SCOPE_NORMAL_DD ;
- if (a_reason == "" || a_thread_id || a_cookie.empty ()) {}
+ if (a_thread_id || a_cookie.empty ()) {}
NEMIVER_TRY
- LOG_DD ("stopped, reason: " << a_reason) ;
+ LOG_DD ("stopped, reason: " << (int)a_reason) ;
THROW_IF_FAIL (m_priv) ;
@@ -2002,7 +2013,7 @@
NEMIVER_TRY
unset_where () ;
- attached_to_target_signal ().emit (true) ;
+ attached_to_target_signal ().emit (false) ;
display_info (_("Program exited")) ;
workbench ().set_title_extension ("");
@@ -2015,6 +2026,7 @@
m_priv->target_not_started_action_group->set_sensitive (true) ;
m_priv->debugger_ready_action_group->set_sensitive (false) ;
m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ m_priv->target_connected_action_group->set_sensitive (false);
//**********************
//clear threads list and
@@ -2149,12 +2161,6 @@
if (a_state == IDebugger::READY) {
debugger_ready_signal ().emit (true) ;
- } else if (a_state == IDebugger::PROGRAM_EXITED) {
- debugger_ready_signal ().emit (true) ;
- } else if (a_state == IDebugger::NOT_STARTED) {
- debugger_not_started_signal ().emit () ;
- } else {
- debugger_ready_signal ().emit (false) ;
}
NEMIVER_CATCH
Modified: trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc Sun May 18 12:52:54 2008
@@ -461,7 +461,7 @@
}
- void on_stopped_signal (const UString &a_reason,
+ void on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -473,9 +473,9 @@
NEMIVER_TRY
LOG_DD ("stopped, reason: " << a_reason) ;
- if (a_reason == "exited-signaled"
- || a_reason == "exited-normally"
- || a_reason == "exited") {
+ if (a_reason == IDebugger::EXITED_SIGNALLED
+ || a_reason == IDebugger::EXITED_NORMALLY
+ || a_reason == IDebugger::EXITED) {
return ;
}
Modified: trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc Sun May 18 12:52:54 2008
@@ -489,7 +489,7 @@
//****************************
//<debugger signal handlers>
//****************************
- void on_stopped_signal (const UString &a_reason,
+ void on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -501,9 +501,9 @@
NEMIVER_TRY
LOG_DD ("stopped, reason: " << a_reason);
- if (a_reason == "exited-signaled"
- || a_reason == "exited-normally"
- || a_reason == "exited") {
+ if (a_reason == IDebugger::EXITED_SIGNALLED
+ || a_reason == IDebugger::EXITED_NORMALLY
+ || a_reason == IDebugger::EXITED) {
return;
}
Modified: trunk/src/persp/dbgperspective/nmv-memory-view.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-memory-view.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-memory-view.cc Sun May 18 12:52:54 2008
@@ -130,8 +130,8 @@
THROW_IF_FAIL (m_debugger);
m_debugger->state_changed_signal ().connect (sigc::mem_fun (this,
&Priv::on_debugger_state_changed));
- m_debugger->stopped_signal ().connect (sigc::mem_fun (this,
- &Priv::on_debugger_stopped));
+ m_debugger->stopped_signal ().connect (sigc::mem_fun
+ (this, &Priv::on_debugger_stopped));
m_debugger->read_memory_signal ().connect (sigc::mem_fun (this,
&Priv::on_memory_read_response));
THROW_IF_FAIL (m_jump_button);
@@ -191,14 +191,21 @@
NEMIVER_CATCH
}
- void on_debugger_stopped (const UString& /*a_reason*/,
+ void on_debugger_stopped (IDebugger::StopReason a_reason/*a_reason*/,
bool /*a_has_frame*/,
const IDebugger::Frame& /*a_frame*/,
int /*a_thread_id*/,
const UString& /*a_cookie*/)
{
NEMIVER_TRY
+
+ if (a_reason == IDebugger::EXITED_SIGNALLED
+ || a_reason == IDebugger::EXITED_NORMALLY
+ || a_reason == IDebugger::EXITED) {
+ return ;
+ }
do_memory_read ();
+
NEMIVER_CATCH
}
Modified: trunk/src/persp/dbgperspective/nmv-registers-view.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-registers-view.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-registers-view.cc Sun May 18 12:52:54 2008
@@ -77,8 +77,8 @@
debugger->register_value_changed_signal ().connect (sigc::mem_fun
(*this, &Priv::on_debugger_register_value_changed)) ;
- debugger->stopped_signal ().connect (sigc::mem_fun (*this,
- &Priv::on_debugger_stopped));
+ debugger->stopped_signal ().connect (sigc::mem_fun
+ (*this, &Priv::on_debugger_stopped));
}
void build_tree_view ()
@@ -103,20 +103,23 @@
&Priv::on_register_value_edited));
}
- void on_debugger_stopped (const UString,
+ void on_debugger_stopped (IDebugger::StopReason a_reason,
bool,
const IDebugger::Frame &,
int,
const UString&)
{
+ if (a_reason == IDebugger::EXITED_SIGNALLED
+ || a_reason == IDebugger::EXITED_NORMALLY
+ || a_reason == IDebugger::EXITED) {
+ return ;
+ }
static bool first_run = true;
- if (first_run)
- {
+ if (first_run) {
first_run = false;
debugger->list_register_names ();
}
- else
- {
+ else {
debugger->list_changed_registers ();
}
}
Modified: trunk/src/persp/dbgperspective/nmv-thread-list.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-thread-list.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-thread-list.cc Sun May 18 12:52:54 2008
@@ -69,7 +69,7 @@
connect_to_widget_signals () ;
}
- void on_debugger_stopped_signal (const UString &a_reason,
+ void on_debugger_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -79,8 +79,8 @@
NEMIVER_TRY
if (a_has_frame || a_frame.level () || a_cookie.empty ()) {}
- if (a_reason == "exited-signaled"
- || a_reason == "exited-normally") {
+ if (a_reason == IDebugger::EXITED_SIGNALLED
+ || a_reason == IDebugger::EXITED_NORMALLY) {
return ;
}
current_thread_id = a_thread_id ;
Modified: trunk/tests/test-breakpoint.cc
==============================================================================
--- trunk/tests/test-breakpoint.cc (original)
+++ trunk/tests/test-breakpoint.cc Sun May 18 12:52:54 2008
@@ -70,7 +70,7 @@
}
void
-on_stopped_signal (const UString &a_reason,
+on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -86,7 +86,7 @@
MESSAGE ("stopped, reason is '" << a_reason << "'") ;
MESSAGE ("thread-id is '" << a_thread_id) ;
- if (a_reason == "breakpoint-hit") {
+ if (a_reason == IDebugger::BREAKPOINT_HIT) {
++nb_bp ;
}
Modified: trunk/tests/test-core.cc
==============================================================================
--- trunk/tests/test-core.cc (original)
+++ trunk/tests/test-core.cc Sun May 18 12:52:54 2008
@@ -26,7 +26,7 @@
}
void
-on_stopped_signal (const UString &a_reason,
+on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -34,7 +34,7 @@
{
if (a_cookie.empty ()) {}
- std::cout << "stopped, reason: " << a_reason << " " ;
+ std::cout << "stopped, reason: " << (int)a_reason << " " ;
if (a_has_frame) {
std::cout << "in frame: " << a_frame.function_name () ;
}
Modified: trunk/tests/test-deref.cc
==============================================================================
--- trunk/tests/test-deref.cc (original)
+++ trunk/tests/test-deref.cc Sun May 18 12:52:54 2008
@@ -93,7 +93,7 @@
}
}
void
-on_stopped_signal (const UString &a_reason,
+on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -104,15 +104,15 @@
BOOST_REQUIRE (a_debugger) ;
- if (a_reason == "exited-normally") {
- loop->quit () ;
+ if (a_reason == IDebugger::EXITED_NORMALLY) {
+ loop->quit ();
BOOST_REQUIRE_MESSAGE (nb_derefed == 3,
- "nb_derefed is " << nb_derefed) ;
+ "nb_derefed is " << nb_derefed) ;
BOOST_REQUIRE_MESSAGE (nb_type_set == 3,
- "nb_type_set is " << nb_type_set) ;
- return ;
+ "nb_type_set is " << nb_type_set) ;
+ return;
}
- ++nb_stops ;
+ ++nb_stops;
if (a_frame.function_name () == "main" && nb_stops == 4) {
a_debugger->print_variable_value ("foo_ptr") ;
Modified: trunk/tests/test-local-vars-list.cc
==============================================================================
--- trunk/tests/test-local-vars-list.cc (original)
+++ trunk/tests/test-local-vars-list.cc Sun May 18 12:52:54 2008
@@ -18,7 +18,7 @@
static int nb_var_value_set=0 ;
void
-on_stopped_signal (const UString &a_reason,
+on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -31,9 +31,9 @@
BOOST_REQUIRE (a_debugger) ;
BOOST_REQUIRE (a_var_list) ;
- MESSAGE ("stopped, reason: " << a_reason) ;
+ MESSAGE ("stopped, reason: " << (int)a_reason) ;
- if (a_reason == "exited-normally") {
+ if (a_reason == IDebugger::EXITED_NORMALLY) {
//okay, time to get out. Let's check if the overall test
//went like we want
BOOST_REQUIRE_MESSAGE (nb_var_type_set == 3,
Modified: trunk/tests/test-var-list.cc
==============================================================================
--- trunk/tests/test-var-list.cc (original)
+++ trunk/tests/test-var-list.cc Sun May 18 12:52:54 2008
@@ -42,7 +42,7 @@
}
void
-on_stopped_signal (const UString &a_reason,
+on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -51,12 +51,12 @@
{
BOOST_REQUIRE (a_debugger) ;
- if (a_reason.empty () || a_has_frame || a_frame.level () || a_thread_id ||
+ if (a_has_frame || a_frame.level () || a_thread_id ||
a_cookie.empty () || a_debugger) {
/*keeps compiler happy*/
}
- if (a_reason == "exited-normally") {
+ if (a_reason == IDebugger::EXITED_NORMALLY) {
MESSAGE ("program exited normally") ;
s_loop->quit () ;
return ;
@@ -231,7 +231,7 @@
debugger->program_finished_signal ().connect (&on_program_finished_signal);
debugger->running_signal ().connect (&on_running_signal) ;
debugger->stopped_signal ().connect (sigc::bind (&on_stopped_signal,
- debugger)) ;
+ debugger)) ;
debugger->variable_value_signal ().connect
(sigc::bind (&on_variable_value_signal, var_list)) ;
debugger->variable_type_signal ().connect
Modified: trunk/tests/test-var-walker.cc
==============================================================================
--- trunk/tests/test-var-walker.cc (original)
+++ trunk/tests/test-var-walker.cc Sun May 18 12:52:54 2008
@@ -88,7 +88,7 @@
}
void
-on_stopped_signal (const UString &a_reason,
+on_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &a_frame,
int a_thread_id,
@@ -97,12 +97,12 @@
{
BOOST_REQUIRE (a_debugger) ;
- if (a_reason.empty () || a_has_frame || a_frame.level () || a_thread_id ||
+ if (a_has_frame || a_frame.level () || a_thread_id ||
a_cookie.empty () || a_debugger) {
/*keeps compiler happy*/
}
- if (a_reason == "exited-normally") {
+ if (a_reason == IDebugger::EXITED_NORMALLY) {
MESSAGE ("program exited normally") ;
s_loop->quit () ;
return ;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
