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

[Vladimir Prus <vladimir@codesourcery.com>]

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.

- Volodya

	* mi/mi-cmd-var.c (mi_cmd_var_update): If varobj's
	thread is running, skip the varobj.
	* Makefile.in: Update dependencies.
---
 gdb/Makefile.in     |    3 ++-
 gdb/mi/mi-cmd-var.c |   16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 779b99a..ceff555 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -3256,7 +3256,8 @@ mi-cmd-target.o: $(srcdir)/mi/mi-cmd-target.c $(defs_h) $(mi_cmds_h) \
 	$(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)
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 0adcf1f..d348cb5 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -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,19 @@ mi_cmd_var_update (char *command, char **argv, int argc)
       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_running = 0;
+	  if (thread_id == 0 && is_executing (inferior_ptid))
+	    thread_running = 1;
+	  else if (thread_id > 0)
+	    {
+	      struct thread_info *tp = find_thread_id (thread_id);
+	      if (tp)
+		thread_running = is_running (tp->ptid);
+	    }
+	  if (!thread_running)
+	    if (*name == '*' || varobj_floating_p (*cr))
+	      varobj_update_one (*cr, print_values, 0 /* implicit */);
 	  cr++;
 	}
       do_cleanups (cleanup);
-- 
1.5.3.5