Separate collection logic from the extraction of the report

components/browser_watcher/postmortem_report_extractor.cc

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/browser_watcher/postmortem_report_extractor.h"
+
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "base/debug/activity_analyzer.h"
+#include "base/logging.h"
+#include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "components/browser_watcher/stability_data_names.h"
+#include "components/variations/active_field_trials.h"
+#include "third_party/crashpad/crashpad/util/misc/uuid.h"
+
+namespace browser_watcher {
+
+using ActivitySnapshot = base::debug::ThreadActivityAnalyzer::Snapshot;
+using base::debug::ActivityUserData;
+using base::debug::GlobalActivityAnalyzer;
+using base::debug::GlobalActivityTracker;
+using base::debug::ThreadActivityAnalyzer;
+
+namespace {
+
+const char kFieldTrialKeyPrefix[] = "FieldTrial.";
+
+// Collects stability user data from the recorded format to the collected
+// format.
+void CollectUserData(
+    const ActivityUserData::Snapshot& recorded_map,
+    google::protobuf::Map<std::string, TypedValue>* collected_map,
+    StabilityReport* report) {
+  DCHECK(collected_map);
+
+  for (const auto& name_and_value : recorded_map) {
+    const std::string& key = name_and_value.first;
+    const ActivityUserData::TypedValue& recorded_value = name_and_value.second;
+    TypedValue collected_value;
+
+    switch (recorded_value.type()) {
+      case ActivityUserData::END_OF_VALUES:
+        NOTREACHED();
+        break;
+      case ActivityUserData::RAW_VALUE: {
+        base::StringPiece raw = recorded_value.Get();
+        collected_value.set_bytes_value(raw.data(), raw.size());
+        break;
+      }
+      case ActivityUserData::RAW_VALUE_REFERENCE: {
+        base::StringPiece recorded_ref = recorded_value.GetReference();
+        TypedValue::Reference* collected_ref =
+            collected_value.mutable_bytes_reference();
+        collected_ref->set_address(
+            reinterpret_cast<uintptr_t>(recorded_ref.data()));
+        collected_ref->set_size(recorded_ref.size());
+        break;
+      }
+      case ActivityUserData::STRING_VALUE: {
+        base::StringPiece value = recorded_value.GetString();
+
+        if (report && base::StartsWith(key, kFieldTrialKeyPrefix,
+                                       base::CompareCase::SENSITIVE)) {
+          // This entry represents an active Field Trial.
+          std::string trial_name =
+              key.substr(std::strlen(kFieldTrialKeyPrefix));
+          variations::ActiveGroupId group_id =
+              variations::MakeActiveGroupId(trial_name, value.as_string());
+          FieldTrial* field_trial = report->add_field_trials();
+          field_trial->set_name_id(group_id.name);
+          field_trial->set_group_id(group_id.group);
+          continue;
+        }
+
+        collected_value.set_string_value(value.data(), value.size());
+        break;
+      }
+      case ActivityUserData::STRING_VALUE_REFERENCE: {
+        base::StringPiece recorded_ref = recorded_value.GetStringReference();
+        TypedValue::Reference* collected_ref =
+            collected_value.mutable_string_reference();
+        collected_ref->set_address(
+            reinterpret_cast<uintptr_t>(recorded_ref.data()));
+        collected_ref->set_size(recorded_ref.size());
+        break;
+      }
+      case ActivityUserData::CHAR_VALUE: {
+        char char_value = recorded_value.GetChar();
+        collected_value.set_char_value(&char_value, 1);
+        break;
+      }
+      case ActivityUserData::BOOL_VALUE:
+        collected_value.set_bool_value(recorded_value.GetBool());
+        break;
+      case ActivityUserData::SIGNED_VALUE:
+        collected_value.set_signed_value(recorded_value.GetInt());
+        break;
+      case ActivityUserData::UNSIGNED_VALUE:
+        collected_value.set_unsigned_value(recorded_value.GetUint());
+        break;
+    }
+
+    (*collected_map)[key].Swap(&collected_value);
+  }
+}
+
+void CollectModuleInformation(
+    const std::vector<GlobalActivityTracker::ModuleInfo>& modules,
+    ProcessState* process_state) {
+  DCHECK(process_state);
+
+  char code_identifier[17];

[Sigurður Ásgeirsson, 2017/03/06 19:17:10]

Ugh :/

[manzagop (departed), 2017/03/06 21:29:39]

Acknowledged.

+  char debug_identifier[41];
+
+  for (const GlobalActivityTracker::ModuleInfo& recorded : modules) {
+    CodeModule* collected = process_state->add_modules();
+    collected->set_base_address(recorded.address);
+    collected->set_size(recorded.size);
+    collected->set_code_file(recorded.file);
+
+    // Compute the code identifier using the required format.
+    snprintf(code_identifier, sizeof(code_identifier), "%08X%zx",

[Sigurður Ásgeirsson, 2017/03/06 19:17:10]

I'd sprint for a StringPrintf here and below. Fixed-size buffers on stack are
... ughy.

[manzagop (departed), 2017/03/06 21:29:39]

Done. Can you say more?

[Sigurður Ásgeirsson, 2017/03/07 14:46:01]

https://www.google.ca/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#q=s...

Probably doesn't apply here, but not the sort of thing we do lightly anymore.
Should cause review angst if ever spotted.

+             recorded.timestamp, recorded.size);
+    collected->set_code_identifier(code_identifier);
+    collected->set_debug_file(recorded.debug_file);
+
+    // Compute the debug identifier using the required format.
+    const crashpad::UUID* uuid =
+        reinterpret_cast<const crashpad::UUID*>(recorded.identifier);
+    snprintf(debug_identifier, sizeof(debug_identifier),
+             "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X%x", uuid->data_1,
+             uuid->data_2, uuid->data_3, uuid->data_4[0], uuid->data_4[1],
+             uuid->data_5[0], uuid->data_5[1], uuid->data_5[2], uuid->data_5[3],
+             uuid->data_5[4], uuid->data_5[5], recorded.age);
+    collected->set_debug_identifier(debug_identifier);
+    collected->set_is_unloaded(!recorded.is_loaded);
+  }
+}
+
+}  // namespace
+
+// DO NOT SUBMIT: review diff stepping stone. Move the function after 1st round.
+void CollectThread(
+    const base::debug::ThreadActivityAnalyzer::Snapshot& snapshot,
+    ThreadState* thread_state);
+
+CollectionStatus Extract(const base::FilePath& stability_file,
+                         StabilityReport* report) {
+  DCHECK(report);
+
+  // Create a global analyzer.
+  std::unique_ptr<GlobalActivityAnalyzer> global_analyzer =
+      GlobalActivityAnalyzer::CreateWithFile(stability_file);
+  if (!global_analyzer)
+    return ANALYZER_CREATION_FAILED;
+
+  // Early exit if there is no data.
+  std::vector<std::string> log_messages = global_analyzer->GetLogMessages();
+  ActivityUserData::Snapshot global_data_snapshot =
+      global_analyzer->GetGlobalUserDataSnapshot();
+  ThreadActivityAnalyzer* thread_analyzer = global_analyzer->GetFirstAnalyzer();
+  if (log_messages.empty() && global_data_snapshot.empty() &&
+      !thread_analyzer) {
+    return DEBUG_FILE_NO_DATA;
+  }
+
+  // Collect log messages.
+  for (const std::string& message : log_messages) {
+    report->add_log_messages(message);
+  }
+
+  // Collect global user data.
+  google::protobuf::Map<std::string, TypedValue>& global_data =
+      *(report->mutable_global_data());
+  CollectUserData(global_data_snapshot, &global_data, report);
+
+  // Collect thread activity data.
+  // Note: a single process is instrumented.
+  ProcessState* process_state = report->add_process_states();
+  for (; thread_analyzer != nullptr;
+       thread_analyzer = global_analyzer->GetNextAnalyzer()) {
+    // Only valid analyzers are expected per contract of GetFirstAnalyzer /
+    // GetNextAnalyzer.
+    DCHECK(thread_analyzer->IsValid());
+
+    if (!process_state->has_process_id()) {
+      process_state->set_process_id(
+          thread_analyzer->activity_snapshot().process_id);
+    }
+    DCHECK_EQ(thread_analyzer->activity_snapshot().process_id,
+              process_state->process_id());
+
+    ThreadState* thread_state = process_state->add_threads();
+    CollectThread(thread_analyzer->activity_snapshot(), thread_state);
+  }
+
+  // Collect module information.
+  CollectModuleInformation(global_analyzer->GetModules(), process_state);
+
+  return SUCCESS;
+}
+
+// DO NOT SUBMIT: review diff stepping stone. Move the function after 1st round.
+void CollectThread(
+    const base::debug::ThreadActivityAnalyzer::Snapshot& snapshot,
+    ThreadState* thread_state) {
+  DCHECK(thread_state);
+
+  thread_state->set_thread_name(snapshot.thread_name);
+  thread_state->set_thread_id(snapshot.thread_id);
+  thread_state->set_activity_count(snapshot.activity_stack_depth);
+
+  for (size_t i = 0; i < snapshot.activity_stack.size(); ++i) {
+    const base::debug::Activity& recorded = snapshot.activity_stack[i];
+    Activity* collected = thread_state->add_activities();
+
+    // Collect activity
+    switch (recorded.activity_type) {
+      case base::debug::Activity::ACT_TASK_RUN:
+        collected->set_type(Activity::ACT_TASK_RUN);
+        collected->set_origin_address(recorded.origin_address);
+        collected->set_task_sequence_id(recorded.data.task.sequence_id);
+        break;
+      case base::debug::Activity::ACT_LOCK_ACQUIRE:
+        collected->set_type(Activity::ACT_LOCK_ACQUIRE);
+        collected->set_lock_address(recorded.data.lock.lock_address);
+        break;
+      case base::debug::Activity::ACT_EVENT_WAIT:
+        collected->set_type(Activity::ACT_EVENT_WAIT);
+        collected->set_event_address(recorded.data.event.event_address);
+        break;
+      case base::debug::Activity::ACT_THREAD_JOIN:
+        collected->set_type(Activity::ACT_THREAD_JOIN);
+        collected->set_thread_id(recorded.data.thread.thread_id);
+        break;
+      case base::debug::Activity::ACT_PROCESS_WAIT:
+        collected->set_type(Activity::ACT_PROCESS_WAIT);
+        collected->set_process_id(recorded.data.process.process_id);
+        break;
+      default:
+        break;
+    }
+
+    // Collect user data
+    if (i < snapshot.user_data_stack.size()) {
+      CollectUserData(snapshot.user_data_stack[i],
+                      collected->mutable_user_data(), nullptr);
+    }
+  }
+}
+
+}  // namespace browser_watcher