X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=gold%2Ffileread.h;h=47c8e0ff27e31a4946b0b6e9b64f3c53697d1319;hb=1ae4d23b731a2a5fa5d688bc255d52e7f1eb9232;hp=428c2f040318717e9720b4a2d3e215268178e63f;hpb=cb29561284eaa37c5c8967e49a5db0a4064368bf;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/fileread.h b/gold/fileread.h index 428c2f0403..47c8e0ff27 100644 --- a/gold/fileread.h +++ b/gold/fileread.h @@ -1,6 +1,6 @@ // fileread.h -- read files for gold -*- C++ -*- -// Copyright 2006, 2007 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -28,27 +28,45 @@ #include #include #include +#include -#include "options.h" #include "token.h" namespace gold { +// Since not all system supports stat.st_mtim and struct timespec, +// we define our own structure and fill the nanoseconds if we can. + +struct Timespec +{ + Timespec() + : seconds(0), nanoseconds(0) + { } + + Timespec(time_t a_seconds, int a_nanoseconds) + : seconds(a_seconds), nanoseconds(a_nanoseconds) + { } + + time_t seconds; + int nanoseconds; +}; + +class Position_dependent_options; +class Input_file_argument; class Dirsearch; class File_view; -// File_read manages a file descriptor for a file we are reading. We -// close file descriptors if we run out of them, so this class reopens -// the file as needed. +// File_read manages a file descriptor and mappings for a file we are +// reading. class File_read { public: File_read() - : name_(), descriptor_(-1), object_count_(0), size_(0), token_(false), - views_(), saved_views_(), contents_(NULL), mapped_bytes_(0), - released_(true) + : name_(), descriptor_(-1), is_descriptor_opened_(false), object_count_(0), + size_(0), token_(false), views_(), saved_views_(), mapped_bytes_(0), + released_(true), whole_file_view_(NULL) { } ~File_read(); @@ -80,12 +98,12 @@ class File_read { --this->object_count_; } // Lock the file for exclusive access within a particular Task::run - // execution. This means that the descriptor can not be closed. - // This routine may only be called when the workqueue lock is held. + // execution. This routine may only be called when the workqueue + // lock is held. void lock(const Task* t); - // Unlock the descriptor, permitting it to be closed if necessary. + // Unlock the file. void unlock(const Task* t); @@ -114,33 +132,46 @@ class File_read { return this->size_; } // Return a view into the file starting at file offset START for - // SIZE bytes. The pointer will remain valid until the File_read is - // unlocked. It is an error if we can not read enough data from the - // file. The CACHE parameter is a hint as to whether it will be + // SIZE bytes. OFFSET is the offset into the input file for the + // file we are reading; this is zero for a normal object file, + // non-zero for an object file in an archive. ALIGNED is true if + // the data must be naturally aligned; this only matters when OFFSET + // is not zero. The pointer will remain valid until the File_read + // is unlocked. It is an error if we can not read enough data from + // the file. The CACHE parameter is a hint as to whether it will be // useful to cache this data for later accesses--i.e., later calls // to get_view, read, or get_lasting_view which retrieve the same // data. const unsigned char* - get_view(off_t start, section_size_type size, bool cache); + get_view(off_t offset, off_t start, section_size_type size, bool aligned, + bool cache); // Read data from the file into the buffer P starting at file offset // START for SIZE bytes. void - read(off_t start, section_size_type size, void* p) const; + read(off_t start, section_size_type size, void* p); // Return a lasting view into the file starting at file offset START // for SIZE bytes. This is allocated with new, and the caller is // responsible for deleting it when done. The data associated with // this view will remain valid until the view is deleted. It is an - // error if we can not read enough data from the file. The CACHE - // parameter is as in get_view. + // error if we can not read enough data from the file. The OFFSET, + // ALIGNED and CACHE parameters are as in get_view. File_view* - get_lasting_view(off_t start, section_size_type size, bool cache); + get_lasting_view(off_t offset, off_t start, section_size_type size, + bool aligned, bool cache); // Mark all views as no longer cached. void clear_view_cache_marks(); + // Discard all uncached views. This is normally done by release(), + // but not for objects in archives. FIXME: This is a complicated + // interface, and it would be nice to have something more automatic. + void + clear_uncached_views() + { this->clear_views(false); } + // A struct used to do a multiple read. struct Read_multiple_entry { @@ -169,6 +200,19 @@ class File_read static void print_stats(); + // Return the open file descriptor (for plugins). + int + descriptor() + { + this->reopen_descriptor(); + return this->descriptor_; + } + + // Return the file last modification time. Calls gold_fatal if the stat + // system call failed. + Timespec + get_mtime(); + private: // This class may not be copied. File_read(const File_read&); @@ -190,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, - bool cache, bool mapped) + unsigned int byteshift, bool cache, Data_ownership data_ownership) : start_(start), size_(size), data_(data), lock_count_(0), - cache_(cache), mapped_(mapped), accessed_(true) + byteshift_(byteshift), cache_(cache), data_ownership_(data_ownership), + accessed_(true) { } ~View(); @@ -219,6 +276,10 @@ class File_read bool is_locked(); + unsigned int + byteshift() const + { return this->byteshift_; } + void set_cache() { this->cache_ = true; } @@ -247,29 +308,62 @@ class File_read View(const View&); View& operator=(const View&); + // The file offset of the start of the view. off_t start_; + // The size of the view. section_size_type size_; + // A pointer to the actual bytes. const unsigned char* data_; + // The number of locks on this view. int lock_count_; + // The number of bytes that the view is shifted relative to the + // underlying file. This is used to align data. This is normally + // zero, except possibly for an object in an archive. + unsigned int byteshift_; + // Whether the view is cached. bool cache_; - bool mapped_; + // Whether the view is mapped into memory. If not, data_ points + // to memory allocated using new[]. + Data_ownership data_ownership_; + // Whether the view has been accessed recently. bool accessed_; }; friend class View; friend class File_view; + // The type of a mapping from page start and byte shift to views. + typedef std::map, View*> Views; + + // A simple list of Views. + typedef std::list Saved_views; + + // Open the descriptor if necessary. + void + reopen_descriptor(); + // Find a view into the file. View* - find_view(off_t start, section_size_type size) const; + find_view(off_t start, section_size_type size, unsigned int byteshift, + View** vshifted) const; // Read data from the file into a buffer. void - do_read(off_t start, section_size_type size, void* p) const; + do_read(off_t start, section_size_type size, void* p); + + // Add a view. + void + add_view(View*); + + // Make a view into the file. + View* + make_view(off_t start, section_size_type size, unsigned int byteshift, + bool cache); // Find or make a view into the file. View* - find_or_make_view(off_t start, section_size_type size, bool cache); + find_or_make_view(off_t offset, off_t start, section_size_type size, + bool aligned, bool cache); // Clear the file views. void @@ -288,14 +382,14 @@ class File_read pages(off_t file_size) { return (file_size + (page_size - 1)) & ~ (page_size - 1); } - // The type of a mapping from page start to views. - typedef std::map Views; - - // A simple list of Views. - typedef std::list Saved_views; - // The maximum number of entries we will pass to ::readv. +#ifdef HAVE_READV static const size_t max_readv_entries = 128; +#else + // On targets that don't have readv set the max to 1 so readv is not + // used. + static const size_t max_readv_entries = 1; +#endif // Use readv to read data. void @@ -305,6 +399,8 @@ class File_read std::string name_; // File descriptor. int descriptor_; + // Whether we have regained the descriptor after releasing the file. + bool is_descriptor_opened_; // The number of objects associated with this file. This will be // more than 1 in the case of an archive. int object_count_; @@ -317,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. @@ -376,15 +476,27 @@ class Input_file Input_file(const Task*, const char* name, const unsigned char* contents, off_t size); + // Return the command line argument. + const Input_file_argument* + input_file_argument() const + { return this->input_argument_; } + + // Return whether this is a file that we will search for in the list + // of directories. + bool + will_search_for() const; + // Open the file. If the open fails, this will report an error and - // return false. + // return false. If there is a search, it starts at directory + // *PINDEX. *PINDEX should be initialized to zero. It may be + // restarted to find the next file with a matching name by + // incrementing the result and calling this again. bool - open(const General_options&, const Dirsearch&, const Task*); + open(const Dirsearch&, const Task*, int *pindex); // Return the name given by the user. For -lc this will return "c". const char* - name() const - { return this->input_argument_->name(); } + name() const; // Return the file name. For -lc this will return something like // "/usr/lib/libc.so". @@ -401,8 +513,7 @@ class Input_file // Return the position dependent options. const Position_dependent_options& - options() const - { return this->input_argument_->options(); } + options() const; // Return the file. File_read& @@ -418,10 +529,22 @@ class Input_file is_in_sysroot() const { return this->is_in_sysroot_; } + // Whether this file is in a system directory. + bool + is_in_system_directory() const; + + // Return whether this file is to be read only for its symbols. + bool + just_symbols() const; + private: Input_file(const Input_file&); Input_file& operator=(const Input_file&); + // Open a binary file. + bool + open_binary(const Task* task, const std::string& name); + // The argument from the command line. const Input_file_argument* input_argument_; // The name under which we opened the file. This is like the name