#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
+#include <sys/uio.h>
#include "filenames.h"
+#include "parameters.h"
#include "options.h"
#include "dirsearch.h"
+#include "target.h"
+#include "binary.h"
#include "fileread.h"
namespace gold
return this->descriptor_ >= 0;
}
-// Open the file for testing purposes.
+// Open the file with the contents in memory.
bool
File_read::open(const Task* task, const std::string& name,
File_read::find_view(off_t start, section_size_type size) const
{
off_t page = File_read::page_offset(start);
- Views::const_iterator p = this->views_.find(page);
- if (p == this->views_.end())
- return NULL;
- if (p->second->size() - (start - page) < size)
+
+ Views::const_iterator p = this->views_.lower_bound(page);
+ if (p == this->views_.end() || p->first > page)
+ {
+ if (p == this->views_.begin())
+ return NULL;
+ --p;
+ }
+
+ if (p->second->start() + static_cast<off_t>(p->second->size())
+ < start + static_cast<off_t>(size))
return NULL;
+
+ p->second->set_accessed();
+
return p->second;
}
void
File_read::read(off_t start, section_size_type size, void* p) const
{
- File_read::View* pv = this->find_view(start, size);
+ const File_read::View* pv = this->find_view(start, size);
if (pv != NULL)
{
memcpy(p, pv->data() + (start - pv->start()), size);
gold_assert(!this->token_.is_writable());
this->released_ = false;
+ File_read::View* v = this->find_view(start, size);
+ if (v != NULL)
+ {
+ if (cache)
+ v->set_cache();
+ return v;
+ }
+
off_t poff = File_read::page_offset(start);
File_read::View* const vnull = NULL;
if (!ins.second)
{
- // There was an existing view at this offset.
- File_read::View* v = ins.first->second;
- if (v->size() - (start - v->start()) >= size)
- {
- if (cache)
- v->set_cache();
- return v;
- }
-
- // This view is not large enough.
+ // There was an existing view at this offset. It must not be
+ // large enough. We can't delete it here, since something might
+ // be using it; put it on a list to be deleted when the file is
+ // unlocked.
+ v = ins.first->second;
+ gold_assert(v->size() - (start - v->start()) < size);
+ if (v->should_cache())
+ cache = true;
+ v->clear_cache();
this->saved_views_.push_back(v);
}
- // We need to read data from the file. We read full pages for
- // greater efficiency on small files.
+ // We need to map data from the file.
section_size_type psize = File_read::pages(size + (start - poff));
gold_assert(psize >= size);
}
- File_read::View* v;
-
if (this->contents_ != NULL)
{
unsigned char* p = new unsigned char[psize];
}
else
{
- void* p = ::mmap(NULL, psize, PROT_READ, MAP_SHARED,
+ void* p = ::mmap(NULL, psize, PROT_READ, MAP_PRIVATE,
this->descriptor_, poff);
if (p == MAP_FAILED)
gold_fatal(_("%s: mmap offset %lld size %lld failed: %s"),
return new File_view(*this, pv, pv->data() + (start - pv->start()));
}
-// Remove all the file views.
+// Use readv to read COUNT entries from RM starting at START. BASE
+// must be added to all file offsets in RM.
+
+void
+File_read::do_readv(off_t base, const Read_multiple& rm, size_t start,
+ size_t count)
+{
+ unsigned char discard[File_read::page_size];
+ iovec iov[File_read::max_readv_entries * 2];
+ size_t iov_index = 0;
+
+ off_t first_offset = rm[start].file_offset;
+ off_t last_offset = first_offset;
+ ssize_t want = 0;
+ for (size_t i = 0; i < count; ++i)
+ {
+ const Read_multiple_entry& i_entry(rm[start + i]);
+
+ if (i_entry.file_offset > last_offset)
+ {
+ size_t skip = i_entry.file_offset - last_offset;
+ gold_assert(skip <= sizeof discard);
+
+ iov[iov_index].iov_base = discard;
+ iov[iov_index].iov_len = skip;
+ ++iov_index;
+
+ want += skip;
+ }
+
+ iov[iov_index].iov_base = i_entry.buffer;
+ iov[iov_index].iov_len = i_entry.size;
+ ++iov_index;
+
+ want += i_entry.size;
+
+ last_offset = i_entry.file_offset + i_entry.size;
+ }
+
+ gold_assert(iov_index < sizeof iov / sizeof iov[0]);
+
+ if (::lseek(this->descriptor_, base + first_offset, SEEK_SET) < 0)
+ gold_fatal(_("%s: lseek failed: %s"),
+ this->filename().c_str(), strerror(errno));
+
+ ssize_t got = ::readv(this->descriptor_, iov, iov_index);
+
+ if (got < 0)
+ gold_fatal(_("%s: readv failed: %s"),
+ this->filename().c_str(), strerror(errno));
+ if (got != want)
+ gold_fatal(_("%s: file too short: read only %zd of %zd bytes at %lld"),
+ this->filename().c_str(),
+ got, want, static_cast<long long>(base + first_offset));
+}
+
+// Read several pieces of data from the file.
+
+void
+File_read::read_multiple(off_t base, const Read_multiple& rm)
+{
+ size_t count = rm.size();
+ size_t i = 0;
+ while (i < count)
+ {
+ // Find up to MAX_READV_ENTRIES consecutive entries which are
+ // less than one page apart.
+ const Read_multiple_entry& i_entry(rm[i]);
+ off_t i_off = i_entry.file_offset;
+ off_t end_off = i_off + i_entry.size;
+ size_t j;
+ for (j = i + 1; j < count; ++j)
+ {
+ if (j - i >= File_read::max_readv_entries)
+ break;
+ const Read_multiple_entry& j_entry(rm[j]);
+ off_t j_off = j_entry.file_offset;
+ gold_assert(j_off >= end_off);
+ off_t j_end_off = j_off + j_entry.size;
+ if (j_end_off - end_off >= File_read::page_size)
+ break;
+ end_off = j_end_off;
+ }
+
+ if (j == i + 1)
+ this->read(base + i_off, i_entry.size, i_entry.buffer);
+ else
+ {
+ File_read::View* view = this->find_view(base + i_off,
+ end_off - i_off);
+ if (view == NULL)
+ this->do_readv(base, rm, i, j - i);
+ else
+ {
+ const unsigned char* v = (view->data()
+ + (base + i_off - view->start()));
+ for (size_t k = i; k < j; ++k)
+ {
+ const Read_multiple_entry& k_entry(rm[k]);
+ gold_assert((convert_to_section_size_type(k_entry.file_offset
+ - i_off)
+ + k_entry.size)
+ <= convert_to_section_size_type(end_off
+ - i_off));
+ memcpy(k_entry.buffer,
+ v + (k_entry.file_offset - i_off),
+ k_entry.size);
+ }
+ }
+ }
+
+ i = j;
+ }
+}
+
+// Mark all views as no longer cached.
+
+void
+File_read::clear_view_cache_marks()
+{
+ // Just ignore this if there are multiple objects associated with
+ // the file. Otherwise we will wind up uncaching and freeing some
+ // views for other objects.
+ if (this->object_count_ > 1)
+ return;
+
+ for (Views::iterator p = this->views_.begin();
+ p != this->views_.end();
+ ++p)
+ p->second->clear_cache();
+ for (Saved_views::iterator p = this->saved_views_.begin();
+ p != this->saved_views_.end();
+ ++p)
+ (*p)->clear_cache();
+}
+
+// Remove all the file views. For a file which has multiple
+// associated objects (i.e., an archive), we keep accessed views
+// around until next time, in the hopes that they will be useful for
+// the next object.
void
File_read::clear_views(bool destroying)
Views::iterator p = this->views_.begin();
while (p != this->views_.end())
{
- if (!p->second->is_locked()
- && (destroying || !p->second->should_cache()))
+ bool should_delete;
+ if (p->second->is_locked())
+ should_delete = false;
+ else if (destroying)
+ should_delete = true;
+ else if (p->second->should_cache())
+ should_delete = false;
+ else if (this->object_count_ > 1 && p->second->accessed())
+ should_delete = false;
+ else
+ should_delete = true;
+
+ if (should_delete)
{
delete p->second;
else
{
gold_assert(!destroying);
+ p->second->clear_accessed();
++p;
}
}
Saved_views::iterator q = this->saved_views_.begin();
while (q != this->saved_views_.end())
{
- if (!(*q)->is_locked()
- && (destroying || !(*q)->should_cache()))
+ if (!(*q)->is_locked())
{
delete *q;
q = this->saved_views_.erase(q);
: file_()
{
this->input_argument_ =
- new Input_file_argument(name, false, "", Position_dependent_options());
+ new Input_file_argument(name, false, "", false,
+ Position_dependent_options());
bool ok = file_.open(task, name, contents, size);
gold_assert(ok);
}
+// Return the position dependent options in force for this file.
+
+const Position_dependent_options&
+Input_file::options() const
+{
+ return this->input_argument_->options();
+}
+
+// Return the name given by the user. For -lc this will return "c".
+
+const char*
+Input_file::name() const
+{
+ return this->input_argument_->name();
+}
+
+// Return whether we are only reading symbols.
+
+bool
+Input_file::just_symbols() const
+{
+ return this->input_argument_->just_symbols();
+}
+
// Open the file.
// If the filename is not absolute, we assume it is in the current
n1 += this->input_argument_->name();
std::string n2;
if (options.is_static()
- || this->input_argument_->options().do_static_search())
+ || !this->input_argument_->options().Bdynamic())
n1 += ".a";
else
{
}
// Now that we've figured out where the file lives, try to open it.
- if (!this->file_.open(task, name))
+
+ General_options::Object_format format =
+ this->input_argument_->options().format_enum();
+ bool ok;
+ if (format == General_options::OBJECT_FORMAT_ELF)
+ ok = this->file_.open(task, name);
+ else
+ {
+ gold_assert(format == General_options::OBJECT_FORMAT_BINARY);
+ ok = this->open_binary(options, task, name);
+ }
+
+ if (!ok)
{
gold_error(_("cannot open %s: %s"),
name.c_str(), strerror(errno));
return true;
}
+// Open a file for --format binary.
+
+bool
+Input_file::open_binary(const General_options&,
+ const Task* task, const std::string& name)
+{
+ // In order to open a binary file, we need machine code, size, and
+ // endianness. We may not have a valid target at this point, in
+ // which case we use the default target.
+ const Target* target;
+ if (parameters->target_valid())
+ target = ¶meters->target();
+ else
+ target = ¶meters->default_target();
+
+ Binary_to_elf binary_to_elf(target->machine_code(),
+ target->get_size(),
+ target->is_big_endian(),
+ name);
+ if (!binary_to_elf.convert(task))
+ return false;
+ return this->file_.open(task, name, binary_to_elf.converted_data_leak(),
+ binary_to_elf.converted_size());
+}
+
} // End namespace gold.
projects / external / binutils.git / blobdiff