From 577304f02af6be71c1587d3b880b2a55ac96145b Mon Sep 17 00:00:00 2001 From: "benchan@chromium.org" Date: Wed, 11 Jan 2012 01:31:35 +0000 Subject: Refactor LinuxDumper and MinidumpWriter. This patch is part of a bigger patch that helps merging the breakpad code with the modified version in Chromium OS. Specifically, this patch makes the following changes: 1. Add two convenient methods, back() and empty(), to the wasteful_vector class. 2. Refactor the LinuxDumper class such that it can later be splitted into a base class and two derived classes, one uses the current ptrace implementation and one uses a core file. 3. Refactor the MinidumpWriter class such that it can later use different derived implementations of LinuxDumper. BUG=455 TEST=Tested the following: 1. Build on 32-bit and 64-bit Linux with gcc 4.4.3 and gcc 4.6. 2. Build on Mac OS X 10.6.8 with gcc 4.2 and clang 3.0 (with latest gmock). 3. All unit tests pass. Review URL: http://breakpad.appspot.com/340001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@902 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/linux/minidump_writer/linux_dumper.cc | 36 +++--- src/client/linux/minidump_writer/linux_dumper.h | 43 +++++-- .../linux/minidump_writer/linux_dumper_unittest.cc | 2 +- .../linux/minidump_writer/minidump_writer.cc | 135 +++++++++++---------- src/common/memory.h | 12 ++ src/common/memory_unittest.cc | 7 +- 6 files changed, 146 insertions(+), 89 deletions(-) diff --git a/src/client/linux/minidump_writer/linux_dumper.cc b/src/client/linux/minidump_writer/linux_dumper.cc index a119abaf..e1eb9847 100644 --- a/src/client/linux/minidump_writer/linux_dumper.cc +++ b/src/client/linux/minidump_writer/linux_dumper.cc @@ -118,16 +118,21 @@ inline static bool IsMappedFileOpenUnsafe( namespace google_breakpad { -LinuxDumper::LinuxDumper(int pid) +LinuxDumper::LinuxDumper(pid_t pid) : pid_(pid), + crash_address_(0), + crash_signal_(0), + crash_thread_(0), threads_suspended_(false), threads_(&allocator_, 8), mappings_(&allocator_) { } +LinuxDumper::~LinuxDumper() { +} + bool LinuxDumper::Init() { - return EnumerateThreads(&threads_) && - EnumerateMappings(&mappings_); + return EnumerateThreads() && EnumerateMappings(); } bool LinuxDumper::ThreadsSuspend() { @@ -283,8 +288,7 @@ LinuxDumper::FindBeginningOfLinuxGateSharedLibrary(const pid_t pid) const { return NULL; } -bool -LinuxDumper::EnumerateMappings(wasteful_vector* result) const { +bool LinuxDumper::EnumerateMappings() { char maps_path[NAME_MAX]; BuildProcPath(maps_path, pid_, "maps"); @@ -323,8 +327,8 @@ LinuxDumper::EnumerateMappings(wasteful_vector* result) const { } // Merge adjacent mappings with the same name into one module, // assuming they're a single library mapped by the dynamic linker - if (name && result->size()) { - MappingInfo* module = (*result)[result->size() - 1]; + if (name && !mappings_.empty()) { + MappingInfo* module = mappings_.back(); if ((start_addr == module->start_addr + module->size) && (my_strlen(name) == my_strlen(module->name)) && (my_strncmp(name, module->name, my_strlen(name)) == 0)) { @@ -343,7 +347,7 @@ LinuxDumper::EnumerateMappings(wasteful_vector* result) const { if (l < sizeof(module->name)) memcpy(module->name, name, l); } - result->push_back(module); + mappings_.push_back(module); } } } @@ -352,12 +356,12 @@ LinuxDumper::EnumerateMappings(wasteful_vector* result) const { sys_close(fd); - return result->size() > 0; + return !mappings_.empty(); } // Parse /proc/$pid/task to list all the threads of the process identified by // pid. -bool LinuxDumper::EnumerateThreads(wasteful_vector* result) const { +bool LinuxDumper::EnumerateThreads() { char task_path[NAME_MAX]; BuildProcPath(task_path, pid_, "task"); @@ -377,7 +381,7 @@ bool LinuxDumper::EnumerateThreads(wasteful_vector* result) const { if (my_strtoui(&tid, dent_name) && last_tid != tid) { last_tid = tid; - result->push_back(tid); + threads_.push_back(tid); } } dir_reader->PopEntry(); @@ -391,12 +395,17 @@ bool LinuxDumper::EnumerateThreads(wasteful_vector* result) const { // Fill out the |tgid|, |ppid| and |pid| members of |info|. If unavailable, // these members are set to -1. Returns true iff all three members are // available. -bool LinuxDumper::ThreadInfoGet(pid_t tid, ThreadInfo* info) { +bool LinuxDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { + if (index >= threads_.size()) + return false; + + pid_t tid = threads_[index]; + assert(info != NULL); char status_path[NAME_MAX]; BuildProcPath(status_path, tid, "status"); - const int fd = open(status_path, O_RDONLY); + const int fd = sys_open(status_path, O_RDONLY, 0); if (fd < 0) return false; @@ -488,7 +497,6 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len, return true; } -// static void LinuxDumper::CopyFromProcess(void* dest, pid_t child, const void* src, size_t length) { unsigned long tmp = 55; diff --git a/src/client/linux/minidump_writer/linux_dumper.h b/src/client/linux/minidump_writer/linux_dumper.h index 15280200..b0e4f855 100644 --- a/src/client/linux/minidump_writer/linux_dumper.h +++ b/src/client/linux/minidump_writer/linux_dumper.h @@ -66,7 +66,7 @@ typedef struct #define AT_SYSINFO_EHDR 33 #endif #endif // __ANDROID__ -#elif defined(__x86_64__) +#elif defined(__x86_64) typedef Elf64_auxv_t elf_aux_entry; #endif // When we find the VDSO mapping in the process's address space, this @@ -118,6 +118,8 @@ class LinuxDumper { public: explicit LinuxDumper(pid_t pid); + virtual ~LinuxDumper(); + // Parse the data for |threads| and |mappings|. bool Init(); @@ -125,9 +127,9 @@ class LinuxDumper { bool ThreadsSuspend(); bool ThreadsResume(); - // Read information about the given thread. Returns true on success. One must - // have called |ThreadsSuspend| first. - bool ThreadInfoGet(pid_t tid, ThreadInfo* info); + // Read information about the |index|-th thread of |threads_|. + // Returns true on success. One must have called |ThreadsSuspend| first. + virtual bool GetThreadInfoByIndex(size_t index, ThreadInfo* info); // These are only valid after a call to |Init|. const wasteful_vector &threads() { return threads_; } @@ -142,9 +144,10 @@ class LinuxDumper { PageAllocator* allocator() { return &allocator_; } - // memcpy from a remote process. - static void CopyFromProcess(void* dest, pid_t child, const void* src, - size_t length); + // Copy content of |length| bytes from a given process |child|, + // starting from |src|, into |dest|. + void CopyFromProcess(void* dest, pid_t child, const void* src, + size_t length); // Builds a proc path for a certain pid for a node. path is a // character array that is overwritten, and node is the final node @@ -164,9 +167,21 @@ class LinuxDumper { // shared object. Parsing the auxilary vector for AT_SYSINFO_EHDR // is the safest way to go.) void* FindBeginningOfLinuxGateSharedLibrary(const pid_t pid) const; + + uintptr_t crash_address() const { return crash_address_; } + void set_crash_address(uintptr_t crash_address) { + crash_address_ = crash_address; + } + + int crash_signal() const { return crash_signal_; } + void set_crash_signal(int crash_signal) { crash_signal_ = crash_signal; } + + pid_t crash_thread() const { return crash_thread_; } + void set_crash_thread(pid_t crash_thread) { crash_thread_ = crash_thread; } + private: - bool EnumerateMappings(wasteful_vector* result) const; - bool EnumerateThreads(wasteful_vector* result) const; + bool EnumerateMappings(); + bool EnumerateThreads(); // For the case where a running program has been deleted, it'll show up in // /proc/pid/maps as "/path/to/program (deleted)". If this is the case, then @@ -179,8 +194,18 @@ class LinuxDumper { // Returns true if |path| is modified. bool HandleDeletedFileInMapping(char* path) const; + // ID of the crashed process. const pid_t pid_; + // Virtual address at which the process crashed. + uintptr_t crash_address_; + + // Signal that terminated the crashed process. + int crash_signal_; + + // ID of the crashed thread. + pid_t crash_thread_; + mutable PageAllocator allocator_; bool threads_suspended_; diff --git a/src/client/linux/minidump_writer/linux_dumper_unittest.cc b/src/client/linux/minidump_writer/linux_dumper_unittest.cc index 6f4e0e44..cf389b57 100644 --- a/src/client/linux/minidump_writer/linux_dumper_unittest.cc +++ b/src/client/linux/minidump_writer/linux_dumper_unittest.cc @@ -225,7 +225,7 @@ TEST(LinuxDumperTest, VerifyStackReadWithMultipleThreads) { ThreadInfo one_thread; for(size_t i = 0; i < dumper.threads().size(); ++i) { - EXPECT_TRUE(dumper.ThreadInfoGet(dumper.threads()[i], &one_thread)); + EXPECT_TRUE(dumper.GetThreadInfoByIndex(i, &one_thread)); // In the helper program, we stored a pointer to the thread id in a // specific register. Check that we can recover its value. #if defined(__ARM_EABI__) diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc index b860e430..9a3d37fe 100644 --- a/src/client/linux/minidump_writer/minidump_writer.cc +++ b/src/client/linux/minidump_writer/minidump_writer.cc @@ -368,11 +368,10 @@ namespace google_breakpad { class MinidumpWriter { public: MinidumpWriter(const char* filename, - pid_t crashing_pid, const ExceptionHandler::CrashContext* context, - const MappingList& mappings) + const MappingList& mappings, + LinuxDumper* dumper) : filename_(filename), - siginfo_(&context->siginfo), ucontext_(&context->context), #if !defined(__ARM_EABI__) float_state_(&context->float_state), @@ -380,20 +379,19 @@ class MinidumpWriter { // TODO: fix this after fixing ExceptionHandler float_state_(NULL), #endif - crashing_tid_(context->tid), - dumper_(crashing_pid), - memory_blocks_(dumper_.allocator()), + dumper_(dumper), + memory_blocks_(dumper_->allocator()), mapping_list_(mappings) { } bool Init() { - return dumper_.Init() && minidump_writer_.Open(filename_) && - dumper_.ThreadsSuspend(); + return dumper_->Init() && minidump_writer_.Open(filename_) && + dumper_->ThreadsSuspend(); } ~MinidumpWriter() { minidump_writer_.Close(); - dumper_.ThreadsResume(); + dumper_->ThreadsResume(); } bool Dump() { @@ -408,7 +406,8 @@ class MinidumpWriter { for (int i = 0;;) { ElfW(Dyn) dyn; dynamic_length += sizeof(dyn); - dumper_.CopyFromProcess(&dyn, crashing_tid_, _DYNAMIC+i++, sizeof(dyn)); + dumper_->CopyFromProcess(&dyn, GetCrashThread(), _DYNAMIC+i++, + sizeof(dyn)); if (dyn.d_tag == DT_DEBUG) { r_debug = (struct r_debug*)dyn.d_un.d_ptr; continue; @@ -467,7 +466,7 @@ class MinidumpWriter { dir.CopyIndex(dir_index++, &dirent); dirent.stream_type = MD_LINUX_PROC_STATUS; - if (!WriteProcFile(&dirent.location, crashing_tid_, "status")) + if (!WriteProcFile(&dirent.location, GetCrashThread(), "status")) NullifyDirectoryEntry(&dirent); dir.CopyIndex(dir_index++, &dirent); @@ -477,22 +476,22 @@ class MinidumpWriter { dir.CopyIndex(dir_index++, &dirent); dirent.stream_type = MD_LINUX_CMD_LINE; - if (!WriteProcFile(&dirent.location, crashing_tid_, "cmdline")) + if (!WriteProcFile(&dirent.location, GetCrashThread(), "cmdline")) NullifyDirectoryEntry(&dirent); dir.CopyIndex(dir_index++, &dirent); dirent.stream_type = MD_LINUX_ENVIRON; - if (!WriteProcFile(&dirent.location, crashing_tid_, "environ")) + if (!WriteProcFile(&dirent.location, GetCrashThread(), "environ")) NullifyDirectoryEntry(&dirent); dir.CopyIndex(dir_index++, &dirent); dirent.stream_type = MD_LINUX_AUXV; - if (!WriteProcFile(&dirent.location, crashing_tid_, "auxv")) + if (!WriteProcFile(&dirent.location, GetCrashThread(), "auxv")) NullifyDirectoryEntry(&dirent); dir.CopyIndex(dir_index++, &dirent); dirent.stream_type = MD_LINUX_MAPS; - if (!WriteProcFile(&dirent.location, crashing_tid_, "maps")) + if (!WriteProcFile(&dirent.location, GetCrashThread(), "maps")) NullifyDirectoryEntry(&dirent); dir.CopyIndex(dir_index++, &dirent); @@ -506,7 +505,7 @@ class MinidumpWriter { // If you add more directory entries, don't forget to update kNumWriters, // above. - dumper_.ThreadsResume(); + dumper_->ThreadsResume(); return true; } @@ -629,7 +628,7 @@ class MinidumpWriter { // Write information about the threads. bool WriteThreadListStream(MDRawDirectory* dirent) { - const unsigned num_threads = dumper_.threads().size(); + const unsigned num_threads = dumper_->threads().size(); TypedMDRVA list(&minidump_writer_); if (!list.AllocateObjectAndArray(num_threads, sizeof(MDRawThread))) @@ -643,21 +642,22 @@ class MinidumpWriter { for (unsigned i = 0; i < num_threads; ++i) { MDRawThread thread; my_memset(&thread, 0, sizeof(thread)); - thread.thread_id = dumper_.threads()[i]; + thread.thread_id = dumper_->threads()[i]; // We have a different source of information for the crashing thread. If // we used the actual state of the thread we would find it running in the // signal handler with the alternative stack, which would be deeply // unhelpful. - if ((pid_t)thread.thread_id == crashing_tid_) { + if ((pid_t)thread.thread_id == GetCrashThread()) { const void* stack; size_t stack_len; - if (!dumper_.GetStackInfo(&stack, &stack_len, GetStackPointer())) + if (!dumper_->GetStackInfo(&stack, &stack_len, GetStackPointer())) return false; UntypedMDRVA memory(&minidump_writer_); if (!memory.Allocate(stack_len)) return false; - uint8_t* stack_copy = (uint8_t*) dumper_.allocator()->Alloc(stack_len); - dumper_.CopyFromProcess(stack_copy, thread.thread_id, stack, stack_len); + uint8_t* stack_copy = reinterpret_cast(Alloc(stack_len)); + dumper_->CopyFromProcess(stack_copy, thread.thread_id, stack, + stack_len); memory.Copy(stack_copy, stack_len); thread.stack.start_of_memory_range = (uintptr_t) (stack); thread.stack.memory = memory.location(); @@ -671,8 +671,8 @@ class MinidumpWriter { // don't bother trying to write it. bool ip_is_mapped = false; MDMemoryDescriptor ip_memory_d; - for (unsigned j = 0; j < dumper_.mappings().size(); ++j) { - const MappingInfo& mapping = *dumper_.mappings()[j]; + for (unsigned j = 0; j < dumper_->mappings().size(); ++j) { + const MappingInfo& mapping = *dumper_->mappings()[j]; if (ip >= mapping.start_addr && ip < mapping.start_addr + mapping.size) { ip_is_mapped = true; @@ -695,12 +695,12 @@ class MinidumpWriter { if (!ip_memory.Allocate(ip_memory_d.memory.data_size)) return false; uint8_t* memory_copy = - (uint8_t*) dumper_.allocator()->Alloc(ip_memory_d.memory.data_size); - dumper_.CopyFromProcess( - memory_copy, - thread.thread_id, - reinterpret_cast(ip_memory_d.start_of_memory_range), - ip_memory_d.memory.data_size); + reinterpret_cast(Alloc(ip_memory_d.memory.data_size)); + dumper_->CopyFromProcess( + memory_copy, + thread.thread_id, + reinterpret_cast(ip_memory_d.start_of_memory_range), + ip_memory_d.memory.data_size); ip_memory.Copy(memory_copy, ip_memory_d.memory.data_size); ip_memory_d.memory = ip_memory.location(); memory_blocks_.push_back(ip_memory_d); @@ -716,15 +716,14 @@ class MinidumpWriter { crashing_thread_context_ = cpu.location(); } else { ThreadInfo info; - if (!dumper_.ThreadInfoGet(dumper_.threads()[i], &info)) + if (!dumper_->GetThreadInfoByIndex(i, &info)) return false; UntypedMDRVA memory(&minidump_writer_); if (!memory.Allocate(info.stack_len)) return false; - uint8_t* stack_copy = - (uint8_t*) dumper_.allocator()->Alloc(info.stack_len); - dumper_.CopyFromProcess(stack_copy, thread.thread_id, info.stack, - info.stack_len); + uint8_t* stack_copy = reinterpret_cast(Alloc(info.stack_len)); + dumper_->CopyFromProcess(stack_copy, thread.thread_id, info.stack, + info.stack_len); memory.Copy(stack_copy, info.stack_len); thread.stack.start_of_memory_range = (uintptr_t)(info.stack); thread.stack.memory = memory.location(); @@ -777,11 +776,11 @@ class MinidumpWriter { // Because of this, we also include the full, unparsed, /proc/$x/maps file in // another stream in the file. bool WriteMappings(MDRawDirectory* dirent) { - const unsigned num_mappings = dumper_.mappings().size(); + const unsigned num_mappings = dumper_->mappings().size(); unsigned num_output_mappings = mapping_list_.size(); - for (unsigned i = 0; i < dumper_.mappings().size(); ++i) { - const MappingInfo& mapping = *dumper_.mappings()[i]; + for (unsigned i = 0; i < dumper_->mappings().size(); ++i) { + const MappingInfo& mapping = *dumper_->mappings()[i]; if (ShouldIncludeMapping(mapping) && !HaveMappingInfo(mapping)) num_output_mappings++; } @@ -797,7 +796,7 @@ class MinidumpWriter { // First write all the mappings from the dumper unsigned int j = 0; for (unsigned i = 0; i < num_mappings; ++i) { - const MappingInfo& mapping = *dumper_.mappings()[i]; + const MappingInfo& mapping = *dumper_->mappings()[i]; if (!ShouldIncludeMapping(mapping) || HaveMappingInfo(mapping)) continue; @@ -859,8 +858,8 @@ class MinidumpWriter { // GUID was provided by caller. memcpy(signature, identifier, sizeof(MDGUID)); } else { - dumper_.ElfFileIdentifierForMapping(mapping, member, - mapping_id, signature); + dumper_->ElfFileIdentifierForMapping(mapping, member, + mapping_id, signature); } my_memset(cv_ptr, 0, sizeof(uint32_t)); // Set age to 0 on Linux. cv_ptr += sizeof(uint32_t); @@ -905,10 +904,9 @@ class MinidumpWriter { dirent->stream_type = MD_EXCEPTION_STREAM; dirent->location = exc.location(); - exc.get()->thread_id = crashing_tid_; - exc.get()->exception_record.exception_code = siginfo_->si_signo; - exc.get()->exception_record.exception_address = - (uintptr_t) siginfo_->si_addr; + exc.get()->thread_id = GetCrashThread(); + exc.get()->exception_record.exception_code = dumper_->crash_signal(); + exc.get()->exception_record.exception_address = dumper_->crash_address(); exc.get()->thread_context = crashing_thread_context_; return true; @@ -945,11 +943,11 @@ class MinidumpWriter { // Count the number of loaded DSOs int dso_count = 0; struct r_debug debug_entry; - dumper_.CopyFromProcess(&debug_entry, crashing_tid_, r_debug, - sizeof(debug_entry)); + dumper_->CopyFromProcess(&debug_entry, GetCrashThread(), r_debug, + sizeof(debug_entry)); for (struct link_map* ptr = debug_entry.r_map; ptr; ) { struct link_map map; - dumper_.CopyFromProcess(&map, crashing_tid_, ptr, sizeof(map)); + dumper_->CopyFromProcess(&map, GetCrashThread(), ptr, sizeof(map)); ptr = map.l_next; dso_count++; } @@ -967,12 +965,12 @@ class MinidumpWriter { // Iterate over DSOs and write their information to mini dump for (struct link_map* ptr = debug_entry.r_map; ptr; ) { struct link_map map; - dumper_.CopyFromProcess(&map, crashing_tid_, ptr, sizeof(map)); + dumper_->CopyFromProcess(&map, GetCrashThread(), ptr, sizeof(map)); ptr = map.l_next; char filename[257] = { 0 }; if (map.l_name) { - dumper_.CopyFromProcess(filename, crashing_tid_, map.l_name, - sizeof(filename) - 1); + dumper_->CopyFromProcess(filename, GetCrashThread(), map.l_name, + sizeof(filename) - 1); } MDLocationDescriptor location; if (!minidump_writer_.WriteString(filename, 0, &location)) @@ -1001,8 +999,8 @@ class MinidumpWriter { debug.get()->dynamic = (void*)&_DYNAMIC; char *dso_debug_data = new char[dynamic_length]; - dumper_.CopyFromProcess(dso_debug_data, crashing_tid_, &_DYNAMIC, - dynamic_length); + dumper_->CopyFromProcess(dso_debug_data, GetCrashThread(), &_DYNAMIC, + dynamic_length); debug.CopyIndexAfterObject(0, dso_debug_data, dynamic_length); delete[] dso_debug_data; @@ -1011,6 +1009,14 @@ class MinidumpWriter { } private: + void* Alloc(unsigned bytes) { + return dumper_->allocator()->Alloc(bytes); + } + + pid_t GetCrashThread() const { + return dumper_->crash_thread(); + } + #if defined(__i386) uintptr_t GetStackPointer() { return ucontext_->uc_mcontext.gregs[REG_ESP]; @@ -1175,16 +1181,15 @@ class MinidumpWriter { // to read as much as we can into a buffer. static const unsigned kBufSize = 1024 - 2*sizeof(void*); struct Buffers { - struct Buffers* next; + Buffers* next; size_t len; uint8_t data[kBufSize]; - } *buffers = - (struct Buffers*) dumper_.allocator()->Alloc(sizeof(struct Buffers)); + } *buffers = reinterpret_cast(Alloc(sizeof(Buffers))); buffers->next = NULL; buffers->len = 0; size_t total = 0; - for (struct Buffers* bufptr = buffers;;) { + for (Buffers* bufptr = buffers;;) { ssize_t r; do { r = sys_read(fd, &bufptr->data[bufptr->len], kBufSize - bufptr->len); @@ -1196,8 +1201,7 @@ class MinidumpWriter { total += r; bufptr->len += r; if (bufptr->len == kBufSize) { - bufptr->next = - (struct Buffers*) dumper_.allocator()->Alloc(sizeof(struct Buffers)); + bufptr->next = reinterpret_cast(Alloc(sizeof(Buffers))); bufptr = bufptr->next; bufptr->next = NULL; bufptr->len = 0; @@ -1277,16 +1281,14 @@ class MinidumpWriter { bool WriteProcFile(MDLocationDescriptor* result, pid_t pid, const char* filename) { char buf[NAME_MAX]; - dumper_.BuildProcPath(buf, pid, filename); + dumper_->BuildProcPath(buf, pid, filename); return WriteFile(result, buf); } const char* const filename_; // output filename - const siginfo_t* const siginfo_; // from the signal handler (see sigaction) const struct ucontext* const ucontext_; // also from the signal handler const struct _libc_fpstate* const float_state_; // ditto - const pid_t crashing_tid_; // the process which actually crashed - LinuxDumper dumper_; + LinuxDumper* dumper_; MinidumpFileWriter minidump_writer_; MDLocationDescriptor crashing_thread_context_; // Blocks of memory written to the dump. These are all currently @@ -1310,7 +1312,12 @@ bool WriteMinidump(const char* filename, pid_t crashing_process, return false; const ExceptionHandler::CrashContext* context = reinterpret_cast(blob); - MinidumpWriter writer(filename, crashing_process, context, mappings); + LinuxDumper dumper(crashing_process); + dumper.set_crash_address( + reinterpret_cast(context->siginfo.si_addr)); + dumper.set_crash_signal(context->siginfo.si_signo); + dumper.set_crash_thread(context->tid); + MinidumpWriter writer(filename, context, mappings, &dumper); if (!writer.Init()) return false; return writer.Dump(); diff --git a/src/common/memory.h b/src/common/memory.h index a02ac578..e90bd52c 100644 --- a/src/common/memory.h +++ b/src/common/memory.h @@ -145,6 +145,18 @@ class wasteful_vector { used_(0) { } + T& back() { + return a_[used_ - 1]; + } + + const T& back() const { + return a_[used_ - 1]; + } + + bool empty() const { + return used_ == 0; + } + void push_back(const T& new_element) { if (used_ == allocated_) Realloc(allocated_ * 2); diff --git a/src/common/memory_unittest.cc b/src/common/memory_unittest.cc index 8b2ec410..d580c1fe 100644 --- a/src/common/memory_unittest.cc +++ b/src/common/memory_unittest.cc @@ -69,6 +69,7 @@ typedef testing::Test WastefulVectorTest; TEST(WastefulVectorTest, Setup) { PageAllocator allocator_; wasteful_vector v(&allocator_); + ASSERT_TRUE(v.empty()); ASSERT_EQ(v.size(), 0u); } @@ -76,8 +77,12 @@ TEST(WastefulVectorTest, Simple) { PageAllocator allocator_; wasteful_vector v(&allocator_); - for (unsigned i = 0; i < 256; ++i) + for (unsigned i = 0; i < 256; ++i) { v.push_back(i); + ASSERT_EQ(i, v.back()); + ASSERT_EQ(&v.back(), &v[i]); + } + ASSERT_FALSE(v.empty()); ASSERT_EQ(v.size(), 256u); for (unsigned i = 0; i < 256; ++i) ASSERT_EQ(v[i], i); -- cgit v1.2.1