darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2009-08-04 Paul Pluzhnikov <ppluzhnikov@google.com>

Browse source 
* objfiles.h (OBJF_KEEPBFD): Delete.
	(gdb_bfd_unref): New prototype.
	* objfiles.c (gdb_bfd_unref): New function.
	(free_objfile): Call gdb_bfd_unref.
	* solib.c (free_so): Likewise.
	(symbol_add_stub): Set refcount.
This commit is contained in:
Paul Pluzhnikov 2009-08-04 18:46:05 +00:00
parent afd0cd3fc1
commit e3c69974ac
4 changed files with 51 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/ChangeLog
View file

@ -1,3 +1,12 @@
2009-08-04 Paul Pluzhnikov <ppluzhnikov@google.com>
* objfiles.h (OBJF_KEEPBFD): Delete.
(gdb_bfd_unref): New prototype.
* objfiles.c (gdb_bfd_unref): New function.
(free_objfile): Call gdb_bfd_unref.
* solib.c (free_so): Likewise.
(symbol_add_stub): Set refcount.
2009-08-04 Hui Zhu <teawater@gmail.com>
Michael Snyder <msnyder@vmware.com>

43
gdb/objfiles.c
View file

@ -452,16 +452,7 @@ free_objfile (struct objfile *objfile)
/* Discard any data modules have associated with the objfile. */
objfile_free_data (objfile);
/* We always close the bfd, unless the OBJF_KEEPBFD flag is set. */
if (objfile->obfd != NULL && !(objfile->flags & OBJF_KEEPBFD))
{
char *name = bfd_get_filename (objfile->obfd);
if (!bfd_close (objfile->obfd))
warning (_("cannot close \"%s\": %s"),
name, bfd_errmsg (bfd_get_error ()));
xfree (name);
}
gdb_bfd_unref (objfile->obfd);
/* Remove it from the chain of all objfiles. */
@ -1020,3 +1011,35 @@ objfiles_changed (void)
{
objfiles_changed_p = 1; /* Rebuild section map next time we need it. */
}
/* Unreference and possibly close abfd. */
void
gdb_bfd_unref (struct bfd *abfd)
{
int *p_refcount;
char *name;
if (abfd == NULL)
return;
p_refcount = abfd->usrdata;
/* Valid range for p_refcount: NULL (single owner), or a pointer
to int counter, which has a value of 1 (single owner) or 2 (shared). */
gdb_assert (p_refcount == NULL || *p_refcount == 1 || *p_refcount == 2);
if (p_refcount != NULL)
{
*p_refcount -= 1;
if (*p_refcount > 0)
return;
}
xfree (p_refcount);
abfd->usrdata = NULL; /* Paranoia. */
name = bfd_get_filename (abfd);
if (!bfd_close (abfd))
warning (_("cannot close \"%s\": %s"),
name, bfd_errmsg (bfd_get_error ()));
xfree (name);
}

8
gdb/objfiles.h
View file

@ -414,12 +414,6 @@ struct objfile
#define OBJF_USERLOADED (1 << 3) /* User loaded */
/* The bfd of this objfile is used outside of the objfile (e.g. by solib).
Do not try to free it. */
#define OBJF_KEEPBFD (1 << 4) /* Do not delete bfd */
/* The object file that the main symbol table was loaded from (e.g. the
argument to the "symbol-file" or "file" command). */
@ -510,6 +504,8 @@ extern void set_objfile_data (struct objfile *objfile,
const struct objfile_data *data, void *value);
extern void *objfile_data (struct objfile *objfile,
const struct objfile_data *data);
extern void gdb_bfd_unref (struct bfd *abfd);
/* Traverse all object files. ALL_OBJFILES_SAFE works even if you delete

20
gdb/solib.c
View file

@ -421,21 +421,11 @@ void
free_so (struct so_list *so)
{
struct target_so_ops *ops = solib_ops (target_gdbarch);
char *bfd_filename = 0;
if (so->sections)
xfree (so->sections);
if (so->abfd)
{
bfd_filename = bfd_get_filename (so->abfd);
if (! bfd_close (so->abfd))
warning (_("cannot close \"%s\": %s"),
bfd_filename, bfd_errmsg (bfd_get_error ()));
}
if (bfd_filename)
xfree (bfd_filename);
gdb_bfd_unref (so->abfd);
ops->free_so (so);
@ -454,6 +444,7 @@ static void
symbol_add_stub (struct so_list *so, int flags)
{
struct section_addr_info *sap;
int *p_refcount;
/* Have we already loaded this shared object? */
ALL_OBJFILES (so->objfile)
@ -465,8 +456,11 @@ symbol_add_stub (struct so_list *so, int flags)
sap = build_section_addr_info_from_section_table (so->sections,
so->sections_end);
so->objfile = symbol_file_add_from_bfd (so->abfd, flags,
sap, OBJF_SHARED | OBJF_KEEPBFD);
so->objfile = symbol_file_add_from_bfd (so->abfd, flags, sap, OBJF_SHARED);
p_refcount = xmalloc (sizeof (*p_refcount));
*p_refcount = 2; /* Both solib and objfile refer to this abfd. */
so->abfd->usrdata = p_refcount;
free_section_addr_info (sap);
return;