Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

ld: Cache and reuse the IR archive file descriptor

Browse Source 
Linker plugin_object_p opens the IR archive for each IR archive member.
For GCC plugin, plugin_object_p closes the archive file descriptor.  But
for LLVM plugin, the archive file descriptor remains open.  If there are
3000 IR archive members, there are 3000 file descriptors for them.  We
can run out of file descriptors petty easily.

1. Add archive_plugin_fd and archive_plugin_fd_open_count to bfd so that
we can cache and reuse the IR archive file descriptor for all IR archive
members in the archive.
2. Add bfd_plugin_close_file_descriptor to properly close the IR archive
file descriptor.

bfd/

	PR ld/28040
	* archive.c (_bfd_archive_close_and_cleanup): Close the archive
	plugin file descriptor if needed.
	* bfd.c (bfd): Add archive_plugin_fd and
	archive_plugin_fd_open_count.
	* opncls.c (_bfd_new_bfd): Initialize to -1.
	* plugin.c (bfd_plugin_open_input): Cache and reuse the archive
	plugin file descriptor.
	(bfd_plugin_close_file_descriptor): New function.
	(try_claim): Call bfd_plugin_close_file_descriptor.
	* plugin.h (bfd_plugin_close_file_descriptor): New.
	* bfd-in2.h: Regenerated.

ld/

	PR ld/28040
	* plugin.c (plugin_input_file): Add ibfd.
	(release_plugin_file_descriptor): New function.
	(release_input_file): Call release_plugin_file_descriptor to
	close input->fd.
	(plugin_object_p): Call release_plugin_file_descriptor to close
	input->fd.  Also call release_plugin_file_descriptor if not
	claimed.
	* testsuite/config/default.exp (RANLIB): New.
	* testsuite/ld-plugin/lto.exp: Run ranlib test.
This commit is contained in:
H.J. Lu
2021-07-02 13:42:32 -07:00
parent c919d6be44
commit 9181724704
9 changed files with 123 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ld/plugin.c
View File

@@ -103,6 +103,7 @@ typedef struct view_buffer
typedef struct plugin_input_file
{
bfd *abfd;
bfd *ibfd;
view_buffer_t view_buffer;
char *name;
int fd;
@@ -605,17 +606,25 @@ get_view (const void *handle, const void **viewp)
return LDPS_OK;
}
/* Release plugin file descriptor. */
static void
release_plugin_file_descriptor (plugin_input_file_t *input)
{
if (input->fd != -1)
{
bfd_plugin_close_file_descriptor (input->ibfd, input->fd);
input->fd = -1;
}
}
/* Release the input file. */
static enum ld_plugin_status
release_input_file (const void *handle)
{
plugin_input_file_t *input = (plugin_input_file_t *) handle;
ASSERT (called_plugin);
if (input->fd != -1)
{
close (input->fd);
input->fd = -1;
}
release_plugin_file_descriptor (input);
return LDPS_OK;
}
@@ -1211,6 +1220,7 @@ plugin_object_p (bfd *ibfd)
file.handle = input;
input->abfd = abfd;
input->ibfd = ibfd;
input->view_buffer.addr = NULL;
input->view_buffer.filesize = 0;
input->view_buffer.offset = 0;
@@ -1226,7 +1236,8 @@ plugin_object_p (bfd *ibfd)
einfo (_("%F%P: %s: plugin reported error claiming file\n"),
plugin_error_plugin ());
if (input->fd != -1 && !bfd_plugin_target_p (ibfd->xvec))
if (input->fd != -1
&& (!claimed || !bfd_plugin_target_p (ibfd->xvec)))
{
/* FIXME: fd belongs to us, not the plugin. GCC plugin, which
doesn't need fd after plugin_call_claim_file, doesn't use
@@ -1236,8 +1247,7 @@ plugin_object_p (bfd *ibfd)
release_input_file after it is done, uses BFD plugin target
vector. This scheme doesn't work when a plugin needs fd and
doesn't use BFD plugin target vector neither. */
close (input->fd);
input->fd = -1;
release_plugin_file_descriptor (input);
}
if (claimed)