// fileread.cc -- read files for gold
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2006-2020 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
break;
case DATA_MMAPPED:
if (::munmap(const_cast<unsigned char*>(this->data_), this->size_) != 0)
- gold_warning(_("munmap failed: %s"), strerror(errno));
+ gold_warning(_("munmap failed: %s"), strerror(errno));
if (!parameters->options_valid() || parameters->options().stats())
{
file_counts_initialize_lock.initialize();
this->name_.c_str(), strerror(errno));
this->size_ = s.st_size;
gold_debug(DEBUG_FILES, "Attempt to open %s succeeded",
- this->name_.c_str());
+ this->name_.c_str());
this->token_.add_writer(task);
}
&& this->name_.empty());
this->name_ = name;
this->whole_file_view_ = new View(0, size, contents, 0, false,
- View::DATA_NOT_OWNED);
+ View::DATA_NOT_OWNED);
this->add_view(this->whole_file_view_);
this->size_ = size;
this->token_.add_writer(task);
File_read::lock(const Task* task)
{
gold_assert(this->released_);
+ gold_debug(DEBUG_FILES, "Locking file \"%s\"", this->name_.c_str());
this->token_.add_writer(task);
this->released_ = false;
}
void
File_read::unlock(const Task* task)
{
+ gold_debug(DEBUG_FILES, "Unlocking file \"%s\"", this->name_.c_str());
this->release();
this->token_.remove_writer(task);
}
File_read::find_view(off_t start, section_size_type size,
unsigned int byteshift, File_read::View** vshifted) const
{
+ gold_assert(start <= this->size_
+ && (static_cast<unsigned long long>(size)
+ <= static_cast<unsigned long long>(this->size_ - start)));
+
if (vshifted != NULL)
*vshifted = NULL;
else
{
this->reopen_descriptor();
- bytes = ::pread(this->descriptor_, p, size, start);
- if (static_cast<section_size_type>(bytes) == size)
- return;
- if (bytes < 0)
+ char *read_ptr = static_cast<char *>(p);
+ off_t read_pos = start;
+ size_t to_read = size;
+ do
{
- gold_fatal(_("%s: pread failed: %s"),
- this->filename().c_str(), strerror(errno));
- return;
+ bytes = ::pread(this->descriptor_, read_ptr, to_read, read_pos);
+ if (bytes < 0)
+ gold_fatal(_("%s: pread failed: %s"),
+ this->filename().c_str(), strerror(errno));
+
+ read_pos += bytes;
+ read_ptr += bytes;
+ to_read -= bytes;
+ if (to_read == 0)
+ return;
}
+ while (bytes > 0);
+
+ bytes = size - to_read;
}
gold_fatal(_("%s: file too short: read only %lld of %lld bytes at %lld"),
unsigned int byteshift, bool cache)
{
gold_assert(size > 0);
-
- // Check that start and end of the view are within the file.
- if (start > this->size_
- || (static_cast<unsigned long long>(size)
- > static_cast<unsigned long long>(this->size_ - start)))
- gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
- "size of file; the file may be corrupt"),
- this->filename().c_str(),
- static_cast<long long>(size),
- static_cast<long long>(start));
+ gold_assert(start <= this->size_
+ && (static_cast<unsigned long long>(size)
+ <= static_cast<unsigned long long>(this->size_ - start)));
off_t poff = File_read::page_offset(start);
File_read::find_or_make_view(off_t offset, off_t start,
section_size_type size, bool aligned, bool cache)
{
+ // Check that start and end of the view are within the file.
+ if (start > this->size_
+ || (static_cast<unsigned long long>(size)
+ > static_cast<unsigned long long>(this->size_ - start)))
+ gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
+ "size of file; the file may be corrupt"),
+ this->filename().c_str(),
+ static_cast<long long>(size),
+ static_cast<long long>(start));
+
unsigned int byteshift;
if (offset == 0)
byteshift = 0;
memcpy(pbytes + byteshift, v->data() + v->byteshift(), v->size());
File_read::View* shifted_view =
- new File_read::View(v->start(), v->size(), pbytes, byteshift,
+ new File_read::View(v->start(), v->size(), pbytes, byteshift,
cache, View::DATA_ALLOCATED_ARRAY);
this->add_view(shifted_view);
{
const Read_multiple_entry& k_entry(rm[k]);
gold_assert((convert_to_section_size_type(k_entry.file_offset
- - i_off)
- + k_entry.size)
+ - i_off)
+ + k_entry.size)
<= convert_to_section_size_type(end_off
- - i_off));
+ - i_off));
memcpy(k_entry.buffer,
v + (k_entry.file_offset - i_off),
k_entry.size);
&& keep_files_mapped)
should_delete = false;
else if (this->object_count_ > 1
- && p->second->accessed()
- && mode != CLEAR_VIEWS_ARCHIVE)
+ && p->second->accessed()
+ && mode != CLEAR_VIEWS_ARCHIVE)
should_delete = false;
else
should_delete = true;
// Class Input_file.
+// Create a file given just the filename.
+
+Input_file::Input_file(const char* name)
+ : found_name_(), file_(), is_in_sysroot_(false), format_(FORMAT_NONE)
+{
+ this->input_argument_ =
+ new Input_file_argument(name, Input_file_argument::INPUT_FILE_TYPE_FILE,
+ "", false, Position_dependent_options());
+}
+
// Create a file for testing.
Input_file::Input_file(const Task* task, const char* name,
{
this->input_argument_ =
new Input_file_argument(name, Input_file_argument::INPUT_FILE_TYPE_FILE,
- "", false, Position_dependent_options());
+ "", false, Position_dependent_options());
bool ok = this->file_.open(task, name, contents, size);
gold_assert(ok);
}
else if (input_argument->is_lib()
|| input_argument->is_searched_file())
{
- std::string n1, n2;
+ std::vector<std::string> names;
+ names.reserve(2);
if (input_argument->is_lib())
{
- n1 = "lib";
- n1 += input_argument->name();
+ std::string prefix = "lib";
+ prefix += input_argument->name();
if (parameters->options().is_static()
|| !input_argument->options().Bdynamic())
- n1 += ".a";
+ names.push_back(prefix + ".a");
else
{
- n2 = n1 + ".a";
- n1 += ".so";
+ names.push_back(prefix + ".so");
+ names.push_back(prefix + ".a");
}
}
else
- n1 = input_argument->name();
-
- if (Input_file::try_extra_search_path(pindex, input_argument, n1,
- found_name, namep))
- return true;
+ names.push_back(input_argument->name());
- if (!n2.empty() && Input_file::try_extra_search_path(pindex,
- input_argument, n2,
- found_name, namep))
- return true;
+ for (std::vector<std::string>::const_iterator n = names.begin();
+ n != names.end();
+ ++n)
+ if (Input_file::try_extra_search_path(pindex, input_argument, *n,
+ found_name, namep))
+ return true;
// It is not in the extra_search_path.
- name = dirpath.find(n1, n2, is_in_sysroot, pindex);
+ name = dirpath.find(names, is_in_sysroot, pindex, found_name);
if (name.empty())
{
gold_error(_("cannot find %s%s"),
- input_argument->is_lib() ? "-l" : "",
+ input_argument->is_lib() ? "-l" : "",
input_argument->name());
return false;
}
- if (n2.empty() || name[name.length() - 1] == 'o')
- *found_name = n1;
- else
- *found_name = n2;
*namep = name;
return true;
}
gold_assert(input_argument->extra_search_path() != NULL);
if (try_extra_search_path(pindex, input_argument, input_argument->name(),
- found_name, namep))
- return true;
+ found_name, namep))
+ return true;
// extra_search_path failed, so check the normal search-path.
int index = *pindex;
if (index > 0)
- --index;
- name = dirpath.find(input_argument->name(), "",
- is_in_sysroot, &index);
+ --index;
+ name = dirpath.find(std::vector<std::string>(1, input_argument->name()),
+ is_in_sysroot, &index, found_name);
if (name.empty())
- {
- gold_error(_("cannot find %s"),
- input_argument->name());
- return false;
- }
- *found_name = input_argument->name();
+ {
+ gold_error(_("cannot find %s"),
+ input_argument->name());
+ return false;
+ }
*namep = name;
*pindex = index + 1;
return true;
projects / deliverable / binutils-gdb.git / blobdiff