From e5dc60822e5938fea2ae892ccddb906641ba174e Mon Sep 17 00:00:00 2001 From: mmentovai Date: Wed, 14 Feb 2007 19:51:05 +0000 Subject: Rename Airbag to Breakpad. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@122 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/tools/mac/crash_report/crash_report.mm | 45 +++++++++++----------- .../crash_report.xcodeproj/project.pbxproj | 22 +++++------ .../mac/crash_report/on_demand_symbol_supplier.h | 10 ++--- .../mac/crash_report/on_demand_symbol_supplier.mm | 14 +++---- src/tools/mac/dump_syms/dump_syms_tool.m | 2 +- src/tools/mac/symupload/minidump_upload.m | 2 +- src/tools/mac/symupload/symupload.m | 2 +- 7 files changed, 48 insertions(+), 49 deletions(-) (limited to 'src/tools/mac') diff --git a/src/tools/mac/crash_report/crash_report.mm b/src/tools/mac/crash_report/crash_report.mm index 355c9dd3..9d749349 100644 --- a/src/tools/mac/crash_report/crash_report.mm +++ b/src/tools/mac/crash_report/crash_report.mm @@ -1,4 +1,3 @@ -// // Copyright (c) 2006, Google Inc. // All rights reserved. // @@ -40,14 +39,14 @@ #include -#include "google_airbag/processor/basic_source_line_resolver.h" -#include "google_airbag/processor/call_stack.h" -#include "google_airbag/processor/code_module.h" -#include "google_airbag/processor/minidump.h" -#include "google_airbag/processor/minidump_processor.h" -#include "google_airbag/processor/process_state.h" -#include "google_airbag/processor/stack_frame_cpu.h" -#include "google_airbag/processor/system_info.h" +#include "google_breakpad/processor/basic_source_line_resolver.h" +#include "google_breakpad/processor/call_stack.h" +#include "google_breakpad/processor/code_module.h" +#include "google_breakpad/processor/minidump.h" +#include "google_breakpad/processor/minidump_processor.h" +#include "google_breakpad/processor/process_state.h" +#include "google_breakpad/processor/stack_frame_cpu.h" +#include "google_breakpad/processor/system_info.h" #include "processor/pathname_stripper.h" #include "processor/scoped_ptr.h" #include "processor/simple_symbol_supplier.h" @@ -56,19 +55,19 @@ using std::string; -using google_airbag::BasicSourceLineResolver; -using google_airbag::CallStack; -using google_airbag::CodeModule; -using google_airbag::CodeModules; -using google_airbag::MinidumpProcessor; -using google_airbag::OnDemandSymbolSupplier; -using google_airbag::PathnameStripper; -using google_airbag::ProcessState; -using google_airbag::scoped_ptr; -using google_airbag::StackFrame; -using google_airbag::StackFramePPC; -using google_airbag::StackFrameX86; -using google_airbag::SystemInfo; +using google_breakpad::BasicSourceLineResolver; +using google_breakpad::CallStack; +using google_breakpad::CodeModule; +using google_breakpad::CodeModules; +using google_breakpad::MinidumpProcessor; +using google_breakpad::OnDemandSymbolSupplier; +using google_breakpad::PathnameStripper; +using google_breakpad::ProcessState; +using google_breakpad::scoped_ptr; +using google_breakpad::StackFrame; +using google_breakpad::StackFramePPC; +using google_breakpad::StackFrameX86; +using google_breakpad::SystemInfo; typedef struct { NSString *minidumpPath; @@ -254,7 +253,7 @@ static void Start(Options *options) { //============================================================================= static void Usage(int argc, const char *argv[]) { - fprintf(stderr, "Convert a minidump to a crash report. Airbag symbol files\n"); + fprintf(stderr, "Convert a minidump to a crash report. Breakpad symbol files\n"); fprintf(stderr, "will be used (or created if missing) in /tmp.\n"); fprintf(stderr, "Usage: %s [-s search-dir] minidump-file\n", argv[0]); fprintf(stderr, "\t-s: Specify a search directory to use for missing modules\n"); diff --git a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj index 24459d13..569073bb 100644 --- a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj +++ b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj @@ -74,8 +74,8 @@ 08FB7796FE84155DC02AAC07 /* crash_report.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = crash_report.mm; sourceTree = ""; }; 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 8DD76FA10486AA7600D96B5E /* crash_report */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crash_report; sourceTree = BUILT_PRODUCTS_DIR; }; - 9B35FEE20B2675F9008DE8C7 /* code_module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_module.h; path = ../../../google_airbag/processor/code_module.h; sourceTree = SOURCE_ROOT; }; - 9B35FEE30B2675F9008DE8C7 /* code_modules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_modules.h; path = ../../../google_airbag/processor/code_modules.h; sourceTree = SOURCE_ROOT; }; + 9B35FEE20B2675F9008DE8C7 /* code_module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_module.h; path = ../../../google_breakpad/processor/code_module.h; sourceTree = SOURCE_ROOT; }; + 9B35FEE30B2675F9008DE8C7 /* code_modules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_modules.h; path = ../../../google_breakpad/processor/code_modules.h; sourceTree = SOURCE_ROOT; }; 9B35FEE60B26761C008DE8C7 /* basic_code_module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = basic_code_module.h; path = ../../../processor/basic_code_module.h; sourceTree = SOURCE_ROOT; }; 9B35FEE70B26761C008DE8C7 /* basic_code_modules.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = basic_code_modules.cc; path = ../../../processor/basic_code_modules.cc; sourceTree = SOURCE_ROOT; }; 9B35FEE80B26761C008DE8C7 /* basic_code_modules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = basic_code_modules.h; path = ../../../processor/basic_code_modules.h; sourceTree = SOURCE_ROOT; }; @@ -83,7 +83,7 @@ 9B3904950B2E52D90059FABE /* source_line_resolver_interface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = source_line_resolver_interface.h; sourceTree = ""; }; 9B3904980B2E52FD0059FABE /* basic_source_line_resolver.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = basic_source_line_resolver.cc; path = ../../../processor/basic_source_line_resolver.cc; sourceTree = SOURCE_ROOT; }; 9B44619D0B66C66B00BBB817 /* system_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = system_info.h; sourceTree = ""; }; - 9BDF16F90B1B8ACD00F8391B /* airbag_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = airbag_types.h; sourceTree = ""; }; + 9BDF16F90B1B8ACD00F8391B /* breakpad_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = breakpad_types.h; sourceTree = ""; }; 9BDF16FA0B1B8ACD00F8391B /* minidump_format.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = minidump_format.h; sourceTree = ""; }; 9BDF16FC0B1B8ACD00F8391B /* call_stack.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = call_stack.h; sourceTree = ""; }; 9BDF16FD0B1B8ACD00F8391B /* memory_region.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = memory_region.h; sourceTree = ""; }; @@ -138,21 +138,21 @@ 08FB7796FE84155DC02AAC07 /* crash_report.mm */, 9BDF176B0B1B8CB100F8391B /* on_demand_symbol_supplier.h */, 9BDF176C0B1B8CB100F8391B /* on_demand_symbol_supplier.mm */, - 08FB7795FE84155DC02AAC07 /* airbag */, + 08FB7795FE84155DC02AAC07 /* breakpad */, 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); name = crash_report; sourceTree = ""; }; - 08FB7795FE84155DC02AAC07 /* airbag */ = { + 08FB7795FE84155DC02AAC07 /* breakpad */ = { isa = PBXGroup; children = ( 9BE650AB0B52FE1A00611104 /* common */, 9BDF17280B1B8B0200F8391B /* processor */, - 9BDF16F70B1B8ACD00F8391B /* google_airbag */, + 9BDF16F70B1B8ACD00F8391B /* google_breakpad */, ); - name = airbag; + name = breakpad; sourceTree = ""; }; 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = { @@ -171,20 +171,20 @@ name = Products; sourceTree = ""; }; - 9BDF16F70B1B8ACD00F8391B /* google_airbag */ = { + 9BDF16F70B1B8ACD00F8391B /* google_breakpad */ = { isa = PBXGroup; children = ( 9BDF16F80B1B8ACD00F8391B /* common */, 9BDF16FB0B1B8ACD00F8391B /* processor */, ); - name = google_airbag; - path = ../../../google_airbag; + name = google_breakpad; + path = ../../../google_breakpad; sourceTree = SOURCE_ROOT; }; 9BDF16F80B1B8ACD00F8391B /* common */ = { isa = PBXGroup; children = ( - 9BDF16F90B1B8ACD00F8391B /* airbag_types.h */, + 9BDF16F90B1B8ACD00F8391B /* breakpad_types.h */, 9BDF16FA0B1B8ACD00F8391B /* minidump_format.h */, ); path = common; diff --git a/src/tools/mac/crash_report/on_demand_symbol_supplier.h b/src/tools/mac/crash_report/on_demand_symbol_supplier.h index 0cd78f58..22c3c825 100644 --- a/src/tools/mac/crash_report/on_demand_symbol_supplier.h +++ b/src/tools/mac/crash_report/on_demand_symbol_supplier.h @@ -28,16 +28,16 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // on_demand_symbol_supplier.h: Provides a Symbol Supplier that will create -// an airbag symbol file on demand. +// an breakpad symbol file on demand. #ifndef TOOLS_MAC_CRASH_REPORT_ON_DEMAND_SYMBOL_SUPPLIER_H__ #define TOOLS_MAC_CRASH_REPORT_ON_DEMAND_SYMBOL_SUPPLIER_H__ #include #include -#include "google_airbag/processor/symbol_supplier.h" +#include "google_breakpad/processor/symbol_supplier.h" -namespace google_airbag { +namespace google_breakpad { using std::map; using std::string; @@ -79,12 +79,12 @@ class OnDemandSymbolSupplier : public SymbolSupplier { // returned, then |module| doesn't have a symbol file. string GetModuleSymbolFile(const CodeModule *module); - // Generate the airbag symbol file for |module|. Return true if successful. + // Generate the breakpad symbol file for |module|. Return true if successful. // File is generated in /tmp. bool GenerateSymbolFile(const CodeModule *module, const SystemInfo *system_info); }; -} // namespace google_airbag +} // namespace google_breakpad #endif // TOOLS_MAC_CRASH_REPORT_ON_DEMAND_SYMBOL_SUPPLIER_H__ diff --git a/src/tools/mac/crash_report/on_demand_symbol_supplier.mm b/src/tools/mac/crash_report/on_demand_symbol_supplier.mm index d0dd7fb8..5f3bee91 100644 --- a/src/tools/mac/crash_report/on_demand_symbol_supplier.mm +++ b/src/tools/mac/crash_report/on_demand_symbol_supplier.mm @@ -31,9 +31,9 @@ #include #include -#include "google_airbag/processor/basic_source_line_resolver.h" -#include "google_airbag/processor/minidump.h" -#include "google_airbag/processor/system_info.h" +#include "google_breakpad/processor/basic_source_line_resolver.h" +#include "google_breakpad/processor/minidump.h" +#include "google_breakpad/processor/system_info.h" #include "processor/pathname_stripper.h" #include "on_demand_symbol_supplier.h" @@ -42,10 +42,10 @@ using std::map; using std::string; -using google_airbag::OnDemandSymbolSupplier; -using google_airbag::PathnameStripper; -using google_airbag::SymbolSupplier; -using google_airbag::SystemInfo; +using google_breakpad::OnDemandSymbolSupplier; +using google_breakpad::PathnameStripper; +using google_breakpad::SymbolSupplier; +using google_breakpad::SystemInfo; OnDemandSymbolSupplier::OnDemandSymbolSupplier(const string &search_dir) : search_dir_(search_dir) { diff --git a/src/tools/mac/dump_syms/dump_syms_tool.m b/src/tools/mac/dump_syms/dump_syms_tool.m index 147989bf..d0a343ab 100644 --- a/src/tools/mac/dump_syms/dump_syms_tool.m +++ b/src/tools/mac/dump_syms/dump_syms_tool.m @@ -67,7 +67,7 @@ static void Start(Options *options) { //============================================================================= static void Usage(int argc, const char *argv[]) { - fprintf(stderr, "Output an Airbag symbol file from a Mach-o file.\n"); + fprintf(stderr, "Output an Breakpad symbol file from a Mach-o file.\n"); fprintf(stderr, "Usage: %s [-a ppc|i386|x86] \n", argv[0]); fprintf(stderr, "\t-a: Architecture type [default: native]\n"); diff --git a/src/tools/mac/symupload/minidump_upload.m b/src/tools/mac/symupload/minidump_upload.m index 4552bb1e..4f9d8c7a 100644 --- a/src/tools/mac/symupload/minidump_upload.m +++ b/src/tools/mac/symupload/minidump_upload.m @@ -31,7 +31,7 @@ // a multipart/form-data POST request with the following parameters: // prod: the product name // ver: the product version -// symbol_file: the airbag format symbol file +// symbol_file: the breakpad format symbol file #import diff --git a/src/tools/mac/symupload/symupload.m b/src/tools/mac/symupload/symupload.m index 15e6ad80..70b2ef73 100644 --- a/src/tools/mac/symupload/symupload.m +++ b/src/tools/mac/symupload/symupload.m @@ -36,7 +36,7 @@ // "11111111BBBB3333DDDD555555555555F" // os: the operating system that the module was built for // cpu: the CPU that the module was built for (x86 or ppc) -// symbol_file: the contents of the airbag-format symbol file +// symbol_file: the contents of the breakpad-format symbol file #include -- cgit v1.2.1