2009-11-03 Paul Pluzhnikov <ppluzhnikov@google.com>

	* linux-thread-db.c (disable_thread_event_reporting): Adjust.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7e6c1d9..b84e553 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-03  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       * linux-thread-db.c (disable_thread_event_reporting): Adjust.
+       
 2009-11-03  Joel Brobecker  <brobecker@adacore.com>
 
        * MAINTAINERS (Responsible Maintainers): Add Tristan Gingold as

diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index ee9c141..ac6a4e5 100644 (file)
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -905,20 +905,18 @@ thread_db_load (void)
 }
 
 static void
-disable_thread_event_reporting (void)
+disable_thread_event_reporting (struct thread_db_info *info)
 {
-  td_thr_events_t events;
-  struct thread_db_info *info;
-
-  info = get_thread_db_info (GET_PID (inferior_ptid));
+  if (info->td_ta_set_event_p != NULL)
+    {
+      td_thr_events_t events;
 
-  /* Set the process wide mask saying we aren't interested in any
-     events anymore.  */
-  td_event_emptyset (&events);
-  info->td_ta_set_event_p (info->thread_agent, &events);
+      /* Set the process wide mask saying we aren't interested in any
+        events anymore.  */
+      td_event_emptyset (&events);
+      info->td_ta_set_event_p (info->thread_agent, &events);
+    }
 
-  /* Delete thread event breakpoints, if any.  */
-  remove_thread_event_breakpoints ();
   info->td_create_bp_addr = 0;
   info->td_death_bp_addr = 0;
 }
@@ -1088,7 +1086,7 @@ thread_db_detach (struct target_ops *ops, char *args, int from_tty)
 
   if (info)
     {
-      disable_thread_event_reporting ();
+      disable_thread_event_reporting (info);
 
       /* Delete the old thread event breakpoints.  Note that unlike
         when mourning, we can remove them here because there's still