Get rid of CrashReport, and rename CrashReportProcessor to MinidumpProcessor
(#26) r=mmentovai. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@26 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
bryner
parent
d9fb68c3e0
commit
cce3492afc
13 changed files with 788 additions and 1328 deletions
27
Makefile.am
27
Makefile.am
|
|
@ -36,16 +36,15 @@ lib_LTLIBRARIES = src/libairbag.la
|
|||
|
||||
src_libairbag_la_SOURCES = \
|
||||
src/google/airbag_types.h \
|
||||
src/google/crash_report.h \
|
||||
src/google/crash_report_processor.h \
|
||||
src/google/minidump_processor.h \
|
||||
src/google/stack_frame.h \
|
||||
src/google/symbol_supplier.h \
|
||||
src/processor/crash_report_processor.cc \
|
||||
src/processor/linked_ptr.h \
|
||||
src/processor/memory_region.h \
|
||||
src/processor/minidump.cc \
|
||||
src/processor/minidump.h \
|
||||
src/processor/minidump_format.h \
|
||||
src/processor/minidump_processor.cc \
|
||||
src/processor/range_map.h \
|
||||
src/processor/source_line_resolver.cc \
|
||||
src/processor/source_line_resolver.h \
|
||||
|
|
@ -63,15 +62,24 @@ bin_PROGRAMS = \
|
|||
|
||||
## Tests
|
||||
check_PROGRAMS = \
|
||||
src/processor/minidump_processor_unittest \
|
||||
src/processor/range_map_unittest \
|
||||
src/processor/source_line_resolver_unittest \
|
||||
src/processor/crash_report_processor_unittest
|
||||
src/processor/source_line_resolver_unittest
|
||||
check_SCRIPTS = \
|
||||
src/processor/minidump_dump_test \
|
||||
src/processor/minidump_stackwalk_test
|
||||
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
|
||||
TESTS_ENVIRONMENT =
|
||||
|
||||
src_processor_minidump_processor_unittest_SOURCES = \
|
||||
src/processor/minidump_processor_unittest.cc
|
||||
src_processor_minidump_processor_unittest_LDADD = \
|
||||
src/processor/minidump_processor.lo \
|
||||
src/processor/minidump.lo \
|
||||
src/processor/stackwalker.lo \
|
||||
src/processor/stackwalker_x86.lo \
|
||||
src/processor/source_line_resolver.lo
|
||||
|
||||
src_processor_range_map_unittest_SOURCES = \
|
||||
src/processor/range_map_unittest.cc
|
||||
|
||||
|
|
@ -80,15 +88,6 @@ src_processor_source_line_resolver_unittest_SOURCES = \
|
|||
src_processor_source_line_resolver_unittest_LDADD = \
|
||||
src/processor/source_line_resolver.lo
|
||||
|
||||
src_processor_crash_report_processor_unittest_SOURCES = \
|
||||
src/processor/crash_report_processor_unittest.cc
|
||||
src_processor_crash_report_processor_unittest_LDADD = \
|
||||
src/processor/crash_report_processor.lo \
|
||||
src/processor/minidump.lo \
|
||||
src/processor/stackwalker.lo \
|
||||
src/processor/stackwalker_x86.lo \
|
||||
src/processor/source_line_resolver.lo
|
||||
|
||||
## Non-installables
|
||||
noinst_PROGRAMS =
|
||||
noinst_SCRIPTS = $(check_SCRIPTS)
|
||||
|
|
|
|||
87
Makefile.in
87
Makefile.in
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.9.6 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
|
@ -31,6 +31,8 @@
|
|||
|
||||
|
||||
|
||||
SOURCES = $(src_libairbag_la_SOURCES) $(src_processor_minidump_dump_SOURCES) $(src_processor_minidump_processor_unittest_SOURCES) $(src_processor_minidump_stackwalk_SOURCES) $(src_processor_range_map_unittest_SOURCES) $(src_processor_source_line_resolver_unittest_SOURCES)
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -55,9 +57,9 @@ build_triplet = @build@
|
|||
host_triplet = @host@
|
||||
bin_PROGRAMS = src/processor/minidump_dump$(EXEEXT) \
|
||||
src/processor/minidump_stackwalk$(EXEEXT)
|
||||
check_PROGRAMS = src/processor/range_map_unittest$(EXEEXT) \
|
||||
src/processor/source_line_resolver_unittest$(EXEEXT) \
|
||||
src/processor/crash_report_processor_unittest$(EXEEXT)
|
||||
check_PROGRAMS = src/processor/minidump_processor_unittest$(EXEEXT) \
|
||||
src/processor/range_map_unittest$(EXEEXT) \
|
||||
src/processor/source_line_resolver_unittest$(EXEEXT)
|
||||
noinst_PROGRAMS =
|
||||
DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
|
|
@ -87,27 +89,26 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
|
|||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
src_libairbag_la_LIBADD =
|
||||
am__dirstamp = $(am__leading_dot)dirstamp
|
||||
am_src_libairbag_la_OBJECTS = src/processor/crash_report_processor.lo \
|
||||
src/processor/minidump.lo \
|
||||
am_src_libairbag_la_OBJECTS = src/processor/minidump.lo \
|
||||
src/processor/minidump_processor.lo \
|
||||
src/processor/source_line_resolver.lo \
|
||||
src/processor/stackwalker.lo src/processor/stackwalker_x86.lo
|
||||
src_libairbag_la_OBJECTS = $(am_src_libairbag_la_OBJECTS)
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
|
||||
am_src_processor_crash_report_processor_unittest_OBJECTS = \
|
||||
src/processor/crash_report_processor_unittest.$(OBJEXT)
|
||||
src_processor_crash_report_processor_unittest_OBJECTS = \
|
||||
$(am_src_processor_crash_report_processor_unittest_OBJECTS)
|
||||
src_processor_crash_report_processor_unittest_DEPENDENCIES = \
|
||||
src/processor/crash_report_processor.lo \
|
||||
src/processor/minidump.lo src/processor/stackwalker.lo \
|
||||
src/processor/stackwalker_x86.lo \
|
||||
src/processor/source_line_resolver.lo
|
||||
am_src_processor_minidump_dump_OBJECTS = \
|
||||
src/processor/minidump_dump.$(OBJEXT)
|
||||
src_processor_minidump_dump_OBJECTS = \
|
||||
$(am_src_processor_minidump_dump_OBJECTS)
|
||||
src_processor_minidump_dump_DEPENDENCIES = src/processor/minidump.lo
|
||||
am_src_processor_minidump_processor_unittest_OBJECTS = \
|
||||
src/processor/minidump_processor_unittest.$(OBJEXT)
|
||||
src_processor_minidump_processor_unittest_OBJECTS = \
|
||||
$(am_src_processor_minidump_processor_unittest_OBJECTS)
|
||||
src_processor_minidump_processor_unittest_DEPENDENCIES = \
|
||||
src/processor/minidump_processor.lo src/processor/minidump.lo \
|
||||
src/processor/stackwalker.lo src/processor/stackwalker_x86.lo \
|
||||
src/processor/source_line_resolver.lo
|
||||
am_src_processor_minidump_stackwalk_OBJECTS = \
|
||||
src/processor/minidump_stackwalk.$(OBJEXT)
|
||||
src_processor_minidump_stackwalk_OBJECTS = \
|
||||
|
|
@ -148,14 +149,14 @@ CCLD = $(CC)
|
|||
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(src_libairbag_la_SOURCES) \
|
||||
$(src_processor_crash_report_processor_unittest_SOURCES) \
|
||||
$(src_processor_minidump_dump_SOURCES) \
|
||||
$(src_processor_minidump_processor_unittest_SOURCES) \
|
||||
$(src_processor_minidump_stackwalk_SOURCES) \
|
||||
$(src_processor_range_map_unittest_SOURCES) \
|
||||
$(src_processor_source_line_resolver_unittest_SOURCES)
|
||||
DIST_SOURCES = $(src_libairbag_la_SOURCES) \
|
||||
$(src_processor_crash_report_processor_unittest_SOURCES) \
|
||||
$(src_processor_minidump_dump_SOURCES) \
|
||||
$(src_processor_minidump_processor_unittest_SOURCES) \
|
||||
$(src_processor_minidump_stackwalk_SOURCES) \
|
||||
$(src_processor_range_map_unittest_SOURCES) \
|
||||
$(src_processor_source_line_resolver_unittest_SOURCES)
|
||||
|
|
@ -286,16 +287,15 @@ dist_doc_DATA = \
|
|||
lib_LTLIBRARIES = src/libairbag.la
|
||||
src_libairbag_la_SOURCES = \
|
||||
src/google/airbag_types.h \
|
||||
src/google/crash_report.h \
|
||||
src/google/crash_report_processor.h \
|
||||
src/google/minidump_processor.h \
|
||||
src/google/stack_frame.h \
|
||||
src/google/symbol_supplier.h \
|
||||
src/processor/crash_report_processor.cc \
|
||||
src/processor/linked_ptr.h \
|
||||
src/processor/memory_region.h \
|
||||
src/processor/minidump.cc \
|
||||
src/processor/minidump.h \
|
||||
src/processor/minidump_format.h \
|
||||
src/processor/minidump_processor.cc \
|
||||
src/processor/range_map.h \
|
||||
src/processor/source_line_resolver.cc \
|
||||
src/processor/source_line_resolver.h \
|
||||
|
|
@ -310,6 +310,16 @@ check_SCRIPTS = \
|
|||
|
||||
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
|
||||
TESTS_ENVIRONMENT =
|
||||
src_processor_minidump_processor_unittest_SOURCES = \
|
||||
src/processor/minidump_processor_unittest.cc
|
||||
|
||||
src_processor_minidump_processor_unittest_LDADD = \
|
||||
src/processor/minidump_processor.lo \
|
||||
src/processor/minidump.lo \
|
||||
src/processor/stackwalker.lo \
|
||||
src/processor/stackwalker_x86.lo \
|
||||
src/processor/source_line_resolver.lo
|
||||
|
||||
src_processor_range_map_unittest_SOURCES = \
|
||||
src/processor/range_map_unittest.cc
|
||||
|
||||
|
|
@ -319,16 +329,6 @@ src_processor_source_line_resolver_unittest_SOURCES = \
|
|||
src_processor_source_line_resolver_unittest_LDADD = \
|
||||
src/processor/source_line_resolver.lo
|
||||
|
||||
src_processor_crash_report_processor_unittest_SOURCES = \
|
||||
src/processor/crash_report_processor_unittest.cc
|
||||
|
||||
src_processor_crash_report_processor_unittest_LDADD = \
|
||||
src/processor/crash_report_processor.lo \
|
||||
src/processor/minidump.lo \
|
||||
src/processor/stackwalker.lo \
|
||||
src/processor/stackwalker_x86.lo \
|
||||
src/processor/source_line_resolver.lo
|
||||
|
||||
noinst_SCRIPTS = $(check_SCRIPTS)
|
||||
src_processor_minidump_dump_SOURCES = \
|
||||
src/processor/minidump_dump.cc
|
||||
|
|
@ -443,11 +443,10 @@ src/processor/$(am__dirstamp):
|
|||
src/processor/$(DEPDIR)/$(am__dirstamp):
|
||||
@$(mkdir_p) src/processor/$(DEPDIR)
|
||||
@: > src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/crash_report_processor.lo: \
|
||||
src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/minidump.lo: src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/minidump_processor.lo: src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/source_line_resolver.lo: src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/stackwalker.lo: src/processor/$(am__dirstamp) \
|
||||
|
|
@ -501,17 +500,17 @@ clean-noinstPROGRAMS:
|
|||
echo " rm -f $$p $$f"; \
|
||||
rm -f $$p $$f ; \
|
||||
done
|
||||
src/processor/crash_report_processor_unittest.$(OBJEXT): \
|
||||
src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/crash_report_processor_unittest$(EXEEXT): $(src_processor_crash_report_processor_unittest_OBJECTS) $(src_processor_crash_report_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||||
@rm -f src/processor/crash_report_processor_unittest$(EXEEXT)
|
||||
$(CXXLINK) $(src_processor_crash_report_processor_unittest_LDFLAGS) $(src_processor_crash_report_processor_unittest_OBJECTS) $(src_processor_crash_report_processor_unittest_LDADD) $(LIBS)
|
||||
src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||||
@rm -f src/processor/minidump_dump$(EXEEXT)
|
||||
$(CXXLINK) $(src_processor_minidump_dump_LDFLAGS) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS)
|
||||
src/processor/minidump_processor_unittest.$(OBJEXT): \
|
||||
src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||||
@rm -f src/processor/minidump_processor_unittest$(EXEEXT)
|
||||
$(CXXLINK) $(src_processor_minidump_processor_unittest_LDFLAGS) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS)
|
||||
src/processor/minidump_stackwalk.$(OBJEXT): \
|
||||
src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
|
|
@ -533,12 +532,12 @@ src/processor/source_line_resolver_unittest$(EXEEXT): $(src_processor_source_lin
|
|||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
-rm -f src/processor/crash_report_processor.$(OBJEXT)
|
||||
-rm -f src/processor/crash_report_processor.lo
|
||||
-rm -f src/processor/crash_report_processor_unittest.$(OBJEXT)
|
||||
-rm -f src/processor/minidump.$(OBJEXT)
|
||||
-rm -f src/processor/minidump.lo
|
||||
-rm -f src/processor/minidump_dump.$(OBJEXT)
|
||||
-rm -f src/processor/minidump_processor.$(OBJEXT)
|
||||
-rm -f src/processor/minidump_processor.lo
|
||||
-rm -f src/processor/minidump_processor_unittest.$(OBJEXT)
|
||||
-rm -f src/processor/minidump_stackwalk.$(OBJEXT)
|
||||
-rm -f src/processor/range_map_unittest.$(OBJEXT)
|
||||
-rm -f src/processor/source_line_resolver.$(OBJEXT)
|
||||
|
|
@ -552,10 +551,10 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/crash_report_processor.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/crash_report_processor_unittest.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_dump.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_processor.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_processor_unittest.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_stackwalk.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/range_map_unittest.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/source_line_resolver.Plo@am__quote@
|
||||
|
|
|
|||
1621
aclocal.m4
vendored
1621
aclocal.m4
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -1,89 +0,0 @@
|
|||
// Copyright (C) 2006 Google Inc.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// CrashReport encapsulates all of the information for a single report,
|
||||
// including data sent with the report and data derived by the minidump
|
||||
// processor (stack trace, etc.).
|
||||
|
||||
#ifndef GOOGLE_CRASH_REPORT_H__
|
||||
#define GOOGLE_CRASH_REPORT_H__
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include "google/airbag_types.h"
|
||||
#include "google/stack_frame.h"
|
||||
|
||||
namespace google_airbag {
|
||||
|
||||
using std::vector;
|
||||
using std::string;
|
||||
|
||||
struct CrashReport {
|
||||
// An optional id for the report. This is supplied by the caller
|
||||
// and is not used by airbag.
|
||||
string report_id;
|
||||
|
||||
// An optional id which identifies the client that generated the report.
|
||||
string client_id;
|
||||
|
||||
// The time that the report was uploaded (milliseconds since the epoch)
|
||||
airbag_time_t report_time;
|
||||
|
||||
// The uptime of the process before it crashed
|
||||
airbag_time_t process_uptime;
|
||||
|
||||
// The cumulative uptime of the application for this user
|
||||
airbag_time_t cumulative_product_uptime;
|
||||
|
||||
// The user's email address, if they provided it
|
||||
string user_email;
|
||||
|
||||
// Extra comments the user provided, e.g. steps to reproduce the crash
|
||||
string user_comments;
|
||||
|
||||
// The product which sent this report
|
||||
struct Product {
|
||||
string name;
|
||||
string version;
|
||||
};
|
||||
Product product;
|
||||
|
||||
// The user's operating system
|
||||
struct OS {
|
||||
string name;
|
||||
string version;
|
||||
};
|
||||
OS os;
|
||||
|
||||
// The user's CPU architecture (x86, PowerPC, x86_64, ...)
|
||||
string cpu_arch;
|
||||
|
||||
// Extra product-specific key/value pairs
|
||||
struct ProductData {
|
||||
string key;
|
||||
string value;
|
||||
};
|
||||
vector<ProductData> product_data;
|
||||
|
||||
// The stack frames for the crashed thread, top-first.m
|
||||
// TODO(bryner): accommodate multiple threads
|
||||
StackFrames stack_frames;
|
||||
|
||||
// The stack trace "signature", which can be used for matching up reports
|
||||
string stack_signature;
|
||||
};
|
||||
|
||||
} // namespace google_airbag
|
||||
|
||||
#endif // GOOGLE_CRASH_REPORT_H__
|
||||
|
|
@ -12,28 +12,30 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#ifndef GOOGLE_CRASH_REPORT_PROCESSOR_H__
|
||||
#define GOOGLE_CRASH_REPORT_PROCESSOR_H__
|
||||
#ifndef GOOGLE_MINIDUMP_PROCESSOR_H__
|
||||
#define GOOGLE_MINIDUMP_PROCESSOR_H__
|
||||
|
||||
#include <string>
|
||||
#include "google/stack_frame.h"
|
||||
|
||||
namespace google_airbag {
|
||||
|
||||
using std::string;
|
||||
|
||||
struct CrashReport;
|
||||
class SymbolSupplier;
|
||||
|
||||
class CrashReportProcessor {
|
||||
class MinidumpProcessor {
|
||||
public:
|
||||
// Initializes this CrashReportProcessor. supplier should be an
|
||||
// Initializes this MinidumpProcessor. supplier should be an
|
||||
// implementation of the SymbolSupplier abstract base class.
|
||||
CrashReportProcessor(SymbolSupplier *supplier);
|
||||
~CrashReportProcessor();
|
||||
MinidumpProcessor(SymbolSupplier *supplier);
|
||||
~MinidumpProcessor();
|
||||
|
||||
// Fills in the stack and other derived data for the CrashReport,
|
||||
// using the supplied minidump file. Returns true on success.
|
||||
bool ProcessReport(CrashReport *report, const string &minidump_file);
|
||||
// Fills in the given StackFrames vector by processing the minidump file.
|
||||
// supplier_data is an opaque pointer which is passed to
|
||||
// SymbolSupplier::GetSymbolFile(). Returns true on success.
|
||||
bool Process(const string &minidump_file, void *supplier_data,
|
||||
StackFrames *stack_frames);
|
||||
|
||||
private:
|
||||
SymbolSupplier *supplier_;
|
||||
|
|
@ -41,4 +43,4 @@ class CrashReportProcessor {
|
|||
|
||||
} // namespace google_airbag
|
||||
|
||||
#endif // GOOGLE_CRASH_REPORT_PROCESSOR_H__
|
||||
#endif // GOOGLE_MINIDUMP_PROCESSOR_H__
|
||||
|
|
@ -24,16 +24,15 @@ namespace google_airbag {
|
|||
|
||||
using std::string;
|
||||
class MinidumpModule;
|
||||
struct CrashReport;
|
||||
|
||||
class SymbolSupplier {
|
||||
public:
|
||||
virtual ~SymbolSupplier() {}
|
||||
|
||||
// Returns the path to the symbol file for the given module.
|
||||
// report will be the pointer supplied to ProcessReport().
|
||||
// supplier_data is passed through from MinidumpProcessor::Process().
|
||||
virtual string GetSymbolFile(MinidumpModule *module,
|
||||
const CrashReport *report) = 0;
|
||||
void *supplier_data) = 0;
|
||||
};
|
||||
|
||||
} // namespace google_airbag
|
||||
|
|
|
|||
|
|
@ -1,107 +0,0 @@
|
|||
// Copyright (C) 2006 Google Inc.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// Unit test for CrashReporter. Uses a pre-generated minidump and
|
||||
// corresponding symbol file, and checks the contents of the CrashReport.
|
||||
|
||||
#include <string>
|
||||
#include "google/crash_report.h"
|
||||
#include "google/crash_report_processor.h"
|
||||
#include "google/symbol_supplier.h"
|
||||
#include "processor/minidump.h"
|
||||
|
||||
using std::string;
|
||||
using google_airbag::CrashReportProcessor;
|
||||
using google_airbag::CrashReport;
|
||||
|
||||
#define ASSERT_TRUE(cond) \
|
||||
if (!(cond)) { \
|
||||
fprintf(stderr, "FAILED: %s at %s:%d\n", #cond, __FILE__, __LINE__); \
|
||||
return false; \
|
||||
}
|
||||
|
||||
#define ASSERT_EQ(e1, e2) ASSERT_TRUE((e1) == (e2))
|
||||
|
||||
namespace google_airbag {
|
||||
|
||||
class TestSymbolSupplier : public SymbolSupplier {
|
||||
public:
|
||||
virtual string GetSymbolFile(MinidumpModule *module,
|
||||
const CrashReport *report);
|
||||
};
|
||||
|
||||
string TestSymbolSupplier::GetSymbolFile(MinidumpModule *module,
|
||||
const CrashReport *report) {
|
||||
if (*(module->GetName()) == "c:\\test_app.exe") {
|
||||
return string(getenv("srcdir") ? getenv("srcdir") : ".") +
|
||||
"/src/processor/testdata/minidump2.sym";
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
} // namespace google_airbag
|
||||
|
||||
using google_airbag::TestSymbolSupplier;
|
||||
|
||||
static bool RunTests() {
|
||||
|
||||
TestSymbolSupplier supplier;
|
||||
CrashReportProcessor processor(&supplier);
|
||||
|
||||
CrashReport report;
|
||||
string minidump_file = string(getenv("srcdir") ? getenv("srcdir") : ".") +
|
||||
"/src/processor/testdata/minidump2.dmp";
|
||||
|
||||
ASSERT_TRUE(processor.ProcessReport(&report, minidump_file));
|
||||
ASSERT_EQ(report.stack_frames.size(), 4);
|
||||
|
||||
ASSERT_EQ(report.stack_frames[0].module_base, 0x400000);
|
||||
ASSERT_EQ(report.stack_frames[0].module_name, "c:\\test_app.exe");
|
||||
ASSERT_EQ(report.stack_frames[0].function_name, "CrashFunction");
|
||||
ASSERT_EQ(report.stack_frames[0].source_file_name, "c:\\test_app.cc");
|
||||
ASSERT_EQ(report.stack_frames[0].source_line, 36);
|
||||
|
||||
ASSERT_EQ(report.stack_frames[1].module_base, 0x400000);
|
||||
ASSERT_EQ(report.stack_frames[1].module_name, "c:\\test_app.exe");
|
||||
ASSERT_EQ(report.stack_frames[1].function_name, "main");
|
||||
ASSERT_EQ(report.stack_frames[1].source_file_name, "c:\\test_app.cc");
|
||||
ASSERT_EQ(report.stack_frames[1].source_line, 42);
|
||||
|
||||
// This comes from the CRT
|
||||
ASSERT_EQ(report.stack_frames[2].module_base, 0x400000);
|
||||
ASSERT_EQ(report.stack_frames[2].module_name, "c:\\test_app.exe");
|
||||
ASSERT_EQ(report.stack_frames[2].function_name, "__tmainCRTStartup");
|
||||
ASSERT_EQ(report.stack_frames[2].source_file_name,
|
||||
"f:\\rtm\\vctools\\crt_bld\\self_x86\\crt\\src\\crt0.c");
|
||||
ASSERT_EQ(report.stack_frames[2].source_line, 318);
|
||||
|
||||
// No debug info available for kernel32.dll
|
||||
ASSERT_EQ(report.stack_frames[3].module_base, 0x7c800000);
|
||||
ASSERT_EQ(report.stack_frames[3].module_name,
|
||||
"C:\\WINDOWS\\system32\\kernel32.dll");
|
||||
ASSERT_TRUE(report.stack_frames[3].function_name.empty());
|
||||
ASSERT_TRUE(report.stack_frames[3].source_file_name.empty());
|
||||
ASSERT_EQ(report.stack_frames[3].source_line, 0);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
if (!RunTests()) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -12,22 +12,22 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "google/crash_report.h"
|
||||
#include "google/crash_report_processor.h"
|
||||
#include "google/minidump_processor.h"
|
||||
#include "processor/minidump.h"
|
||||
#include "processor/stackwalker_x86.h"
|
||||
|
||||
namespace google_airbag {
|
||||
|
||||
CrashReportProcessor::CrashReportProcessor(SymbolSupplier *supplier)
|
||||
MinidumpProcessor::MinidumpProcessor(SymbolSupplier *supplier)
|
||||
: supplier_(supplier) {
|
||||
}
|
||||
|
||||
CrashReportProcessor::~CrashReportProcessor() {
|
||||
MinidumpProcessor::~MinidumpProcessor() {
|
||||
}
|
||||
|
||||
bool CrashReportProcessor::ProcessReport(CrashReport *report,
|
||||
const string &minidump_file) {
|
||||
bool MinidumpProcessor::Process(const string &minidump_file,
|
||||
void *supplier_data,
|
||||
StackFrames *stack_frames) {
|
||||
Minidump dump(minidump_file);
|
||||
if (!dump.Read()) {
|
||||
return false;
|
||||
|
|
@ -56,8 +56,8 @@ bool CrashReportProcessor::ProcessReport(CrashReport *report,
|
|||
|
||||
// TODO(bryner): figure out which StackWalker we want
|
||||
StackwalkerX86 walker(exception->GetContext(), thread_memory,
|
||||
dump.GetModuleList(), supplier_, report);
|
||||
walker.Walk(&report->stack_frames);
|
||||
dump.GetModuleList(), supplier_, supplier_data);
|
||||
walker.Walk(stack_frames);
|
||||
return true;
|
||||
}
|
||||
|
||||
118
src/processor/minidump_processor_unittest.cc
Normal file
118
src/processor/minidump_processor_unittest.cc
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
// Copyright (C) 2006 Google Inc.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// Unit test for MinidumpProcessor. Uses a pre-generated minidump and
|
||||
// corresponding symbol file, and checks the stack frames for correctness.
|
||||
|
||||
#include <string>
|
||||
#include "google/minidump_processor.h"
|
||||
#include "google/symbol_supplier.h"
|
||||
#include "processor/minidump.h"
|
||||
|
||||
using std::string;
|
||||
using google_airbag::MinidumpProcessor;
|
||||
using google_airbag::StackFrames;
|
||||
|
||||
#define ASSERT_TRUE(cond) \
|
||||
if (!(cond)) { \
|
||||
fprintf(stderr, "FAILED: %s at %s:%d\n", #cond, __FILE__, __LINE__); \
|
||||
return false; \
|
||||
}
|
||||
|
||||
#define ASSERT_EQ(e1, e2) ASSERT_TRUE((e1) == (e2))
|
||||
|
||||
namespace google_airbag {
|
||||
|
||||
class TestSymbolSupplier : public SymbolSupplier {
|
||||
public:
|
||||
TestSymbolSupplier() : has_supplier_data_(false) {}
|
||||
virtual ~TestSymbolSupplier() {}
|
||||
|
||||
virtual string GetSymbolFile(MinidumpModule *module, void *supplier_data);
|
||||
|
||||
// This member is used to test the data argument to GetSymbolFile.
|
||||
// If the argument is correct, it's set to true.
|
||||
bool has_supplier_data_;
|
||||
};
|
||||
|
||||
string TestSymbolSupplier::GetSymbolFile(MinidumpModule *module,
|
||||
void *supplier_data) {
|
||||
if (supplier_data == &has_supplier_data_) {
|
||||
has_supplier_data_ = true;
|
||||
}
|
||||
|
||||
if (*(module->GetName()) == "c:\\test_app.exe") {
|
||||
return string(getenv("srcdir") ? getenv("srcdir") : ".") +
|
||||
"/src/processor/testdata/minidump2.sym";
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
} // namespace google_airbag
|
||||
|
||||
using google_airbag::TestSymbolSupplier;
|
||||
|
||||
static bool RunTests() {
|
||||
|
||||
TestSymbolSupplier supplier;
|
||||
MinidumpProcessor processor(&supplier);
|
||||
|
||||
StackFrames stack_frames;
|
||||
string minidump_file = string(getenv("srcdir") ? getenv("srcdir") : ".") +
|
||||
"/src/processor/testdata/minidump2.dmp";
|
||||
|
||||
ASSERT_TRUE(processor.Process(minidump_file,
|
||||
&supplier.has_supplier_data_, &stack_frames));
|
||||
ASSERT_TRUE(supplier.has_supplier_data_);
|
||||
ASSERT_EQ(stack_frames.size(), 4);
|
||||
|
||||
ASSERT_EQ(stack_frames[0].module_base, 0x400000);
|
||||
ASSERT_EQ(stack_frames[0].module_name, "c:\\test_app.exe");
|
||||
ASSERT_EQ(stack_frames[0].function_name, "CrashFunction");
|
||||
ASSERT_EQ(stack_frames[0].source_file_name, "c:\\test_app.cc");
|
||||
ASSERT_EQ(stack_frames[0].source_line, 36);
|
||||
|
||||
ASSERT_EQ(stack_frames[1].module_base, 0x400000);
|
||||
ASSERT_EQ(stack_frames[1].module_name, "c:\\test_app.exe");
|
||||
ASSERT_EQ(stack_frames[1].function_name, "main");
|
||||
ASSERT_EQ(stack_frames[1].source_file_name, "c:\\test_app.cc");
|
||||
ASSERT_EQ(stack_frames[1].source_line, 42);
|
||||
|
||||
// This comes from the CRT
|
||||
ASSERT_EQ(stack_frames[2].module_base, 0x400000);
|
||||
ASSERT_EQ(stack_frames[2].module_name, "c:\\test_app.exe");
|
||||
ASSERT_EQ(stack_frames[2].function_name, "__tmainCRTStartup");
|
||||
ASSERT_EQ(stack_frames[2].source_file_name,
|
||||
"f:\\rtm\\vctools\\crt_bld\\self_x86\\crt\\src\\crt0.c");
|
||||
ASSERT_EQ(stack_frames[2].source_line, 318);
|
||||
|
||||
// No debug info available for kernel32.dll
|
||||
ASSERT_EQ(stack_frames[3].module_base, 0x7c800000);
|
||||
ASSERT_EQ(stack_frames[3].module_name,
|
||||
"C:\\WINDOWS\\system32\\kernel32.dll");
|
||||
ASSERT_TRUE(stack_frames[3].function_name.empty());
|
||||
ASSERT_TRUE(stack_frames[3].source_file_name.empty());
|
||||
ASSERT_EQ(stack_frames[3].source_line, 0);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
if (!RunTests()) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -34,11 +34,11 @@ using std::auto_ptr;
|
|||
|
||||
|
||||
Stackwalker::Stackwalker(MemoryRegion* memory, MinidumpModuleList* modules,
|
||||
SymbolSupplier *supplier, const CrashReport *report)
|
||||
SymbolSupplier* supplier, void* supplier_data)
|
||||
: memory_(memory),
|
||||
modules_(modules),
|
||||
supplier_(supplier),
|
||||
report_(report) {
|
||||
supplier_data_(supplier_data) {
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -64,7 +64,8 @@ void Stackwalker::Walk(StackFrames *frames) {
|
|||
frame->module_name = *(module->GetName());
|
||||
frame->module_base = module->base_address();
|
||||
if (modules_ && supplier_) {
|
||||
string symbol_file = supplier_->GetSymbolFile(module, report_);
|
||||
string symbol_file =
|
||||
supplier_->GetSymbolFile(module, supplier_data_);
|
||||
if (!symbol_file.empty()) {
|
||||
resolver.LoadModule(*(module->GetName()), symbol_file);
|
||||
resolver.FillSourceLineInfo(frame.get());
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ namespace google_airbag {
|
|||
|
||||
class MinidumpModuleList;
|
||||
class SymbolSupplier;
|
||||
struct CrashReport;
|
||||
|
||||
|
||||
class Stackwalker {
|
||||
|
|
@ -55,12 +54,12 @@ class Stackwalker {
|
|||
// that is used to look up which code module each stack frame is
|
||||
// associated with. supplier is an optional caller-supplied SymbolSupplier
|
||||
// implementation. If supplier is NULL, source line info will not be
|
||||
// resolved. The CrashReport object will be passed to the SymbolSupplier's
|
||||
// resolved. supplier_data will be passed to the SymbolSupplier's
|
||||
// GetSymbolFile method.
|
||||
Stackwalker(MemoryRegion* memory,
|
||||
MinidumpModuleList* modules,
|
||||
SymbolSupplier* supplier,
|
||||
const CrashReport* report);
|
||||
void* supplier_data);
|
||||
|
||||
// The stack memory to walk. Subclasses will require this region to
|
||||
// get information from the stack.
|
||||
|
|
@ -85,8 +84,8 @@ class Stackwalker {
|
|||
// The optional SymbolSupplier for resolving source line info.
|
||||
SymbolSupplier* supplier_;
|
||||
|
||||
// The CrashReport object which is passed to the SymbolSupplier. May be null.
|
||||
const CrashReport* report_;
|
||||
// Caller-supplied data to be passed to the symbol supplier
|
||||
void* supplier_data_;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ StackwalkerX86::StackwalkerX86(MinidumpContext* context,
|
|||
MemoryRegion* memory,
|
||||
MinidumpModuleList* modules,
|
||||
SymbolSupplier* supplier,
|
||||
const CrashReport* report)
|
||||
: Stackwalker(memory, modules, supplier, report),
|
||||
void* supplier_data)
|
||||
: Stackwalker(memory, modules, supplier, supplier_data),
|
||||
last_frame_pointer_(0) {
|
||||
if (memory_->GetBase() + memory_->GetSize() - 1 > 0xffffffff) {
|
||||
// The x86 is a 32-bit CPU, the limits of the supplied stack are invalid.
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class StackwalkerX86 : public Stackwalker {
|
|||
MemoryRegion* memory,
|
||||
MinidumpModuleList* modules,
|
||||
SymbolSupplier* supplier,
|
||||
const CrashReport* report);
|
||||
void* supplier_data);
|
||||
|
||||
private:
|
||||
// Implementation of Stackwalker, using x86 context (%ebp, %eip) and
|
||||
|
|
|
|||
Loading…
Reference in a new issue