[gdbserver/win32]: Ignore OUTPUT_DEBUG_STRING_EVENT events when remote is not connected.

[gdbserver/win32]: Ignore OUTPUT_DEBUG_STRING_EVENT events when remote is not connected.

[Pedro Alves]

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

Hi,

OUTPUT_DEBUG_STRING_EVENT events can happen from after the inferior
is created, until it is stopped at the initial breakpoint, waiting
for gdb.  The OUTPUT_DEBUG_STRING_EVENT handler doesn't currently
check if a remote connection is open before sending data, generating
annoying putpkt error logs to gdbserver's console.  This
patch fixes it by simply ignoring those events when there isn't any
gdb connected yet.  I didn't use server_wait, because this event
is also handled in win32_kill, outside of a wait.

Cheers,
Pedro Alves


[-- Attachment #2: outputdebugstring_not_connected.diff --]
[-- Type: text/x-diff, Size: 1838 bytes --]

2007-07-08  Pedro Alves  <pedro_alves@portugalmail.pt>

	* server.h (remote_connected): Declare.
	* remote-utils.c (remote_connected): Define.
	* win32-low.c (handle_output_debug_string): Don't send data to a
	non-existing remote.

---
 gdb/gdbserver/remote-utils.c |    6 ++++++
 gdb/gdbserver/server.h       |    2 ++
 gdb/gdbserver/win32-low.c    |    3 +++
 3 files changed, 11 insertions(+)

Index: src/gdb/gdbserver/remote-utils.c
===================================================================
--- src.orig/gdb/gdbserver/remote-utils.c	2007-07-08 00:58:26.000000000 +0100
+++ src/gdb/gdbserver/remote-utils.c	2007-07-08 01:04:38.000000000 +0100
@@ -1242,3 +1242,9 @@ xml_escape_text (const char *text)
 
   return result;
 }
+
+int
+remote_connected (void)
+{
+  return (remote_desc != -1);
+}
Index: src/gdb/gdbserver/win32-low.c
===================================================================
--- src.orig/gdb/gdbserver/win32-low.c	2007-07-08 00:52:44.000000000 +0100
+++ src/gdb/gdbserver/win32-low.c	2007-07-08 01:05:52.000000000 +0100
@@ -544,6 +544,9 @@ handle_output_debug_string (struct targe
   char s[READ_BUFFER_LEN + 1] = { 0 };
   DWORD nbytes = current_event.u.DebugString.nDebugStringLength;
 
+  if (!remote_connected ())
+    return;
+
   if (nbytes == 0)
     return;
 
Index: src/gdb/gdbserver/server.h
===================================================================
--- src.orig/gdb/gdbserver/server.h	2007-07-08 01:01:06.000000000 +0100
+++ src/gdb/gdbserver/server.h	2007-07-08 01:04:54.000000000 +0100
@@ -205,6 +205,8 @@ void monitor_output (const char *msg);
 
 char *xml_escape_text (const char *text);
 
+int remote_connected (void);
+
 /* Functions from ``signals.c''.  */
 enum target_signal target_signal_from_host (int hostsig);
 int target_signal_to_host_p (enum target_signal oursig);

Re: [gdbserver/win32]: Ignore OUTPUT_DEBUG_STRING_EVENT events when remote is not connected.

[Daniel Jacobowitz]

On Sun, Jul 08, 2007 at 02:01:14AM +0100, Pedro Alves wrote:
> Hi,
> 
> OUTPUT_DEBUG_STRING_EVENT events can happen from after the inferior
> is created, until it is stopped at the initial breakpoint, waiting
> for gdb.  The OUTPUT_DEBUG_STRING_EVENT handler doesn't currently
> check if a remote connection is open before sending data, generating
> annoying putpkt error logs to gdbserver's console.  This
> patch fixes it by simply ignoring those events when there isn't any
> gdb connected yet.  I didn't use server_wait, because this event
> is also handled in win32_kill, outside of a wait.

But don't you want to discard it if you're outside of a wait?  I don't
see how GDB would display them otherwise; remote_wait handles the 'O'
response.

-- 
Daniel Jacobowitz
CodeSourcery

Re: [gdbserver/win32]: Ignore OUTPUT_DEBUG_STRING_EVENT events when remote is not connected.

[Pedro Alves]

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

Daniel Jacobowitz wrote:
> On Sun, Jul 08, 2007 at 02:01:14AM +0100, Pedro Alves wrote:
>> Hi,
>>
>> OUTPUT_DEBUG_STRING_EVENT events can happen from after the inferior
>> is created, until it is stopped at the initial breakpoint, waiting
>> for gdb.  The OUTPUT_DEBUG_STRING_EVENT handler doesn't currently
>> check if a remote connection is open before sending data, generating
>> annoying putpkt error logs to gdbserver's console.  This
>> patch fixes it by simply ignoring those events when there isn't any
>> gdb connected yet.  I didn't use server_wait, because this event
>> is also handled in win32_kill, outside of a wait.
> 
> But don't you want to discard it if you're outside of a wait?  I don't
> see how GDB would display them otherwise; remote_wait handles the 'O'
> response.
> 

I woke up this morning hoping you still hadn't looked at this
path yet.  :)  Sorry for the extra review work.

Here goes a new version using server_waiting.  If you don't mind, I would
like to keep the option to see the outputs in debug mode.  I've had a use
for it in the past.

Cheers,
Pedro Alves




[-- Attachment #2: outputdebugstring_no_server_waiting.diff --]
[-- Type: text/x-diff, Size: 755 bytes --]

2007-07-08  Pedro Alves  <pedro_alves@portugalmail.pt>

	* win32-low.c (handle_output_debug_string): Ignore event if not	waiting.

---
 gdb/gdbserver/win32-low.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Index: src/gdb/gdbserver/win32-low.c
===================================================================
--- src.orig/gdb/gdbserver/win32-low.c	2007-07-08 15:14:56.000000000 +0100
+++ src/gdb/gdbserver/win32-low.c	2007-07-08 15:27:26.000000000 +0100
@@ -568,7 +568,15 @@ handle_output_debug_string (struct targe
     }
 
   if (strncmp (s, "cYg", 3) != 0)
-    monitor_output (s);
+    {
+      if (!server_waiting)
+	{
+	  OUTMSG2(("%s", s));
+	  return;
+	}
+
+      monitor_output (s);
+    }
 #undef READ_BUFFER_LEN
 }
 

Re: [gdbserver/win32]: Ignore OUTPUT_DEBUG_STRING_EVENT events when remote is not connected.

[Daniel Jacobowitz]

On Sun, Jul 08, 2007 at 03:29:28PM +0100, Pedro Alves wrote:
> I woke up this morning hoping you still hadn't looked at this
> path yet.  :)  Sorry for the extra review work.
> 
> Here goes a new version using server_waiting.  If you don't mind, I would
> like to keep the option to see the outputs in debug mode.  I've had a use
> for it in the past.

I was even going to suggest it :-)

> 2007-07-08  Pedro Alves  <pedro_alves@portugalmail.pt>
> 
> 	* win32-low.c (handle_output_debug_string): Ignore event if not	waiting.

OK, thanks.

-- 
Daniel Jacobowitz
CodeSourcery