mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:54:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

* fileread.cc: (File_read::View::~View): Use the new

Browse Source 
data_ownership_ filed.
	(File_read::~File_read): Dispose the new whole_file_view_.
	(File_read::open): Mmap the whole file if needed.
	(File_read::open): Use whole_file_view_ instead of contents_.
	(File_read::find_view): Use whole_file_view_ if applicable.
	(File_read::do_read): Use whole_file_view_ instead of contents_.
	(File_read::make_view): Use whole_file_view_ instead of contents_,
	update File_read::View::View call.
	(File_read::find_or_make_view): Update File_read::View::View
	call.
	* fileread.h: (File_read::File_read): Initialize whole_file_view_,
	remove contents_
	(File_read::View::Data_ownership): New enum.
	(File_read::View::View): Replace bool mapped_ with Data_ownership
	argument.
	(File_read::View::mapped_): Remove (replaced by data_ownership_).
	(File_read::View::data_ownership_): New field.
	(File_read::contents_): Remove (replaced by whole_file_view_).
	(File_read::whole_file_view_): New field.
	* options.h (class General_options): Add --keep-files-mapped.
This commit is contained in:
Ian Lance Taylor 2009-10-28 00:42:34 +00:00
parent 2499805399
commit 2c84949387
4 changed files with 100 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gold/ChangeLog
View File

@ -1,3 +1,27 @@
2009-10-27 Mikolaj Zalewski <mikolajz@google.com>
* fileread.cc: (File_read::View::~View): Use the new
data_ownership_ filed.
(File_read::~File_read): Dispose the new whole_file_view_.
(File_read::open): Mmap the whole file if needed.
(File_read::open): Use whole_file_view_ instead of contents_.
(File_read::find_view): Use whole_file_view_ if applicable.
(File_read::do_read): Use whole_file_view_ instead of contents_.
(File_read::make_view): Use whole_file_view_ instead of contents_,
update File_read::View::View call.
(File_read::find_or_make_view): Update File_read::View::View
call.
* fileread.h: (File_read::File_read): Initialize whole_file_view_,
remove contents_
(File_read::View::Data_ownership): New enum.
(File_read::View::View): Replace bool mapped_ with Data_ownership
argument.
(File_read::View::mapped_): Remove (replaced by data_ownership_).
(File_read::View::data_ownership_): New field.
(File_read::contents_): Remove (replaced by whole_file_view_).
(File_read::whole_file_view_): New field.
* options.h (class General_options): Add --keep-files-mapped.
2009-10-27 Cary Coutant <ccoutant@google.com>
* symtab.cc (add_from_pluginobj): Pass correct value for is_ordinary.

59
gold/fileread.cc
View File

@ -57,14 +57,20 @@ 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();
}
}
@ -105,6 +111,8 @@ File_read::~File_read()
}
this->name_.clear();
this->clear_views(true);
if (this->whole_file_view_)
delete this->whole_file_view_;
}
// Open the file.
@ -132,6 +140,22 @@ File_read::open(const Task* task, const std::string& name)
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);
}
@ -149,7 +173,8 @@ File_read::open(const Task* task, const std::string& name,
&& !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->size_ = size;
this->token_.add_writer(task);
return true;
@ -246,6 +271,12 @@ File_read::find_view(off_t start, section_size_type size,
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;
@ -281,12 +312,12 @@ void
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;
}
}
@ -386,12 +417,13 @@ File_read::make_view(off_t start, section_size_type size,
}
File_read::View* v;
if (this->contents_ != NULL || byteshift != 0)
if (this->whole_file_view_ != NULL || 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
{
@ -408,7 +440,8 @@ File_read::make_view(off_t start, section_size_type size,
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);
@ -463,9 +496,9 @@ File_read::find_or_make_view(off_t offset, off_t start,
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;

31
gold/fileread.h
View File

@ -65,8 +65,8 @@ class File_read
public:
File_read()
: name_(), descriptor_(-1), is_descriptor_opened_(false), object_count_(0),
size_(0), token_(false), views_(), saved_views_(), contents_(NULL),
mapped_bytes_(0), released_(true)
size_(0), token_(false), views_(), saved_views_(), mapped_bytes_(0),
released_(true), whole_file_view_(NULL)
{ }
~File_read();
@ -234,10 +234,23 @@ class File_read
class View
{
public:
// Specifies how to dispose the data on destruction of the view.
enum Data_ownership
{
// Data owned by File object - nothing done in destructor.
DATA_NOT_OWNED,
// Data alocated with new[] and owned by this object - should
// use delete[].
DATA_ALLOCATED_ARRAY,
// Data mmapped and owned by this object - should munmap.
DATA_MMAPPED
};
View(off_t start, section_size_type size, const unsigned char* data,
unsigned int byteshift, bool cache, bool mapped)
unsigned int byteshift, bool cache, Data_ownership data_ownership)
: start_(start), size_(size), data_(data), lock_count_(0),
byteshift_(byteshift), cache_(cache), mapped_(mapped), accessed_(true)
byteshift_(byteshift), cache_(cache), data_ownership_(data_ownership),
accessed_(true)
{ }
~View();
@ -311,7 +324,7 @@ class File_read
bool cache_;
// Whether the view is mapped into memory. If not, data_ points
// to memory allocated using new[].
bool mapped_;
Data_ownership data_ownership_;
// Whether the view has been accessed recently.
bool accessed_;
};
@ -400,14 +413,18 @@ class File_read
// List of views which were locked but had to be removed from views_
// because they were not large enough.
Saved_views saved_views_;
// Specified file contents. Used only for testing purposes.
const unsigned char* contents_;
// Total amount of space mapped into memory. This is only changed
// while the file is locked. When we unlock the file, we transfer
// the total to total_mapped_bytes, and reset this to zero.
size_t mapped_bytes_;
// Whether the file was released.
bool released_;
// A view containing the whole file. May be NULL if we mmap only
// the relevant parts of the file. Not NULL if:
// - Flag --mmap_whole_files is set (default on 64-bit hosts).
// - The contents was specified in the constructor. Used only for
// testing purposes).
View* whole_file_view_;
};
// A view of file data that persists even when the file is unlocked.

6
gold/options.h
View File

@ -723,6 +723,12 @@ class General_options
DEFINE_special(just_symbols, options::TWO_DASHES, '\0',
N_("Read only symbol values from FILE"), N_("FILE"));
DEFINE_bool(keep_files_mapped, options::TWO_DASHES, '\0',
sizeof(void*) >= 8,
N_("Map whole files to memory (default on 64-bit hosts)"),
N_("Map relevant file parts to memory (default on 32-bit "
"hosts)"));
DEFINE_special(library, options::TWO_DASHES, 'l',
N_("Search for library LIBNAME"), N_("LIBNAME"));