diff options
author | primiano@chromium.org <primiano@chromium.org> | 2014-10-17 10:58:23 +0000 |
---|---|---|
committer | primiano@chromium.org <primiano@chromium.org> | 2014-10-17 10:58:23 +0000 |
commit | 719546275aa9a9c1a2811341b178ac689a9d85d5 (patch) | |
tree | 15691157498b8de5eb3f0c42e52b3e892c4b81da /src/client/linux/minidump_writer/linux_dumper.h | |
parent | The process uptime computation when the Windows out-of-process Crash Generation (diff) | |
download | breakpad-719546275aa9a9c1a2811341b178ac689a9d85d5.tar.xz |
Refactor .so name detection logic in minidump/linux_dumper.
This is a refactoring of the logic which determines the
module name and path for a given MappingInfo in minidump_writer.cc.
Such logic, which will be soon shared also with the upcoming
microdump_writer.cc, is simply being moved to linux_dumper.cc,
extracting a GetMappingEffectiveNameAndPath method.
No behavioral change is intended.
BUG=chromium:410294
R=thestig@chromium.org
Review URL: https://breakpad.appspot.com/7734002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1392 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/linux/minidump_writer/linux_dumper.h')
-rw-r--r-- | src/client/linux/minidump_writer/linux_dumper.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/client/linux/minidump_writer/linux_dumper.h b/src/client/linux/minidump_writer/linux_dumper.h index e37ed179..40678e9c 100644 --- a/src/client/linux/minidump_writer/linux_dumper.h +++ b/src/client/linux/minidump_writer/linux_dumper.h @@ -111,19 +111,13 @@ class LinuxDumper { virtual bool BuildProcPath(char* path, pid_t pid, const char* node) const = 0; // Generate a File ID from the .text section of a mapped entry. - // If not a member, mapping_id is ignored. + // If not a member, mapping_id is ignored. This method can also manipulate the + // |mapping|.name to truncate "(deleted)" from the file name if necessary. bool ElfFileIdentifierForMapping(const MappingInfo& mapping, bool member, unsigned int mapping_id, uint8_t identifier[sizeof(MDGUID)]); - // Find the shared object name (SONAME) by examining the ELF information - // for |mapping|. If the SONAME is found copy it into the passed buffer - // |soname| and return true. The size of the buffer is |soname_size|. - // The SONAME will be truncated if it is too long to fit in the buffer. - static bool ElfFileSoName( - const MappingInfo& mapping, char* soname, size_t soname_size); - uintptr_t crash_address() const { return crash_address_; } void set_crash_address(uintptr_t crash_address) { crash_address_ = crash_address; @@ -135,6 +129,17 @@ class LinuxDumper { pid_t crash_thread() const { return crash_thread_; } void set_crash_thread(pid_t crash_thread) { crash_thread_ = crash_thread; } + // Extracts the effective path and file name of from |mapping|. In most cases + // the effective name/path are just the mapping's path and basename. In some + // other cases, however, a library can be mapped from an archive (e.g., when + // loading .so libs from an apk on Android) and this method is able to + // reconstruct the original file name. + static void GetMappingEffectiveNameAndPath(const MappingInfo& mapping, + char* file_path, + size_t file_path_size, + char* file_name, + size_t file_name_size); + protected: bool ReadAuxv(); |