[2/2] Only leave dprintf inserted if it is marked as persistent (PR breakpoints/17012)

Message ID 1403101571-1190-2-git-send-email-simon.marchi@ericsson.com
State Superseded

Commit Message

Simon Marchi June 18, 2014, 2:26 p.m. UTC
  On Linux native, if dprintf are inserted when detaching, they are left
in the inferior which causes it to crash from a SIGTRAP. It also happens
with dprintfs on remote targets, when set disconnected-dprintf is off.

I believe that the rationale of the line I modified was to leave dprinfs
inserted in order to support disconnected dprintfs. This adds a check to
see if the dprintf should actually stay inserted or not.

bl->target_info.persist will be 1 only if disconnected-dprintf is on and
we are debugging a remote target. On native, it will always be 0,
regardless of the value of disconnected-dprintf. This makes sense, since
disconnected dprintfs are not supported by the native target.


2014-06-18  Simon Marchi  <simon.marchi@ericsson.com>

	PR breakpoints/17012
	* breakpoint.c (remove_breakpoints_pid): Only skip removing
	dprintf if it is marked as persistent.

 gdb/breakpoint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 2240f08..1aa02f9 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3111,7 +3111,7 @@  remove_breakpoints_pid (int pid)
     if (bl->pspace != inf->pspace)
-    if (bl->owner->type == bp_dprintf)
+    if (bl->owner->type == bp_dprintf && bl->target_info.persist == 1)
     if (bl->inserted)