Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* [RFA] Implement *running.
@ 2008-05-01 13:36 Vladimir Prus
  2008-05-02  9:57 ` Eli Zaretskii
  2008-05-02 15:59 ` Daniel Jacobowitz
  0 siblings, 2 replies; 10+ messages in thread
From: Vladimir Prus @ 2008-05-01 13:36 UTC (permalink / raw)
  To: gdb-patches


As previously discussed, we need a new async notification for MI --
"*running", that is output whenever any thread, or entire program is
resumed. We have "^running" but this one is a response to a command,
and therefore can be emitted only once.

This patch introduces new observer, makes that observer called, and
make MI connect to that observer. In the case of MT programs, or
targets where main thread is always added to the thread table, we 
just use a flag inside thread_info.  For the case of target where main
thread of ST program is not added to the table, we just use the global
flag. (I could not test on any such target).

This has no regressions in default and async modes on x86. OK?

- Volodya

	* Makefile.in: Update dependencies.
	* doc/observer.texi (target_resumed): New observer.
	* gdbthread.h (struct thread_info): New field
	running_.
	(set_running, is_running): New.
	* thread.c (set_running, is_running): New.
	* inferior.h (suppress_normal_stop_observer): Rename to...
	(suppress_run_stop_observers): ..this.
	* infcmd.c (suppress_normal_stop_observer): Rename to...
	(suppress_run_stop_observers): ..this.
	(finish_command_continuation, finish_command): Adjust.
	* infcall.c (call_function_by_hand): Adjust.
	* infrun.c (normal_stop): Call set_running.
	* target.c (target_resume): New.  Call set_running.
	* target.h (target_resume): Convert from macro to
	a function.

	* mi/mi-interp.c (mi_on_resume): New.
	(mi_interpreter_init): Register mi_on_resume.

	[testsuite]
	* gdb.mi/mi-break.exp: Adjust.
	* gdb.mi/mi-console.exp: Adjust.
	* gdb.mi/mi-syn-frame.exp: Adjust.
	* gdb.mi/mi2-console.exp: Adjust.
	* gdb.mi/mi2-syn-frame.exp: Adjust.
	* lib/mi-support.exp (mi_run_cmd): Adjust.
	(mi_send_resuming_command): Adjust.
---
 gdb/Makefile.in                        |    2 +-
 gdb/doc/observer.texi                  |    4 ++
 gdb/gdbthread.h                        |   11 ++++++
 gdb/infcall.c                          |    2 +-
 gdb/infcmd.c                           |    9 +++--
 gdb/inferior.h                         |    2 +-
 gdb/infrun.c                           |    3 +-
 gdb/mi/mi-interp.c                     |   15 ++++++++
 gdb/target.c                           |    9 +++++
 gdb/target.h                           |    6 +---
 gdb/testsuite/gdb.mi/mi-break.exp      |    4 +-
 gdb/testsuite/gdb.mi/mi-console.exp    |    2 +-
 gdb/testsuite/gdb.mi/mi-syn-frame.exp  |   12 +++----
 gdb/testsuite/gdb.mi/mi2-console.exp   |    2 +-
 gdb/testsuite/gdb.mi/mi2-syn-frame.exp |   12 +++----
 gdb/testsuite/lib/mi-support.exp       |    6 ++--
 gdb/thread.c                           |   61 ++++++++++++++++++++++++++++++++
 17 files changed, 128 insertions(+), 34 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5ab8caa..124e94c 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2904,7 +2904,7 @@ symtab.o: symtab.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(gdbcore_h) \
 target.o: target.c $(defs_h) $(gdb_string_h) $(target_h) $(gdbcmd_h) \
 	$(symtab_h) $(inferior_h) $(bfd_h) $(symfile_h) $(objfiles_h) \
 	$(gdb_wait_h) $(dcache_h) $(regcache_h) $(gdb_assert_h) $(gdbcore_h) \
-	$(exceptions_h) $(target_descriptions_h) $(gdb_stdint_h)
+	$(exceptions_h) $(target_descriptions_h) $(gdb_stdint_h) $(gdbthread_h)
 target-descriptions.o: target-descriptions.c $(defs_h) $(arch_utils_h) \
 	$(target_h) $(target_descriptions_h) $(vec_h) $(xml_tdesc_h) \
 	$(gdbcmd_h) $(gdb_assert_h) $(gdbtypes_h) $(reggroups_h) \
diff --git a/gdb/doc/observer.texi b/gdb/doc/observer.texi
index af3835b..b83d642 100644
--- a/gdb/doc/observer.texi
+++ b/gdb/doc/observer.texi
@@ -135,5 +135,9 @@ The thread specified by @var{t} has been created.
 
 @deftypefun void thread_exit (struct thread_info *@var{t})
 The thread specified by @var{t} has exited.
+
+@deftypefun void target_resumed (ptid_t @var{ptid})
+The target was resumed.  The @var{ptid} parameter specifies which
+thread was resume, and may be RESUME_ALL if all threads are resumed.
 @end deftypefun
 
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 56cbd51..8e0da6f 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -69,6 +69,10 @@ struct thread_info
 
   int proceed_to_finish;
 
+  /* This field is internal for thread.c.  Never access it directly,
+     use is_running instead.  */
+  int running_;
+
   /* Private data used by the target vector implementation.  */
   struct private_thread_info *private;
 };
@@ -162,6 +166,13 @@ extern void load_infrun_state (ptid_t ptid,
 /* Switch from one thread to another.  */
 extern void switch_to_thread (ptid_t ptid);
 
+/* Marks thread PTID is running, or stopped. 
+   If PIDGET (PTID) is -1, marks all threads.  */
+extern void set_running (ptid_t ptid, int running);
+
+/* Reports if thread PTID is know to be running right now.  */
+extern int is_running (ptid_t ptid);
+
 /* Commands with a prefix of `thread'.  */
 extern struct cmd_list_element *thread_cmd_list;
 
diff --git a/gdb/infcall.c b/gdb/infcall.c
index d8257da..28408ec 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -721,7 +721,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
       saved_async = target_async_mask (0);
 
     old_cleanups2 = make_cleanup_restore_integer 
-      (&suppress_normal_stop_observer, 1);
+      (&suppress_run_stop_observers, 1);
     proceed (real_pc, TARGET_SIGNAL_0, 0);
     do_cleanups (old_cleanups2);
     
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 37ca2bb..b672b6a 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -206,8 +206,9 @@ int step_multi;
 
 struct gdb_environ *inferior_environ;
 
-/* When set, normal_stop will not call the normal_stop observer.  */
-int suppress_normal_stop_observer = 0;
+/* When set, normal_stop will not call the normal_stop observer.
+   Resume observer likewise will not be called.  */
+int suppress_run_stop_observers = 0;
 \f
 /* Accessor routines. */
 
@@ -1288,7 +1289,7 @@ finish_command_continuation (struct continuation_arg *arg, int error_p)
       observer_notify_normal_stop (stop_bpstat);
     }
 
-  suppress_normal_stop_observer = 0;
+  suppress_run_stop_observers = 0;
   delete_breakpoint (breakpoint);
 }
 
@@ -1355,7 +1356,7 @@ finish_command (char *arg, int from_tty)
     }
 
   proceed_to_finish = 1;	/* We want stop_registers, please...  */
-  make_cleanup_restore_integer (&suppress_normal_stop_observer, 1);
+  make_cleanup_restore_integer (&suppress_run_stop_observers, 1);
   proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
 
   arg1 =
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 630cc52..8958aef 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -401,7 +401,7 @@ void displaced_step_dump_bytes (struct ui_file *file,
 
 
 /* When set, normal_stop will not call the normal_stop observer.  */
-extern int suppress_normal_stop_observer;
+extern int suppress_run_stop_observers;
 \f
 /* Possible values for gdbarch_call_dummy_location.  */
 #define ON_STACK 1
diff --git a/gdb/infrun.c b/gdb/infrun.c
index e153cba..170ee81 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3631,11 +3631,12 @@ Further execution is probably impossible.\n"));
 
 done:
   annotate_stopped ();
-  if (!suppress_normal_stop_observer && !step_multi)
+  if (!suppress_run_stop_observers && !step_multi)
     observer_notify_normal_stop (stop_bpstat);
   /* Delete the breakpoint we stopped at, if it wants to be deleted.
      Delete any breakpoint that is to be deleted at the next stop.  */
   breakpoint_auto_delete (stop_bpstat);
+  set_running (pid_to_ptid (-1), 0);
 }
 
 static int
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index a9a5ffc..4ba1ce1 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -69,6 +69,7 @@ static void mi_on_normal_stop (struct bpstats *bs);
 
 static void mi_new_thread (struct thread_info *t);
 static void mi_thread_exit (struct thread_info *t);
+static void mi_on_resume (ptid_t ptid);
 
 static void *
 mi_interpreter_init (int top_level)
@@ -94,6 +95,7 @@ mi_interpreter_init (int top_level)
       observer_attach_new_thread (mi_new_thread);
       observer_attach_thread_exit (mi_thread_exit);
       observer_attach_normal_stop (mi_on_normal_stop);
+      observer_attach_target_resumed (mi_on_resume);
     }
 
   return mi;
@@ -317,6 +319,19 @@ mi_on_normal_stop (struct bpstats *bs)
   gdb_flush (raw_stdout);
 }
 
+static void
+mi_on_resume (ptid_t ptid)
+{
+  if (PIDGET (ptid) == -1)
+    fprintf_unfiltered (raw_stdout, "*running,thread-id=\"all\"\n");
+  else
+    {
+      struct thread_info *ti = find_thread_pid (ptid);
+      gdb_assert (ti);
+      fprintf_unfiltered (raw_stdout, "*running,thread-id=\"%d\"\n", ti->num);
+    }
+}
+
 extern initialize_file_ftype _initialize_mi_interp; /* -Wmissing-prototypes */
 
 void
diff --git a/gdb/target.c b/gdb/target.c
index 944d601..162196f 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -40,6 +40,7 @@
 #include "exceptions.h"
 #include "target-descriptions.h"
 #include "gdb_stdint.h"
+#include "gdbthread.h"
 
 static void target_info (char *, int);
 
@@ -1705,6 +1706,14 @@ target_disconnect (char *args, int from_tty)
   tcomplain ();
 }
 
+void
+target_resume (ptid_t ptid, int step, enum target_signal signal)
+{
+  dcache_invalidate (target_dcache);
+  (*current_target.to_resume) (ptid, step, signal);
+  set_running (ptid, 1);
+
+}
 /* Look through the list of possible targets for a target that can
    follow forks.  */
 
diff --git a/gdb/target.h b/gdb/target.h
index e0341e1..ffabb0e 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -567,11 +567,7 @@ extern void target_disconnect (char *, int);
    the target, or TARGET_SIGNAL_0 for no signal.  The caller may not
    pass TARGET_SIGNAL_DEFAULT.  */
 
-#define	target_resume(ptid, step, siggnal)				\
-  do {									\
-    dcache_invalidate(target_dcache);					\
-    (*current_target.to_resume) (ptid, step, siggnal);			\
-  } while (0)
+extern void target_resume (ptid_t ptid, int step, enum target_signal signal);
 
 /* Wait for process pid to do something.  PTID = -1 to wait for any
    pid to do something.  Return pid of child, or -1 in case of error;
diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp
index 48527fd..b895020 100644
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -174,11 +174,11 @@ proc test_error {} {
     # containing function call, the internal breakpoint created to handle
     # function call would be reported, messing up MI output.
     mi_gdb_test "-var-create V * return_1()" \
-        "\\^done,name=\"V\",numchild=\"0\",value=\"1\",type=\"int\"" \
+        ".*\\^done,name=\"V\",numchild=\"0\",value=\"1\",type=\"int\"" \
         "create varobj for function call"
 
     mi_gdb_test "-var-update *" \
-        "\\^done,changelist=\\\[\\\]" \
+        ".*\\^done,changelist=\\\[\\\]" \
         "update varobj for function call"    
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index 7d093dc..70d9342 100644
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -52,7 +52,7 @@ mi_run_to_main
 
 # Next over the hello() call which will produce lots of output
 mi_gdb_test "220-exec-next" \
-	    "220\\^running" \
+	    "220\\^running(\r\n\\*running,thread-id=\"all\")?" \
 	    "Testing console output" \
 	    "Hello \\\\\"!\[\r\n\]+"
 
diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
index 208678b..59b8e44 100644
--- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
@@ -46,7 +46,7 @@ mi_create_breakpoint "foo" 2 keep foo ".*mi-syn-frame.c" $decimal $hex \
 # Call foo() by hand, where we'll hit a breakpoint.
 #
 
-mi_gdb_test "401-data-evaluate-expression foo()" "401\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(foo\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" "call inferior's function with a breakpoint set in it"
+mi_gdb_test "401-data-evaluate-expression foo()" ".*401\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(foo\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" "call inferior's function with a breakpoint set in it"
 
 
 mi_gdb_test "402-stack-list-frames" "402\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\}.*\\\]" "backtrace from inferior function stopped at bp, showing gdb dummy frame"
@@ -54,9 +54,7 @@ mi_gdb_test "402-stack-list-frames" "402\\^done,stack=\\\[frame=\{level=\"0\",ad
 #
 # Continue back to main()
 #
-mi_gdb_test "403-exec-continue" \
-  "403\\^running" \
-  "testing exec continue"
+mi_send_resuming_command "exec-continue" "testing exec continue"
 
 mi_expect_stop "really-no-reason" "" "" "" "" "" "finished exec continue"
 
@@ -73,7 +71,7 @@ mi_create_breakpoint "subroutine" 3 keep subroutine ".*mi-syn-frame.c" $decimal
     "insert breakpoint subroutine"
 
 mi_gdb_test "406-data-evaluate-expression have_a_very_merry_interrupt()" \
-  "406\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" \
+  ".*406\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" \
   "data evaluate expression"
 
 # We should have both a signal handler and a call dummy frame
@@ -84,7 +82,7 @@ mi_gdb_test "407-stack-list-frames" \
   "list stack frames"
 
 
-mi_gdb_test "408-exec-continue" "408\\^running"
+mi_send_resuming_command "exec-continue" "testing exec continue"
 
 mi_expect_stop "really-no-reason" "" "" "" "" "" "finished exec continue"
 
@@ -97,7 +95,7 @@ mi_gdb_test "409-stack-list-frames 0 0" \
 # 
 
 mi_gdb_test "410-data-evaluate-expression bar()" \
-  "410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" \
+  ".*410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" \
   "call inferior function which raises exception"
 
 mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"}.*\\\]" "backtrace from inferior function at exception"
diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
index 88b4fdd..c5f6f81 100644
--- a/gdb/testsuite/gdb.mi/mi2-console.exp
+++ b/gdb/testsuite/gdb.mi/mi2-console.exp
@@ -53,7 +53,7 @@ mi_run_to_main
 # Next over the hello() call which will produce lots of output
 send_gdb "220-exec-next\n"
 gdb_expect {
-    -re "220\\^running\r\n$mi_gdb_prompt" {
+    -re "220\\^running\r\n(\\*running,thread-id=\"all\"\r\n)?$mi_gdb_prompt" {
 	pass "Started step over hello"
     }
     timeout {
diff --git a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
index b69812f..948e98d 100644
--- a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
@@ -48,7 +48,7 @@ mi_create_breakpoint "foo" 2 keep foo ".*mi-syn-frame.c" $decimal $hex \
 # Call foo() by hand, where we'll hit a breakpoint.
 #
 
-mi_gdb_test "401-data-evaluate-expression foo()" "401\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(foo\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" "call inferior's function with a breakpoint set in it"
+mi_gdb_test "401-data-evaluate-expression foo()" ".*401\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(foo\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" "call inferior's function with a breakpoint set in it"
 
 mi_gdb_test "402-stack-list-frames" "402\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\}.*\\\]" "backtrace from inferior function stopped at bp, showing gdb dummy frame"
 
@@ -56,9 +56,7 @@ mi_gdb_test "402-stack-list-frames" "402\\^done,stack=\\\[frame=\{level=\"0\",ad
 # Continue back to main()
 #
 
-mi_gdb_test "403-exec-continue" \
-  "403\\^running" \
-  "testing exec continue"
+mi_send_resuming_command "exec-continue" "testing exec continue"
 
 mi_expect_stop "really-no-reason" "" "" "" "" "" "finished exec continue"
 
@@ -75,7 +73,7 @@ mi_create_breakpoint "subroutine" 3 keep subroutine ".*mi-syn-frame.c" $decimal
     "insert breakpoint subroutine"
 
 mi_gdb_test "406-data-evaluate-expression have_a_very_merry_interrupt()" \
-  "406\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" \
+  ".*406\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\"" \
   "evaluate expression have_a_very_merry_interrupt"
 
 # We should have both a signal handler and a call dummy frame
@@ -85,7 +83,7 @@ mi_gdb_test "407-stack-list-frames" \
   "407\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"subroutine\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"handler\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"<signal handler called>\"\},.*frame=\{level=\"$decimal\",addr=\"$hex\",func=\"have_a_very_merry_interrupt\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\}.*\\\]" \
   "list stack frames"
 
-mi_gdb_test "408-exec-continue" "408\\^running"
+mi_send_resuming_command "exec-continue" "testing exec continue"
 
 mi_expect_stop "really-no-reason" "" "" "" "" "" "finished exec continue"
 
@@ -97,7 +95,7 @@ mi_gdb_test "409-stack-list-frames 0 0" \
 # Call bar() by hand, which should get an exception while running.
 # 
 
-mi_gdb_test "410-data-evaluate-expression bar()" "410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" "call inferior function which raises exception"
+mi_gdb_test "410-data-evaluate-expression bar()" ".*410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" "call inferior function which raises exception"
 
 mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"}.*\\\]" "backtrace from inferior function at exception"
 
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 0783936..b373bd5 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -802,7 +802,7 @@ proc mi_run_cmd {args} {
 	if [target_info exists gdb,do_reload_on_run] {
 	    send_gdb "220-exec-continue\n";
 	    gdb_expect 60 {
-		-re "220\\^running\[\r\n\]+$mi_gdb_prompt$" {}
+		-re "220\\^running\[\r\n\]+(\\*running,thread-id=\"\[^\"\]+\"\r\n)?$mi_gdb_prompt$" {}
 		default {}
 	    }
 	    return;
@@ -823,7 +823,7 @@ proc mi_run_cmd {args} {
 
     send_gdb "220-exec-run $args\n"
     gdb_expect {
-	-re "220\\^running\r\n${mi_gdb_prompt}" {
+	-re "220\\^running\r\n(\\*running,thread-id=\"\[^\"\]+\"\r\n)?${mi_gdb_prompt}" {
 	}
 	timeout {
 	    perror "Unable to start target"
@@ -1399,7 +1399,7 @@ proc mi_send_resuming_command {command test} {
 
     send_gdb "220-$command\n"
     gdb_expect {
-        -re "220\\^running\r\n${mi_gdb_prompt}" {
+        -re "220\\^running\r\n(\\*running,thread-id=\"\[^\"\]+\"\r\n)?${mi_gdb_prompt}" {
         }
         -re ".*${mi_gdb_prompt}" {
             fail "$test (failed to resume)"
diff --git a/gdb/thread.c b/gdb/thread.c
index bba32e8..47a573c 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -437,6 +437,67 @@ prune_threads (void)
     }
 }
 
+static int main_thread_running = 0;
+
+void
+set_running (ptid_t ptid, int running)
+{
+  struct thread_info *tp;
+
+  if (!thread_list)
+    {
+      /* This is one of the targets that does not add main
+	 thread to the thread list.  Just use a single
+	 global flag to indicate that a thread is running.  
+
+	 This problem is unique to ST programs.  For MT programs,
+	 the main thread is always present in the thread list.  If it's
+	 not, the first call to context_switch will mess up GDB internal
+	 state.  */
+      main_thread_running = running;
+      return;
+    }
+
+  /* We try not to notify the observer is not
+     thread has actually changed the running
+     state -- merely to reduce the number of
+     messages to frontend.  Frontend is supposed
+     to handle multiple *running just fine.  */
+  if (PIDGET (ptid) == -1)
+    {
+      int any_started = 0;
+      for (tp = thread_list; tp; tp = tp->next)
+	{
+	  if (running && !tp->running_)
+	    any_started = 1;
+	  tp->running_ = running;
+	}
+      if (any_started && !suppress_run_stop_observers)
+	observer_notify_target_resumed (ptid);      
+    }
+  else
+    {
+      tp = find_thread_pid (ptid);
+      gdb_assert (tp);
+      if (running && !tp->running_ && !suppress_run_stop_observers)
+	observer_notify_target_resumed (ptid);
+      tp->running_ = running;
+    }  
+}
+
+int
+is_running (ptid_t ptid)
+{
+  struct thread_info *tp;
+
+  if (!thread_list)
+    return main_thread_running;
+
+  tp = find_thread_pid (ptid);
+  gdb_assert (tp);
+  return tp->running_;  
+}
+
 /* Prints the list of threads and their details on UIOUT.
    This is a version of 'info_thread_command' suitable for
    use from MI.  
-- 
1.5.3.5


^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2008-06-10 10:26 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-01 13:36 [RFA] Implement *running Vladimir Prus
2008-05-02  9:57 ` Eli Zaretskii
2008-05-02 15:59 ` Daniel Jacobowitz
2008-05-04 16:33   ` Vladimir Prus
2008-05-04 19:50     ` Eli Zaretskii
2008-05-11 15:32       ` Vladimir Prus
2008-05-11 21:46         ` Eli Zaretskii
2008-05-27 19:07     ` Vladimir Prus
2008-06-05 15:50       ` Daniel Jacobowitz
2008-06-10 12:43         ` Vladimir Prus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox