aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjessicag.feedback@gmail.com <jessicag.feedback@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-08-26 20:27:24 +0000
committerjessicag.feedback@gmail.com <jessicag.feedback@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-08-26 20:27:24 +0000
commit64506d2ed7ae029f6d6933da69fa0a7dea0ece2f (patch)
tree56ae53df7dab2980ded2adc40e2de6670757d84a
parentCleanup: Remove a useless check. (diff)
downloadbreakpad-64506d2ed7ae029f6d6933da69fa0a7dea0ece2f.tar.xz
Issue 176001: Add package to process_state.proto to prevent name clashes.
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@671 4c0a9323-5329-0410-9bdc-e9ce6186880e
-rw-r--r--src/processor/proto/process_state.pb.cc97
-rw-r--r--src/processor/proto/process_state.pb.h128
-rw-r--r--src/processor/proto/process_state.proto1
3 files changed, 119 insertions, 107 deletions
diff --git a/src/processor/proto/process_state.pb.cc b/src/processor/proto/process_state.pb.cc
index 3a0541e8..df2d8fb5 100644
--- a/src/processor/proto/process_state.pb.cc
+++ b/src/processor/proto/process_state.pb.cc
@@ -10,6 +10,8 @@
#include <google/protobuf/wire_format.h>
// @@protoc_insertion_point(includes)
+namespace google_breakpad {
+
namespace {
const ::google::protobuf::Descriptor* ProcessStateProto_descriptor_ = NULL;
@@ -182,25 +184,28 @@ void protobuf_AddDesc_process_5fstate_2eproto() {
GOOGLE_PROTOBUF_VERIFY_VERSION;
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
- "\n\023process_state.proto\"\202\003\n\021ProcessStatePr"
- "oto\022\027\n\017time_date_stamp\030\001 \001(\003\022\'\n\005crash\030\002 "
- "\001(\0132\030.ProcessStateProto.Crash\022\021\n\tasserti"
- "on\030\003 \001(\t\022\031\n\021requesting_thread\030\004 \001(\005\022*\n\007t"
- "hreads\030\005 \003(\0132\031.ProcessStateProto.Thread\022"
- "\034\n\007modules\030\006 \003(\0132\013.CodeModule\022\n\n\002os\030\007 \001("
- "\t\022\020\n\010os_short\030\010 \001(\t\022\022\n\nos_version\030\t \001(\t\022"
- "\013\n\003cpu\030\n \001(\t\022\020\n\010cpu_info\030\013 \001(\t\022\021\n\tcpu_co"
- "unt\030\014 \001(\005\032(\n\005Crash\022\016\n\006reason\030\001 \002(\t\022\017\n\007ad"
- "dress\030\002 \002(\003\032%\n\006Thread\022\033\n\006frames\030\001 \003(\0132\013."
- "StackFrame\"\265\001\n\nStackFrame\022\023\n\013instruction"
- "\030\001 \002(\003\022\033\n\006module\030\002 \001(\0132\013.CodeModule\022\025\n\rf"
- "unction_name\030\003 \001(\t\022\025\n\rfunction_base\030\004 \001("
- "\003\022\030\n\020source_file_name\030\005 \001(\t\022\023\n\013source_li"
- "ne\030\006 \001(\005\022\030\n\020source_line_base\030\007 \001(\003\"\233\001\n\nC"
- "odeModule\022\024\n\014base_address\030\001 \001(\003\022\014\n\004size\030"
- "\002 \001(\003\022\021\n\tcode_file\030\003 \001(\t\022\027\n\017code_identif"
- "ier\030\004 \001(\t\022\022\n\ndebug_file\030\005 \001(\t\022\030\n\020debug_i"
- "dentifier\030\006 \001(\t\022\017\n\007version\030\007 \001(\t", 752);
+ "\n\023process_state.proto\022\017google_breakpad\"\302"
+ "\003\n\021ProcessStateProto\022\027\n\017time_date_stamp\030"
+ "\001 \001(\003\0227\n\005crash\030\002 \001(\0132(.google_breakpad.P"
+ "rocessStateProto.Crash\022\021\n\tassertion\030\003 \001("
+ "\t\022\031\n\021requesting_thread\030\004 \001(\005\022:\n\007threads\030"
+ "\005 \003(\0132).google_breakpad.ProcessStateProt"
+ "o.Thread\022,\n\007modules\030\006 \003(\0132\033.google_break"
+ "pad.CodeModule\022\n\n\002os\030\007 \001(\t\022\020\n\010os_short\030\010"
+ " \001(\t\022\022\n\nos_version\030\t \001(\t\022\013\n\003cpu\030\n \001(\t\022\020\n"
+ "\010cpu_info\030\013 \001(\t\022\021\n\tcpu_count\030\014 \001(\005\032(\n\005Cr"
+ "ash\022\016\n\006reason\030\001 \002(\t\022\017\n\007address\030\002 \002(\003\0325\n\006"
+ "Thread\022+\n\006frames\030\001 \003(\0132\033.google_breakpad"
+ ".StackFrame\"\305\001\n\nStackFrame\022\023\n\013instructio"
+ "n\030\001 \002(\003\022+\n\006module\030\002 \001(\0132\033.google_breakpa"
+ "d.CodeModule\022\025\n\rfunction_name\030\003 \001(\t\022\025\n\rf"
+ "unction_base\030\004 \001(\003\022\030\n\020source_file_name\030\005"
+ " \001(\t\022\023\n\013source_line\030\006 \001(\005\022\030\n\020source_line"
+ "_base\030\007 \001(\003\"\233\001\n\nCodeModule\022\024\n\014base_addre"
+ "ss\030\001 \001(\003\022\014\n\004size\030\002 \001(\003\022\021\n\tcode_file\030\003 \001("
+ "\t\022\027\n\017code_identifier\030\004 \001(\t\022\022\n\ndebug_file"
+ "\030\005 \001(\t\022\030\n\020debug_identifier\030\006 \001(\t\022\017\n\007vers"
+ "ion\030\007 \001(\t", 849);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"process_state.proto", &protobuf_RegisterTypes);
ProcessStateProto::default_instance_ = new ProcessStateProto();
@@ -556,7 +561,7 @@ bool ProcessStateProto_Thread::MergePartialFromCodedStream(
::google::protobuf::uint32 tag;
while ((tag = input->ReadTag()) != 0) {
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
- // repeated .StackFrame frames = 1;
+ // repeated .google_breakpad.StackFrame frames = 1;
case 1: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -589,7 +594,7 @@ bool ProcessStateProto_Thread::MergePartialFromCodedStream(
void ProcessStateProto_Thread::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
- // repeated .StackFrame frames = 1;
+ // repeated .google_breakpad.StackFrame frames = 1;
for (int i = 0; i < this->frames_size(); i++) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
1, this->frames(i), output);
@@ -603,7 +608,7 @@ void ProcessStateProto_Thread::SerializeWithCachedSizes(
::google::protobuf::uint8* ProcessStateProto_Thread::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
- // repeated .StackFrame frames = 1;
+ // repeated .google_breakpad.StackFrame frames = 1;
for (int i = 0; i < this->frames_size(); i++) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -620,7 +625,7 @@ void ProcessStateProto_Thread::SerializeWithCachedSizes(
int ProcessStateProto_Thread::ByteSize() const {
int total_size = 0;
- // repeated .StackFrame frames = 1;
+ // repeated .google_breakpad.StackFrame frames = 1;
total_size += 1 * this->frames_size();
for (int i = 0; i < this->frames_size(); i++) {
total_size +=
@@ -724,7 +729,7 @@ ProcessStateProto::ProcessStateProto()
}
void ProcessStateProto::InitAsDefaultInstance() {
- crash_ = const_cast< ::ProcessStateProto_Crash*>(&::ProcessStateProto_Crash::default_instance());
+ crash_ = const_cast< ::google_breakpad::ProcessStateProto_Crash*>(&::google_breakpad::ProcessStateProto_Crash::default_instance());
}
ProcessStateProto::ProcessStateProto(const ProcessStateProto& from)
@@ -800,7 +805,7 @@ void ProcessStateProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
time_date_stamp_ = GOOGLE_LONGLONG(0);
if (_has_bit(1)) {
- if (crash_ != NULL) crash_->::ProcessStateProto_Crash::Clear();
+ if (crash_ != NULL) crash_->::google_breakpad::ProcessStateProto_Crash::Clear();
}
if (_has_bit(2)) {
if (assertion_ != &_default_assertion_) {
@@ -864,7 +869,7 @@ bool ProcessStateProto::MergePartialFromCodedStream(
break;
}
- // optional .ProcessStateProto.Crash crash = 2;
+ // optional .google_breakpad.ProcessStateProto.Crash crash = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -911,7 +916,7 @@ bool ProcessStateProto::MergePartialFromCodedStream(
break;
}
- // repeated .ProcessStateProto.Thread threads = 5;
+ // repeated .google_breakpad.ProcessStateProto.Thread threads = 5;
case 5: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -926,7 +931,7 @@ bool ProcessStateProto::MergePartialFromCodedStream(
break;
}
- // repeated .CodeModule modules = 6;
+ // repeated .google_breakpad.CodeModule modules = 6;
case 6: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1065,7 +1070,7 @@ void ProcessStateProto::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->time_date_stamp(), output);
}
- // optional .ProcessStateProto.Crash crash = 2;
+ // optional .google_breakpad.ProcessStateProto.Crash crash = 2;
if (_has_bit(1)) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
2, this->crash(), output);
@@ -1085,13 +1090,13 @@ void ProcessStateProto::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->requesting_thread(), output);
}
- // repeated .ProcessStateProto.Thread threads = 5;
+ // repeated .google_breakpad.ProcessStateProto.Thread threads = 5;
for (int i = 0; i < this->threads_size(); i++) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
5, this->threads(i), output);
}
- // repeated .CodeModule modules = 6;
+ // repeated .google_breakpad.CodeModule modules = 6;
for (int i = 0; i < this->modules_size(); i++) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
6, this->modules(i), output);
@@ -1160,7 +1165,7 @@ void ProcessStateProto::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->time_date_stamp(), target);
}
- // optional .ProcessStateProto.Crash crash = 2;
+ // optional .google_breakpad.ProcessStateProto.Crash crash = 2;
if (_has_bit(1)) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -1182,14 +1187,14 @@ void ProcessStateProto::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->requesting_thread(), target);
}
- // repeated .ProcessStateProto.Thread threads = 5;
+ // repeated .google_breakpad.ProcessStateProto.Thread threads = 5;
for (int i = 0; i < this->threads_size(); i++) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
5, this->threads(i), target);
}
- // repeated .CodeModule modules = 6;
+ // repeated .google_breakpad.CodeModule modules = 6;
for (int i = 0; i < this->modules_size(); i++) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -1269,7 +1274,7 @@ int ProcessStateProto::ByteSize() const {
this->time_date_stamp());
}
- // optional .ProcessStateProto.Crash crash = 2;
+ // optional .google_breakpad.ProcessStateProto.Crash crash = 2;
if (has_crash()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -1335,7 +1340,7 @@ int ProcessStateProto::ByteSize() const {
}
}
- // repeated .ProcessStateProto.Thread threads = 5;
+ // repeated .google_breakpad.ProcessStateProto.Thread threads = 5;
total_size += 1 * this->threads_size();
for (int i = 0; i < this->threads_size(); i++) {
total_size +=
@@ -1343,7 +1348,7 @@ int ProcessStateProto::ByteSize() const {
this->threads(i));
}
- // repeated .CodeModule modules = 6;
+ // repeated .google_breakpad.CodeModule modules = 6;
total_size += 1 * this->modules_size();
for (int i = 0; i < this->modules_size(); i++) {
total_size +=
@@ -1383,7 +1388,7 @@ void ProcessStateProto::MergeFrom(const ProcessStateProto& from) {
set_time_date_stamp(from.time_date_stamp());
}
if (from._has_bit(1)) {
- mutable_crash()->::ProcessStateProto_Crash::MergeFrom(from.crash());
+ mutable_crash()->::google_breakpad::ProcessStateProto_Crash::MergeFrom(from.crash());
}
if (from._has_bit(2)) {
set_assertion(from.assertion());
@@ -1487,7 +1492,7 @@ StackFrame::StackFrame()
}
void StackFrame::InitAsDefaultInstance() {
- module_ = const_cast< ::CodeModule*>(&::CodeModule::default_instance());
+ module_ = const_cast< ::google_breakpad::CodeModule*>(&::google_breakpad::CodeModule::default_instance());
}
StackFrame::StackFrame(const StackFrame& from)
@@ -1548,7 +1553,7 @@ void StackFrame::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
instruction_ = GOOGLE_LONGLONG(0);
if (_has_bit(1)) {
- if (module_ != NULL) module_->::CodeModule::Clear();
+ if (module_ != NULL) module_->::google_breakpad::CodeModule::Clear();
}
if (_has_bit(2)) {
if (function_name_ != &_default_function_name_) {
@@ -1589,7 +1594,7 @@ bool StackFrame::MergePartialFromCodedStream(
break;
}
- // optional .CodeModule module = 2;
+ // optional .google_breakpad.CodeModule module = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1708,7 +1713,7 @@ void StackFrame::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->instruction(), output);
}
- // optional .CodeModule module = 2;
+ // optional .google_breakpad.CodeModule module = 2;
if (_has_bit(1)) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
2, this->module(), output);
@@ -1760,7 +1765,7 @@ void StackFrame::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->instruction(), target);
}
- // optional .CodeModule module = 2;
+ // optional .google_breakpad.CodeModule module = 2;
if (_has_bit(1)) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -1820,7 +1825,7 @@ int StackFrame::ByteSize() const {
this->instruction());
}
- // optional .CodeModule module = 2;
+ // optional .google_breakpad.CodeModule module = 2;
if (has_module()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -1893,7 +1898,7 @@ void StackFrame::MergeFrom(const StackFrame& from) {
set_instruction(from.instruction());
}
if (from._has_bit(1)) {
- mutable_module()->::CodeModule::MergeFrom(from.module());
+ mutable_module()->::google_breakpad::CodeModule::MergeFrom(from.module());
}
if (from._has_bit(2)) {
set_function_name(from.function_name());
@@ -2495,4 +2500,6 @@ void CodeModule::Swap(CodeModule* other) {
// @@protoc_insertion_point(namespace_scope)
+} // namespace google_breakpad
+
// @@protoc_insertion_point(global_scope)
diff --git a/src/processor/proto/process_state.pb.h b/src/processor/proto/process_state.pb.h
index d4b30261..5e148dfd 100644
--- a/src/processor/proto/process_state.pb.h
+++ b/src/processor/proto/process_state.pb.h
@@ -25,6 +25,8 @@
#include <google/protobuf/generated_message_reflection.h>
// @@protoc_insertion_point(includes)
+namespace google_breakpad {
+
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_process_5fstate_2eproto();
void protobuf_AssignDesc_process_5fstate_2eproto();
@@ -109,7 +111,7 @@ class ProcessStateProto_Crash : public ::google::protobuf::Message {
inline ::google::protobuf::int64 address() const;
inline void set_address(::google::protobuf::int64 value);
- // @@protoc_insertion_point(class_scope:ProcessStateProto.Crash)
+ // @@protoc_insertion_point(class_scope:google_breakpad.ProcessStateProto.Crash)
private:
::google::protobuf::UnknownFieldSet _unknown_fields_;
mutable int _cached_size_;
@@ -193,24 +195,24 @@ class ProcessStateProto_Thread : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
- // repeated .StackFrame frames = 1;
+ // repeated .google_breakpad.StackFrame frames = 1;
inline int frames_size() const;
inline void clear_frames();
static const int kFramesFieldNumber = 1;
- inline const ::StackFrame& frames(int index) const;
- inline ::StackFrame* mutable_frames(int index);
- inline ::StackFrame* add_frames();
- inline const ::google::protobuf::RepeatedPtrField< ::StackFrame >&
+ inline const ::google_breakpad::StackFrame& frames(int index) const;
+ inline ::google_breakpad::StackFrame* mutable_frames(int index);
+ inline ::google_breakpad::StackFrame* add_frames();
+ inline const ::google::protobuf::RepeatedPtrField< ::google_breakpad::StackFrame >&
frames() const;
- inline ::google::protobuf::RepeatedPtrField< ::StackFrame >*
+ inline ::google::protobuf::RepeatedPtrField< ::google_breakpad::StackFrame >*
mutable_frames();
- // @@protoc_insertion_point(class_scope:ProcessStateProto.Thread)
+ // @@protoc_insertion_point(class_scope:google_breakpad.ProcessStateProto.Thread)
private:
::google::protobuf::UnknownFieldSet _unknown_fields_;
mutable int _cached_size_;
- ::google::protobuf::RepeatedPtrField< ::StackFrame > frames_;
+ ::google::protobuf::RepeatedPtrField< ::google_breakpad::StackFrame > frames_;
friend void protobuf_AddDesc_process_5fstate_2eproto();
friend void protobuf_AssignDesc_process_5fstate_2eproto();
friend void protobuf_ShutdownFile_process_5fstate_2eproto();
@@ -297,12 +299,12 @@ class ProcessStateProto : public ::google::protobuf::Message {
inline ::google::protobuf::int64 time_date_stamp() const;
inline void set_time_date_stamp(::google::protobuf::int64 value);
- // optional .ProcessStateProto.Crash crash = 2;
+ // optional .google_breakpad.ProcessStateProto.Crash crash = 2;
inline bool has_crash() const;
inline void clear_crash();
static const int kCrashFieldNumber = 2;
- inline const ::ProcessStateProto_Crash& crash() const;
- inline ::ProcessStateProto_Crash* mutable_crash();
+ inline const ::google_breakpad::ProcessStateProto_Crash& crash() const;
+ inline ::google_breakpad::ProcessStateProto_Crash* mutable_crash();
// optional string assertion = 3;
inline bool has_assertion() const;
@@ -321,28 +323,28 @@ class ProcessStateProto : public ::google::protobuf::Message {
inline ::google::protobuf::int32 requesting_thread() const;
inline void set_requesting_thread(::google::protobuf::int32 value);
- // repeated .ProcessStateProto.Thread threads = 5;
+ // repeated .google_breakpad.ProcessStateProto.Thread threads = 5;
inline int threads_size() const;
inline void clear_threads();
static const int kThreadsFieldNumber = 5;
- inline const ::ProcessStateProto_Thread& threads(int index) const;
- inline ::ProcessStateProto_Thread* mutable_threads(int index);
- inline ::ProcessStateProto_Thread* add_threads();
- inline const ::google::protobuf::RepeatedPtrField< ::ProcessStateProto_Thread >&
+ inline const ::google_breakpad::ProcessStateProto_Thread& threads(int index) const;
+ inline ::google_breakpad::ProcessStateProto_Thread* mutable_threads(int index);
+ inline ::google_breakpad::ProcessStateProto_Thread* add_threads();
+ inline const ::google::protobuf::RepeatedPtrField< ::google_breakpad::ProcessStateProto_Thread >&
threads() const;
- inline ::google::protobuf::RepeatedPtrField< ::ProcessStateProto_Thread >*
+ inline ::google::protobuf::RepeatedPtrField< ::google_breakpad::ProcessStateProto_Thread >*
mutable_threads();
- // repeated .CodeModule modules = 6;
+ // repeated .google_breakpad.CodeModule modules = 6;
inline int modules_size() const;
inline void clear_modules();
static const int kModulesFieldNumber = 6;
- inline const ::CodeModule& modules(int index) const;
- inline ::CodeModule* mutable_modules(int index);
- inline ::CodeModule* add_modules();
- inline const ::google::protobuf::RepeatedPtrField< ::CodeModule >&
+ inline const ::google_breakpad::CodeModule& modules(int index) const;
+ inline ::google_breakpad::CodeModule* mutable_modules(int index);
+ inline ::google_breakpad::CodeModule* add_modules();
+ inline const ::google::protobuf::RepeatedPtrField< ::google_breakpad::CodeModule >&
modules() const;
- inline ::google::protobuf::RepeatedPtrField< ::CodeModule >*
+ inline ::google::protobuf::RepeatedPtrField< ::google_breakpad::CodeModule >*
mutable_modules();
// optional string os = 7;
@@ -402,18 +404,18 @@ class ProcessStateProto : public ::google::protobuf::Message {
inline ::google::protobuf::int32 cpu_count() const;
inline void set_cpu_count(::google::protobuf::int32 value);
- // @@protoc_insertion_point(class_scope:ProcessStateProto)
+ // @@protoc_insertion_point(class_scope:google_breakpad.ProcessStateProto)
private:
::google::protobuf::UnknownFieldSet _unknown_fields_;
mutable int _cached_size_;
::google::protobuf::int64 time_date_stamp_;
- ::ProcessStateProto_Crash* crash_;
+ ::google_breakpad::ProcessStateProto_Crash* crash_;
::std::string* assertion_;
static const ::std::string _default_assertion_;
::google::protobuf::int32 requesting_thread_;
- ::google::protobuf::RepeatedPtrField< ::ProcessStateProto_Thread > threads_;
- ::google::protobuf::RepeatedPtrField< ::CodeModule > modules_;
+ ::google::protobuf::RepeatedPtrField< ::google_breakpad::ProcessStateProto_Thread > threads_;
+ ::google::protobuf::RepeatedPtrField< ::google_breakpad::CodeModule > modules_;
::std::string* os_;
static const ::std::string _default_os_;
::std::string* os_short_;
@@ -508,12 +510,12 @@ class StackFrame : public ::google::protobuf::Message {
inline ::google::protobuf::int64 instruction() const;
inline void set_instruction(::google::protobuf::int64 value);
- // optional .CodeModule module = 2;
+ // optional .google_breakpad.CodeModule module = 2;
inline bool has_module() const;
inline void clear_module();
static const int kModuleFieldNumber = 2;
- inline const ::CodeModule& module() const;
- inline ::CodeModule* mutable_module();
+ inline const ::google_breakpad::CodeModule& module() const;
+ inline ::google_breakpad::CodeModule* mutable_module();
// optional string function_name = 3;
inline bool has_function_name() const;
@@ -556,13 +558,13 @@ class StackFrame : public ::google::protobuf::Message {
inline ::google::protobuf::int64 source_line_base() const;
inline void set_source_line_base(::google::protobuf::int64 value);
- // @@protoc_insertion_point(class_scope:StackFrame)
+ // @@protoc_insertion_point(class_scope:google_breakpad.StackFrame)
private:
::google::protobuf::UnknownFieldSet _unknown_fields_;
mutable int _cached_size_;
::google::protobuf::int64 instruction_;
- ::CodeModule* module_;
+ ::google_breakpad::CodeModule* module_;
::std::string* function_name_;
static const ::std::string _default_function_name_;
::google::protobuf::int64 function_base_;
@@ -710,7 +712,7 @@ class CodeModule : public ::google::protobuf::Message {
inline void set_version(const char* value, size_t size);
inline ::std::string* mutable_version();
- // @@protoc_insertion_point(class_scope:CodeModule)
+ // @@protoc_insertion_point(class_scope:google_breakpad.CodeModule)
private:
::google::protobuf::UnknownFieldSet _unknown_fields_;
mutable int _cached_size_;
@@ -816,27 +818,27 @@ inline void ProcessStateProto_Crash::set_address(::google::protobuf::int64 value
// ProcessStateProto_Thread
-// repeated .StackFrame frames = 1;
+// repeated .google_breakpad.StackFrame frames = 1;
inline int ProcessStateProto_Thread::frames_size() const {
return frames_.size();
}
inline void ProcessStateProto_Thread::clear_frames() {
frames_.Clear();
}
-inline const ::StackFrame& ProcessStateProto_Thread::frames(int index) const {
+inline const ::google_breakpad::StackFrame& ProcessStateProto_Thread::frames(int index) const {
return frames_.Get(index);
}
-inline ::StackFrame* ProcessStateProto_Thread::mutable_frames(int index) {
+inline ::google_breakpad::StackFrame* ProcessStateProto_Thread::mutable_frames(int index) {
return frames_.Mutable(index);
}
-inline ::StackFrame* ProcessStateProto_Thread::add_frames() {
+inline ::google_breakpad::StackFrame* ProcessStateProto_Thread::add_frames() {
return frames_.Add();
}
-inline const ::google::protobuf::RepeatedPtrField< ::StackFrame >&
+inline const ::google::protobuf::RepeatedPtrField< ::google_breakpad::StackFrame >&
ProcessStateProto_Thread::frames() const {
return frames_;
}
-inline ::google::protobuf::RepeatedPtrField< ::StackFrame >*
+inline ::google::protobuf::RepeatedPtrField< ::google_breakpad::StackFrame >*
ProcessStateProto_Thread::mutable_frames() {
return &frames_;
}
@@ -861,20 +863,20 @@ inline void ProcessStateProto::set_time_date_stamp(::google::protobuf::int64 val
time_date_stamp_ = value;
}
-// optional .ProcessStateProto.Crash crash = 2;
+// optional .google_breakpad.ProcessStateProto.Crash crash = 2;
inline bool ProcessStateProto::has_crash() const {
return _has_bit(1);
}
inline void ProcessStateProto::clear_crash() {
- if (crash_ != NULL) crash_->::ProcessStateProto_Crash::Clear();
+ if (crash_ != NULL) crash_->::google_breakpad::ProcessStateProto_Crash::Clear();
_clear_bit(1);
}
-inline const ::ProcessStateProto_Crash& ProcessStateProto::crash() const {
+inline const ::google_breakpad::ProcessStateProto_Crash& ProcessStateProto::crash() const {
return crash_ != NULL ? *crash_ : *default_instance_->crash_;
}
-inline ::ProcessStateProto_Crash* ProcessStateProto::mutable_crash() {
+inline ::google_breakpad::ProcessStateProto_Crash* ProcessStateProto::mutable_crash() {
_set_bit(1);
- if (crash_ == NULL) crash_ = new ::ProcessStateProto_Crash;
+ if (crash_ == NULL) crash_ = new ::google_breakpad::ProcessStateProto_Crash;
return crash_;
}
@@ -936,52 +938,52 @@ inline void ProcessStateProto::set_requesting_thread(::google::protobuf::int32 v
requesting_thread_ = value;
}
-// repeated .ProcessStateProto.Thread threads = 5;
+// repeated .google_breakpad.ProcessStateProto.Thread threads = 5;
inline int ProcessStateProto::threads_size() const {
return threads_.size();
}
inline void ProcessStateProto::clear_threads() {
threads_.Clear();
}
-inline const ::ProcessStateProto_Thread& ProcessStateProto::threads(int index) const {
+inline const ::google_breakpad::ProcessStateProto_Thread& ProcessStateProto::threads(int index) const {
return threads_.Get(index);
}
-inline ::ProcessStateProto_Thread* ProcessStateProto::mutable_threads(int index) {
+inline ::google_breakpad::ProcessStateProto_Thread* ProcessStateProto::mutable_threads(int index) {
return threads_.Mutable(index);
}
-inline ::ProcessStateProto_Thread* ProcessStateProto::add_threads() {
+inline ::google_breakpad::ProcessStateProto_Thread* ProcessStateProto::add_threads() {
return threads_.Add();
}
-inline const ::google::protobuf::RepeatedPtrField< ::ProcessStateProto_Thread >&
+inline const ::google::protobuf::RepeatedPtrField< ::google_breakpad::ProcessStateProto_Thread >&
ProcessStateProto::threads() const {
return threads_;
}
-inline ::google::protobuf::RepeatedPtrField< ::ProcessStateProto_Thread >*
+inline ::google::protobuf::RepeatedPtrField< ::google_breakpad::ProcessStateProto_Thread >*
ProcessStateProto::mutable_threads() {
return &threads_;
}
-// repeated .CodeModule modules = 6;
+// repeated .google_breakpad.CodeModule modules = 6;
inline int ProcessStateProto::modules_size() const {
return modules_.size();
}
inline void ProcessStateProto::clear_modules() {
modules_.Clear();
}
-inline const ::CodeModule& ProcessStateProto::modules(int index) const {
+inline const ::google_breakpad::CodeModule& ProcessStateProto::modules(int index) const {
return modules_.Get(index);
}
-inline ::CodeModule* ProcessStateProto::mutable_modules(int index) {
+inline ::google_breakpad::CodeModule* ProcessStateProto::mutable_modules(int index) {
return modules_.Mutable(index);
}
-inline ::CodeModule* ProcessStateProto::add_modules() {
+inline ::google_breakpad::CodeModule* ProcessStateProto::add_modules() {
return modules_.Add();
}
-inline const ::google::protobuf::RepeatedPtrField< ::CodeModule >&
+inline const ::google::protobuf::RepeatedPtrField< ::google_breakpad::CodeModule >&
ProcessStateProto::modules() const {
return modules_;
}
-inline ::google::protobuf::RepeatedPtrField< ::CodeModule >*
+inline ::google::protobuf::RepeatedPtrField< ::google_breakpad::CodeModule >*
ProcessStateProto::mutable_modules() {
return &modules_;
}
@@ -1232,20 +1234,20 @@ inline void StackFrame::set_instruction(::google::protobuf::int64 value) {
instruction_ = value;
}
-// optional .CodeModule module = 2;
+// optional .google_breakpad.CodeModule module = 2;
inline bool StackFrame::has_module() const {
return _has_bit(1);
}
inline void StackFrame::clear_module() {
- if (module_ != NULL) module_->::CodeModule::Clear();
+ if (module_ != NULL) module_->::google_breakpad::CodeModule::Clear();
_clear_bit(1);
}
-inline const ::CodeModule& StackFrame::module() const {
+inline const ::google_breakpad::CodeModule& StackFrame::module() const {
return module_ != NULL ? *module_ : *default_instance_->module_;
}
-inline ::CodeModule* StackFrame::mutable_module() {
+inline ::google_breakpad::CodeModule* StackFrame::mutable_module() {
_set_bit(1);
- if (module_ == NULL) module_ = new ::CodeModule;
+ if (module_ == NULL) module_ = new ::google_breakpad::CodeModule;
return module_;
}
@@ -1630,6 +1632,8 @@ inline ::std::string* CodeModule::mutable_version() {
// @@protoc_insertion_point(namespace_scope)
+} // namespace google_breakpad
+
#ifndef SWIG
namespace google {
namespace protobuf {
diff --git a/src/processor/proto/process_state.proto b/src/processor/proto/process_state.proto
index 209919c2..8d871a5d 100644
--- a/src/processor/proto/process_state.proto
+++ b/src/processor/proto/process_state.proto
@@ -39,6 +39,7 @@
//
// Author: Jess Gray
+package google_breakpad;
// A proto representation of a process, in a fully-digested state.
// See src/google_breakpad/processor/process_state.h