// fileread.cc -- read files for gold
-// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
#include "target.h"
#include "binary.h"
#include "descriptors.h"
+#include "gold-threads.h"
#include "fileread.h"
#ifndef HAVE_READV
// Class File_read.
+// A lock for the File_read static variables.
+static Lock* file_counts_lock = NULL;
+static Initialize_lock file_counts_initialize_lock(&file_counts_lock);
+
// The File_read static variables.
unsigned long long File_read::total_mapped_bytes;
unsigned long long File_read::current_mapped_bytes;
this->is_descriptor_opened_ = false;
}
this->name_.clear();
- this->clear_views(true);
- if (this->whole_file_view_)
- delete this->whole_file_view_;
+ this->clear_views(CLEAR_VIEWS_ALL);
}
// Open the file.
this->size_ = s.st_size;
gold_debug(DEBUG_FILES, "Attempt to open %s succeeded",
this->name_.c_str());
-
- // Options may not yet be ready e.g. when reading a version
- // script. We then default to --no-keep-files-mapped.
- if (parameters->options_valid()
- && parameters->options().keep_files_mapped())
- {
- const unsigned char* contents = static_cast<const unsigned char*>(
- ::mmap(NULL, this->size_, PROT_READ, MAP_PRIVATE,
- this->descriptor_, 0));
- if (contents == MAP_FAILED)
- gold_fatal(_("%s: mmap failed: %s"), this->filename().c_str(),
- strerror(errno));
- this->whole_file_view_ = new View(0, this->size_, contents, 0, false,
- View::DATA_MMAPPED);
- this->mapped_bytes_ += this->size_;
- }
-
this->token_.add_writer(task);
}
this->name_ = name;
this->whole_file_view_ = new View(0, size, contents, 0, false,
View::DATA_NOT_OWNED);
+ this->add_view(this->whole_file_view_);
this->size_ = size;
this->token_.add_writer(task);
return true;
{
gold_assert(this->is_locked());
- File_read::total_mapped_bytes += this->mapped_bytes_;
- File_read::current_mapped_bytes += this->mapped_bytes_;
+ if (!parameters->options_valid() || parameters->options().stats())
+ {
+ file_counts_initialize_lock.initialize();
+ Hold_optional_lock hl(file_counts_lock);
+ File_read::total_mapped_bytes += this->mapped_bytes_;
+ File_read::current_mapped_bytes += this->mapped_bytes_;
+ if (File_read::current_mapped_bytes > File_read::maximum_mapped_bytes)
+ File_read::maximum_mapped_bytes = File_read::current_mapped_bytes;
+ }
+
this->mapped_bytes_ = 0;
- if (File_read::current_mapped_bytes > File_read::maximum_mapped_bytes)
- File_read::maximum_mapped_bytes = File_read::current_mapped_bytes;
// Only clear views if there is only one attached object. Otherwise
// we waste time trying to clear cached archive views. Similarly
// for releasing the descriptor.
if (this->object_count_ <= 1)
{
- this->clear_views(false);
+ this->clear_views(CLEAR_VIEWS_NORMAL);
if (this->is_descriptor_opened_)
{
release_descriptor(this->descriptor_, false);
}
File_read::View* v;
- if (this->whole_file_view_ != NULL || byteshift != 0)
+ if (byteshift != 0)
{
unsigned char* p = new unsigned char[psize + byteshift];
memset(p, 0, byteshift);
byteshift = (target_size / 8) - byteshift;
}
+ // If --map-whole-files is set, make sure we have a
+ // whole file view. Options may not yet be ready, e.g.,
+ // when reading a version script. We then default to
+ // --no-keep-files-mapped.
+ if (this->whole_file_view_ == NULL
+ && parameters->options_valid()
+ && parameters->options().map_whole_files())
+ this->whole_file_view_ = this->make_view(0, this->size_, 0, cache);
+
// Try to find a View with the required BYTESHIFT.
File_read::View* vshifted;
File_read::View* v = this->find_view(offset + start, size,
// the next object.
void
-File_read::clear_views(bool destroying)
+File_read::clear_views(Clear_views_mode mode)
{
+ bool keep_files_mapped = (parameters->options_valid()
+ && parameters->options().keep_files_mapped());
Views::iterator p = this->views_.begin();
while (p != this->views_.end())
{
bool should_delete;
- if (p->second->is_locked())
+ if (p->second->is_locked() || p->second->is_permanent_view())
should_delete = false;
- else if (destroying)
+ else if (mode == CLEAR_VIEWS_ALL)
should_delete = true;
- else if (p->second->should_cache())
+ else if (p->second->should_cache() && keep_files_mapped)
should_delete = false;
- else if (this->object_count_ > 1 && p->second->accessed())
+ else if (this->object_count_ > 1
+ && p->second->accessed()
+ && mode != CLEAR_VIEWS_ARCHIVE)
should_delete = false;
else
should_delete = true;
if (should_delete)
{
+ if (p->second == this->whole_file_view_)
+ this->whole_file_view_ = NULL;
delete p->second;
// map::erase invalidates only the iterator to the deleted
}
else
{
- gold_assert(!destroying);
p->second->clear_accessed();
++p;
}
}
else
{
- gold_assert(!destroying);
+ gold_assert(mode != CLEAR_VIEWS_ALL);
++q;
}
}
// Create a file for testing.
-Input_file::Input_file(const Task* task, const char* iname,
+Input_file::Input_file(const Task* task, const char* name,
const unsigned char* contents, off_t size)
: file_()
{
this->input_argument_ =
- new Input_file_argument(iname, Input_file_argument::INPUT_FILE_TYPE_FILE,
+ new Input_file_argument(name, Input_file_argument::INPUT_FILE_TYPE_FILE,
"", false, Position_dependent_options());
- bool ok = this->file_.open(task, iname, contents, size);
+ bool ok = this->file_.open(task, name, contents, size);
gold_assert(ok);
}
bool
Input_file::open(const Dirsearch& dirpath, const Task* task, int *pindex)
{
- std::string iname;
+ std::string name;
// Case 1: name is an absolute file, just try to open it
// Case 2: name is relative but is_lib is false, is_searched_file is false,
&& !this->input_argument_->is_searched_file()
&& this->input_argument_->extra_search_path() == NULL))
{
- iname = this->input_argument_->name();
- this->found_name_ = iname;
+ name = this->input_argument_->name();
+ this->found_name_ = name;
}
// Case 3: is_lib is true or is_searched_file is true
else if (this->input_argument_->is_lib()
}
else
n1 = this->input_argument_->name();
- iname = dirpath.find(n1, n2, &this->is_in_sysroot_, pindex);
- if (iname.empty())
+ name = dirpath.find(n1, n2, &this->is_in_sysroot_, pindex);
+ if (name.empty())
{
gold_error(_("cannot find %s%s"),
this->input_argument_->is_lib() ? "-l" : "",
this->input_argument_->name());
return false;
}
- if (n2.empty() || iname[iname.length() - 1] == 'o')
+ if (n2.empty() || name[name.length() - 1] == 'o')
this->found_name_ = n1;
else
this->found_name_ = n2;
gold_assert(this->input_argument_->extra_search_path() != NULL);
// First, check extra_search_path.
- iname = this->input_argument_->extra_search_path();
- if (!IS_DIR_SEPARATOR (iname[iname.length() - 1]))
- iname += '/';
- iname += this->input_argument_->name();
+ name = this->input_argument_->extra_search_path();
+ if (!IS_DIR_SEPARATOR (name[name.length() - 1]))
+ name += '/';
+ name += this->input_argument_->name();
struct stat dummy_stat;
- if (*pindex > 0 || ::stat(iname.c_str(), &dummy_stat) < 0)
+ if (*pindex > 0 || ::stat(name.c_str(), &dummy_stat) < 0)
{
// extra_search_path failed, so check the normal search-path.
int index = *pindex;
if (index > 0)
--index;
- iname = dirpath.find(this->input_argument_->name(), "",
- &this->is_in_sysroot_, &index);
- if (iname.empty())
+ name = dirpath.find(this->input_argument_->name(), "",
+ &this->is_in_sysroot_, &index);
+ if (name.empty())
{
gold_error(_("cannot find %s"),
this->input_argument_->name());
this->input_argument_->options().format_enum();
bool ok;
if (format == General_options::OBJECT_FORMAT_ELF)
- ok = this->file_.open(task, iname);
+ {
+ ok = this->file_.open(task, name);
+ this->format_ = FORMAT_ELF;
+ }
else
{
gold_assert(format == General_options::OBJECT_FORMAT_BINARY);
- ok = this->open_binary(task, iname);
+ ok = this->open_binary(task, name);
+ this->format_ = FORMAT_BINARY;
}
if (!ok)
{
gold_error(_("cannot open %s: %s"),
- iname.c_str(), strerror(errno));
+ name.c_str(), strerror(errno));
+ this->format_ = FORMAT_NONE;
return false;
}
// Open a file for --format binary.
bool
-Input_file::open_binary(const Task* task, const std::string& iname)
+Input_file::open_binary(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
Binary_to_elf binary_to_elf(target.machine_code(),
target.get_size(),
target.is_big_endian(),
- iname);
+ name);
if (!binary_to_elf.convert(task))
return false;
- return this->file_.open(task, iname, binary_to_elf.converted_data_leak(),
+ return this->file_.open(task, name, binary_to_elf.converted_data_leak(),
binary_to_elf.converted_size());
}