Re: [PATCH 01/10] change gdb to refcount bfd everywhere

[Tom Tromey <tromey@redhat.com>]

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

Tom> Here is the patch.

Oops, I sent the wrong one.
The right one has the gdb_bfd.h include.
Sorry about that.

Tom

2012-07-23  Tom Tromey  <tromey@redhat.com>

	* solib-svr4.c (enable_break): Update.
	* bfd-target.h (target_bfd_reopen): Update documentation.

Index: bfd-target.h
===================================================================
RCS file: /cvs/src/src/gdb/bfd-target.h,v
retrieving revision 1.10
diff -u -r1.10 bfd-target.h
--- bfd-target.h	4 Jan 2012 08:16:59 -0000	1.10
+++ bfd-target.h	23 Jul 2012 15:24:45 -0000
@@ -23,9 +23,9 @@
 struct bfd;
 struct target_ops;
 
-/* Given an existing BFD, re-open it as a "struct target_ops".  On
-   close, it will also close the corresponding BFD (which is like
-   freopen and fdopen).  */
+/* Given an existing BFD, re-open it as a "struct target_ops".  This
+   acquires a new reference to the BFD.  This reference will be
+   released when the target is closed.  */
 struct target_ops *target_bfd_reopen (struct bfd *bfd);
 
 #endif
Index: solib-svr4.c
===================================================================
RCS file: /cvs/src/src/gdb/solib-svr4.c,v
retrieving revision 1.164
diff -u -r1.164 solib-svr4.c
--- solib-svr4.c	5 Jun 2012 15:44:03 -0000	1.164
+++ solib-svr4.c	23 Jul 2012 15:24:45 -0000
@@ -46,6 +46,7 @@
 #include "exec.h"
 #include "auxv.h"
 #include "exceptions.h"
+#include "gdb_bfd.h"
 
 static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
 static int svr4_have_link_map_offsets (void);
@@ -1558,9 +1559,11 @@
 	goto bkpt_at_symbol;
 
       /* Now convert the TMP_BFD into a target.  That way target, as
-         well as BFD operations can be used.  Note that closing the
-         target will also close the underlying bfd.  */
+         well as BFD operations can be used.  */
       tmp_bfd_target = target_bfd_reopen (tmp_bfd);
+      /* target_bfd_reopen acquired its own reference, so we can
+         release ours now.  */
+      gdb_bfd_unref (tmp_bfd);
 
       /* On a running target, we can get the dynamic linker's base
          address from the shared library table.  */
@@ -1670,8 +1673,9 @@
 						       sym_addr,
 						       tmp_bfd_target);
 
-      /* We're done with both the temporary bfd and target.  Remember,
-         closing the target closes the underlying bfd.  */
+      /* We're done with both the temporary bfd and target.  Closing
+         the target closes the underlying bfd, because it holds the
+         only remaining reference.  */
       target_close (tmp_bfd_target, 0);
 
       if (sym_addr != 0)