Re: [patch 2/2] Fix watchpoints for multi-inferior #2

[Pedro Alves <palves@redhat.com>]

On 01/25/2012 06:03 PM, Pedro Alves wrote:
> On 01/25/2012 05:27 PM, Pedro Alves wrote:
>> On 01/25/2012 03:22 PM, Jan Kratochvil wrote:

>> I really would like to get back to getting rid of those cont_thread
>> bits, but, this patch, very similar to the one linked above (which fixed
>> it for vAttach), completely fixes this testcase as well.
> 
> Bah, no, it is still not sufficient.  Don't know why it passed for me
> before.  Looking again...
> 
>> The issue is that cont_thread is also stale from the previous run, when we
>> start a new vRun.  So I think the patch below is correct, and should
>> be applied.

This one is sufficient.  The hints were all in your patch already, but
I guess I'm slow today.

Makes no sense setting the cont_thread to a process wildcard, there's no
such thing in the protocol.  So this brings in a variant of your patch,
that fixes it early on, instead of late in the target, along with clearing
cont_thread on vRun.

gdb/gdbserver/
2012-01-25  Pedro Alves  <palves@redhat.com>
	    Jan Kratochvil  <jan.kratochvil@redhat.com>

	* server.c (start_inferior): Clear `cont_thread'.
	(handle_v_cont): Don't set `cont_thread' if resuming all threads
	of a process.
---

 gdb/gdbserver/server.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index c1788a9..aedf6f5 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -259,6 +259,10 @@ start_inferior (char **argv)
   signal (SIGTTIN, SIG_DFL);
 #endif

+  /* Clear this so the backend doesn't get confused, thinking
+     CONT_THREAD died, and it needs to resume all threads.  */
+  cont_thread = null_ptid;
+
   signal_pid = create_inferior (new_argv[0], new_argv);

   /* FIXME: we don't actually know at this point that the create
@@ -1902,7 +1906,8 @@ handle_v_cont (char *own_buf)

   /* Still used in occasional places in the backend.  */
   if (n == 1
-      && !ptid_equal (resume_info[0].thread, minus_one_ptid)
+      && !(ptid_equal (resume_info[0].thread, minus_one_ptid)
+	   || ptid_get_lwp (resume_info[0].thread) == -1)
       && resume_info[0].kind != resume_stop)
     cont_thread = resume_info[0].thread;
   else