Add MinidumpCrashpadInfo::simple_annotations

minidump/minidump_crashpad_info_writer.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // 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.
 
 #include "minidump/minidump_crashpad_info_writer.h"
 
 #include "base/logging.h"
 #include "minidump/minidump_module_crashpad_info_writer.h"
+#include "minidump/minidump_simple_string_dictionary_writer.h"
 #include "snapshot/process_snapshot.h"
 #include "util/file/file_writer.h"
 
 namespace crashpad {
 
 MinidumpCrashpadInfoWriter::MinidumpCrashpadInfoWriter()
-    : MinidumpStreamWriter(), crashpad_info_(), module_list_(nullptr) {
+    : MinidumpStreamWriter(),
+      crashpad_info_(),
+      simple_annotations_(nullptr),
+      module_list_(nullptr) {
   crashpad_info_.version = MinidumpCrashpadInfo::kVersion;
 }
 
 MinidumpCrashpadInfoWriter::~MinidumpCrashpadInfoWriter() {
 }
 
 void MinidumpCrashpadInfoWriter::InitializeFromSnapshot(
     const ProcessSnapshot* process_snapshot) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(!module_list_);
 
+  auto simple_annotations =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
+  simple_annotations->InitializeFromMap(
+      process_snapshot->AnnotationsSimpleMap());
+  if (simple_annotations->IsUseful()) {
+    SetSimpleAnnotations(simple_annotations.Pass());
+  }
+
   auto modules = make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
   modules->InitializeFromSnapshot(process_snapshot->Modules());
 
   if (modules->IsUseful()) {
     SetModuleList(modules.Pass());
   }
 }
 
+void MinidumpCrashpadInfoWriter::SetSimpleAnnotations(
+    scoped_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) {
+  DCHECK_EQ(state(), kStateMutable);
+
+  simple_annotations_ = simple_annotations.Pass();
+}
+
 void MinidumpCrashpadInfoWriter::SetModuleList(
     scoped_ptr<MinidumpModuleCrashpadInfoListWriter> module_list) {
   DCHECK_EQ(state(), kStateMutable);
 
   module_list_ = module_list.Pass();
 }
 
 bool MinidumpCrashpadInfoWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpStreamWriter::Freeze()) {
     return false;
   }
 
+  if (simple_annotations_) {
+    simple_annotations_->RegisterLocationDescriptor(
+        &crashpad_info_.simple_annotations);
+  }
   if (module_list_) {
     module_list_->RegisterLocationDescriptor(&crashpad_info_.module_list);
   }
 
   return true;
 }
 
 size_t MinidumpCrashpadInfoWriter::SizeOfObject() {
   DCHECK_GE(state(), kStateFrozen);
 
   return sizeof(crashpad_info_);
 }
 
 std::vector<internal::MinidumpWritable*>
 MinidumpCrashpadInfoWriter::Children() {
   DCHECK_GE(state(), kStateFrozen);
 
   std::vector<MinidumpWritable*> children;
+  if (simple_annotations_) {
+    children.push_back(simple_annotations_.get());
+  }
   if (module_list_) {
     children.push_back(module_list_.get());
   }
 
   return children;
 }
 
 bool MinidumpCrashpadInfoWriter::WriteObject(FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
 
   return file_writer->Write(&crashpad_info_, sizeof(crashpad_info_));
 }
 
 MinidumpStreamType MinidumpCrashpadInfoWriter::StreamType() const {
   return kMinidumpStreamTypeCrashpadInfo;
 }
 
 bool MinidumpCrashpadInfoWriter::IsUseful() const {
-  return module_list_;
+  return simple_annotations_ || module_list_;
 }
 
 }  // namespace crashpad