aboutsummaryrefslogtreecommitdiff
path: root/gold/fileread.h
diff options
context:
space:
mode:
authorCary Coutant <ccoutant@google.com>2009-01-15 01:29:25 +0000
committerCary Coutant <ccoutant@google.com>2009-01-15 01:29:25 +0000
commit0f7c0701ba26bd4c94e968f6be5c954819c97f81 (patch)
tree3ffcaaf955c71edad7e9d7b1965894a3e5e3d722 /gold/fileread.h
parentfa7f3e72292434483fbce576f8613a1af727df6c (diff)
downloadgdb-0f7c0701ba26bd4c94e968f6be5c954819c97f81.zip
gdb-0f7c0701ba26bd4c94e968f6be5c954819c97f81.tar.gz
gdb-0f7c0701ba26bd4c94e968f6be5c954819c97f81.tar.bz2
* archive.cc (Archive::get_elf_object_for_member): Remove call
to File_read::claim_for_plugin. * descriptors.cc (Descriptors::open): Remove reference to is_claimed. (Descriptors::claim_for_plugin): Remove. * descriptors.h (Descriptors::claim_for_plugin): Remove. (Descriptors::is_claimed): Remove. (claim_descriptor_for_plugin): Remove. * fileread.cc (File_read::claim_for_plugin): Remove. * fileread.h (File_read::claim_for_plugin): Remove. (File_read::descriptor): Reopen descriptor if necessary. * plugin.cc (Plugin::load): Add two new APIs to transfer vector. (Plugin_manager::all_symbols_read): Add task parameter. Change all callers. (Plugin_manager::get_input_file): New function. (Plugin_manager::release_input_file): New function. (Pluginobj::Pluginobj): Add filesize parameter and initialize corresponding data member. (Sized_pluginobj::Sized_pluginobj): Add filesize parameter and pass to base constructor. Change all callers. (get_input_file, release_input_file): New functions. (make_sized_plugin_object): Add filesize parameter. Change all callers. * plugin.h (Plugin_manager::Plugin_manager): Initialize task_ member. (Plugin_manager::all_symbols_read): Add task parameter. (Plugin_manager::get_input_file): New function. (Plugin_manager::release_input_file): New function. (Plugin_manager::task_): New data member. (Pluginobj::Pluginobj): Add filesize parameter. (Pluginobj::filename): New function. (Pluginobj::descriptor): New function. (Pluginobj::filesize): New function. (Pluginobj::filesize_): New data member. (Sized_pluginobj::Sized_pluginobj): Add filesize parameter. * readsyms.cc (Read_symbols::do_read_symbols): Remove call to File_read::claim_for_plugin; use Object::unlock to unlock the file. * testsuite/Makefile.am (plugin_test_4): New test case for plugins with archive libraries. * testsuite/Makefile.in: Regenerate. * testsuite/plugin_test.c (struct sym_info): New type. (get_input_file, release_input_file): New static variables. (onload): Capture new transfer vector entries. (claim_file_hook): Stop reading at end of file according to filesize. Factor out parsing of readelf output into separate function. (all_symbols_read_hook): Exercise get_input_file and release_input_file APIs and get the source file name from the symbol table. Convert source file name to corresponding object file name. Print info message when adding new input files. (parse_readelf_line): New function. * testsuite/plugin_test_1.sh: Add checks for new info messages. * testsuite/plugin_test_2.sh: Likewise. * testsuite/plugin_test_3.sh: Likewise. * testsuite/plugin_test_4.sh: New test case.
Diffstat (limited to 'gold/fileread.h')
-rw-r--r--gold/fileread.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/gold/fileread.h b/gold/fileread.h
index 1b776f1..3afba86 100644
--- a/gold/fileread.h
+++ b/gold/fileread.h
@@ -1,6 +1,6 @@
// fileread.h -- read files for gold -*- C++ -*-
-// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
@@ -109,11 +109,6 @@ class File_read
void
release();
- // Claim the file for a plugin. This effectively releases the file without
- // closing it; the plugin will assume responsibility for closing it.
- void
- claim_for_plugin();
-
// Return the size of the file.
off_t
filesize() const
@@ -190,9 +185,9 @@ class File_read
// Return the open file descriptor (for plugins).
int
- descriptor() const
+ descriptor()
{
- gold_assert(this->descriptor_ >= 0);
+ this->reopen_descriptor();
return this->descriptor_;
}