// 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 <unistd.h>
#include <sys/mman.h>
#include <sys/uio.h>
+#include <sys/stat.h>
#include "filenames.h"
#include "debug.h"
#include "target.h"
#include "binary.h"
#include "descriptors.h"
+#include "gold-threads.h"
#include "fileread.h"
+#ifndef HAVE_READV
+struct iovec { void* iov_base; size_t iov_len };
+ssize_t
+readv(int, const iovec*, int)
+{
+ gold_unreachable();
+}
+#endif
+
namespace gold
{
File_read::View::~View()
{
gold_assert(!this->is_locked());
- if (!this->mapped_)
- delete[] this->data_;
- else
+ switch (this->data_ownership_)
{
+ case DATA_ALLOCATED_ARRAY:
+ delete[] this->data_;
+ break;
+ case DATA_MMAPPED:
if (::munmap(const_cast<unsigned char*>(this->data_), this->size_) != 0)
gold_warning(_("munmap failed: %s"), strerror(errno));
-
File_read::current_mapped_bytes -= this->size_;
+ break;
+ case DATA_NOT_OWNED:
+ break;
+ default:
+ gold_unreachable();
}
}
// 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);
+ 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());
-
this->token_.add_writer(task);
}
&& !this->is_descriptor_opened_
&& this->name_.empty());
this->name_ = name;
- this->contents_ = contents;
+ 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);
if (vshifted != NULL)
*vshifted = NULL;
+ // If we have the whole file mmapped, and the alignment is right,
+ // we can return it.
+ if (this->whole_file_view_)
+ if (byteshift == -1U || byteshift == 0)
+ return this->whole_file_view_;
+
off_t page = File_read::page_offset(start);
unsigned int bszero = 0;
File_read::do_read(off_t start, section_size_type size, void* p)
{
ssize_t bytes;
- if (this->contents_ != NULL)
+ if (this->whole_file_view_ != NULL)
{
bytes = this->size_ - start;
if (static_cast<section_size_type>(bytes) >= size)
{
- memcpy(p, this->contents_ + start, size);
+ memcpy(p, this->whole_file_view_->data() + start, size);
return;
}
}
}
File_read::View* v;
- if (this->contents_ != NULL || byteshift != 0)
+ if (byteshift != 0)
{
unsigned char* p = new unsigned char[psize + byteshift];
memset(p, 0, byteshift);
this->do_read(poff, psize, p + byteshift);
- v = new File_read::View(poff, psize, p, byteshift, cache, false);
+ v = new File_read::View(poff, psize, p, byteshift, cache,
+ View::DATA_ALLOCATED_ARRAY);
}
else
{
this->mapped_bytes_ += psize;
const unsigned char* pbytes = static_cast<const unsigned char*>(p);
- v = new File_read::View(poff, psize, pbytes, 0, cache, true);
+ v = new File_read::View(poff, psize, pbytes, 0, cache,
+ View::DATA_MMAPPED);
}
this->add_view(v);
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,
memset(pbytes, 0, byteshift);
memcpy(pbytes + byteshift, v->data() + v->byteshift(), v->size());
- File_read::View* shifted_view = new File_read::View(v->start(), v->size(),
- pbytes, byteshift,
- cache, false);
+ File_read::View* shifted_view =
+ new File_read::View(v->start(), v->size(), pbytes, byteshift,
+ cache, View::DATA_ALLOCATED_ARRAY);
this->add_view(shifted_view);
return shifted_view;
// 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;
}
}
: file_()
{
this->input_argument_ =
- new Input_file_argument(name, false, "", false,
- Position_dependent_options());
- bool ok = file_.open(task, name, contents, size);
+ new Input_file_argument(name, Input_file_argument::INPUT_FILE_TYPE_FILE,
+ "", false, Position_dependent_options());
+ bool ok = this->file_.open(task, name, contents, size);
gold_assert(ok);
}
return this->input_argument_->just_symbols();
}
+// Return whether this is a file that we will search for in the list
+// of directories.
+
+bool
+Input_file::will_search_for() const
+{
+ return (!IS_ABSOLUTE_PATH(this->input_argument_->name())
+ && (this->input_argument_->is_lib()
+ || this->input_argument_->is_searched_file()
+ || this->input_argument_->extra_search_path() != NULL));
+}
+
+// Return the file last modification time. Calls gold_fatal if the stat
+// system call failed.
+
+Timespec
+File_read::get_mtime()
+{
+ struct stat file_stat;
+ this->reopen_descriptor();
+
+ if (fstat(this->descriptor_, &file_stat) < 0)
+ gold_fatal(_("%s: stat failed: %s"), this->name_.c_str(),
+ strerror(errno));
+#ifdef HAVE_STAT_ST_MTIM
+ return Timespec(file_stat.st_mtim.tv_sec, file_stat.st_mtim.tv_nsec);
+#else
+ return Timespec(file_stat.st_mtime, 0);
+#endif
+}
+
// Open the file.
// If the filename is not absolute, we assume it is in the current
// directory *except* when:
-// A) input_argument_->is_lib() is true; or
-// B) input_argument_->extra_search_path() is not empty.
-// In both cases, we look in extra_search_path + library_path to find
+// A) input_argument_->is_lib() is true;
+// B) input_argument_->is_searched_file() is true; or
+// C) input_argument_->extra_search_path() is not empty.
+// In each, we look in extra_search_path + library_path to find
// the file location, rather than the current directory.
bool
-Input_file::open(const General_options& options, const Dirsearch& dirpath,
- const Task* task)
+Input_file::open(const Dirsearch& dirpath, const Task* task, int *pindex)
{
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 and extra_search_path
- // is empty
- if (IS_ABSOLUTE_PATH (this->input_argument_->name())
+ // Case 2: name is relative but is_lib is false, is_searched_file is false,
+ // and extra_search_path is empty
+ if (IS_ABSOLUTE_PATH(this->input_argument_->name())
|| (!this->input_argument_->is_lib()
+ && !this->input_argument_->is_searched_file()
&& this->input_argument_->extra_search_path() == NULL))
{
name = this->input_argument_->name();
this->found_name_ = name;
}
- // Case 3: is_lib is true
- else if (this->input_argument_->is_lib())
+ // Case 3: is_lib is true or is_searched_file is true
+ else if (this->input_argument_->is_lib()
+ || this->input_argument_->is_searched_file())
{
// We don't yet support extra_search_path with -l.
gold_assert(this->input_argument_->extra_search_path() == NULL);
- std::string n1("lib");
- n1 += this->input_argument_->name();
- std::string n2;
- if (options.is_static()
- || !this->input_argument_->options().Bdynamic())
- n1 += ".a";
- else
+ std::string n1, n2;
+ if (this->input_argument_->is_lib())
{
- n2 = n1 + ".a";
- n1 += ".so";
+ n1 = "lib";
+ n1 += this->input_argument_->name();
+ if (parameters->options().is_static()
+ || !this->input_argument_->options().Bdynamic())
+ n1 += ".a";
+ else
+ {
+ n2 = n1 + ".a";
+ n1 += ".so";
+ }
}
- name = dirpath.find(n1, n2, &this->is_in_sysroot_);
+ else
+ n1 = this->input_argument_->name();
+ name = dirpath.find(n1, n2, &this->is_in_sysroot_, pindex);
if (name.empty())
{
- gold_error(_("cannot find -l%s"),
+ gold_error(_("cannot find %s%s"),
+ this->input_argument_->is_lib() ? "-l" : "",
this->input_argument_->name());
return false;
}
name += '/';
name += this->input_argument_->name();
struct stat dummy_stat;
- if (::stat(name.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;
name = dirpath.find(this->input_argument_->name(), "",
- &this->is_in_sysroot_);
+ &this->is_in_sysroot_, &index);
if (name.empty())
{
gold_error(_("cannot find %s"),
this->input_argument_->name());
return false;
}
+ *pindex = index + 1;
}
this->found_name_ = this->input_argument_->name();
}
this->input_argument_->options().format_enum();
bool ok;
if (format == General_options::OBJECT_FORMAT_ELF)
- ok = this->file_.open(task, name);
+ {
+ ok = this->file_.open(task, name);
+ this->format_ = FORMAT_ELF;
+ }
else
{
gold_assert(format == General_options::OBJECT_FORMAT_BINARY);
- ok = this->open_binary(options, task, name);
+ ok = this->open_binary(task, name);
+ this->format_ = FORMAT_BINARY;
}
if (!ok)
{
gold_error(_("cannot open %s: %s"),
name.c_str(), strerror(errno));
+ this->format_ = FORMAT_NONE;
return false;
}
// Open a file for --format binary.
bool
-Input_file::open_binary(const General_options&,
- const Task* task, const std::string& name)
+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
// which case we use the default target.
- const Target* target;
- if (parameters->target_valid())
- target = ¶meters->target();
- else
- target = ¶meters->default_target();
+ parameters_force_valid_target();
+ const Target& target(parameters->target());
- Binary_to_elf binary_to_elf(target->machine_code(),
- target->get_size(),
- target->is_big_endian(),
+ 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;
projects / binutils-gdb.git / blobdiff