Re: [MI non-stop 10/11] Skip varobj in running threads.

[Vladimir Prus <vladimir@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

Vladimir Prus wrote:

> 
> If a variable object is bound to a specific thread, and we're doing
> 
>   -var-update *
> 
> and varobj's thread is running, we cannot update varobj -- so we skip it.
> Will commit when core non-stop is in.

I've checked in the following revision.

- Volodya



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: commit.diff --]
[-- Type: text/x-diff; name="commit.diff", Size: 2832 bytes --]

Index: gdb/ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.9558
diff -u -p -r1.9558 ChangeLog
--- gdb/ChangeLog	13 Jul 2008 04:13:49 -0000	1.9558
+++ gdb/ChangeLog	13 Jul 2008 05:29:56 -0000
@@ -1,5 +1,12 @@
 2008-07-13  Vladimir Prus  <vladimir@codesourcery.com>
 
+	Skip varobj in running threads.
+        * mi/mi-cmd-var.c (mi_cmd_var_update): If varobj's
+        thread is not stopped, skip the varobj.
+        * Makefile.in: Update dependencies.
+
+2008-07-13  Vladimir Prus  <vladimir@codesourcery.com>
+
 	Enable all commands while inferiour is running
         * mi/mi-main.c (mi_cmd_execute): Don't check if
         inferiour is executing.
Index: gdb/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.1036
diff -u -p -r1.1036 Makefile.in
--- gdb/Makefile.in	12 Jul 2008 22:16:34 -0000	1.1036
+++ gdb/Makefile.in	13 Jul 2008 05:29:58 -0000
@@ -3256,7 +3256,8 @@ mi-cmd-target.o: $(srcdir)/mi/mi-cmd-tar
 	$(mi_getopt_h) $(remote_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-target.c
 mi-cmd-var.o: $(srcdir)/mi/mi-cmd-var.c $(defs_h) $(mi_cmds_h) $(ui_out_h) \
-	$(mi_out_h) $(varobj_h) $(value_h) $(gdb_string_h) $(mi_getopt_h)
+	$(mi_out_h) $(varobj_h) $(value_h) $(gdb_string_h) $(mi_getopt_h) \
+	$(gdbthread_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-var.c
 mi-console.o: $(srcdir)/mi/mi-console.c $(defs_h) $(mi_console_h) \
 	$(gdb_string_h)
Index: gdb/mi/mi-cmd-var.c
===================================================================
RCS file: /cvs/src/src/gdb/mi/mi-cmd-var.c,v
retrieving revision 1.52
diff -u -p -r1.52 mi-cmd-var.c
--- gdb/mi/mi-cmd-var.c	25 Jun 2008 15:15:42 -0000	1.52
+++ gdb/mi/mi-cmd-var.c	13 Jul 2008 05:30:17 -0000
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include "gdb_string.h"
 #include "mi-getopt.h"
+#include "gdbthread.h"
 
 const char mi_no_values[] = "--no-values";
 const char mi_simple_values[] = "--simple-values";
@@ -610,8 +611,21 @@ mi_cmd_var_update (char *command, char *
       cr = rootlist;
       while (*cr != NULL)
 	{
-	  if (*name == '*' || varobj_floating_p (*cr))
-	    varobj_update_one (*cr, print_values, 0 /* implicit */);
+	  int thread_id = varobj_get_thread_id (*cr);
+	  int thread_stopped = 0;
+	  if (thread_id == -1 && is_stopped (inferior_ptid))
+	    thread_stopped = 1;
+	  else
+	    {	      
+	      struct thread_info *tp = find_thread_id (thread_id);
+	      if (tp)
+		thread_stopped = is_stopped (tp->ptid);
+	      else
+		thread_stopped = 1;
+	    }
+	  if (thread_stopped)
+	    if (*name == '*' || varobj_floating_p (*cr))
+	      varobj_update_one (*cr, print_values, 0 /* implicit */);
 	  cr++;
 	}
       do_cleanups (cleanup);