StabilityReport proto changes for multi-process support

base/debug/activity_analyzer.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 "base/debug/activity_analyzer.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/files/file.h"
@@ skipping 65 matching lines @@
     // The global GetUserDataSnapshot will return an empty snapshot if the ref
     // or id is not valid.
     activity_snapshot_.user_data_stack.push_back(global->GetUserDataSnapshot(
         activity_snapshot_.process_id, activity.user_data_ref,
         activity.user_data_id));
   }
 }
 
 GlobalActivityAnalyzer::GlobalActivityAnalyzer(
     std::unique_ptr<PersistentMemoryAllocator> allocator)
-    : allocator_(std::move(allocator)), allocator_iterator_(allocator_.get()) {
+    : allocator_(std::move(allocator)),
+      analysis_stamp_(0LL),
+      allocator_iterator_(allocator_.get()) {
   DCHECK(allocator_);
 }
 
 GlobalActivityAnalyzer::~GlobalActivityAnalyzer() {}
 
 #if !defined(OS_NACL)
 // static
 std::unique_ptr<GlobalActivityAnalyzer> GlobalActivityAnalyzer::CreateWithFile(
     const FilePath& file_path) {
   // Map the file read-write so it can guarantee consistency between
@@ skipping 128 matching lines @@
         ref, GlobalActivityTracker::kTypeIdGlobalLogMessage,
         PersistentMemoryAllocator::kSizeAny);
     if (message)
       messages.push_back(message);
   }
 
   return messages;
 }
 
 std::vector<GlobalActivityTracker::ModuleInfo>
-GlobalActivityAnalyzer::GetModules() {
+GlobalActivityAnalyzer::GetModules(int64_t pid) {
   std::vector<GlobalActivityTracker::ModuleInfo> modules;
 
   PersistentMemoryAllocator::Iterator iter(allocator_.get());
   const GlobalActivityTracker::ModuleInfoRecord* record;
   while (
       (record =
            iter.GetNextOfObject<GlobalActivityTracker::ModuleInfoRecord>()) !=
       nullptr) {
+    int64_t process_id;
+    int64_t create_stamp;
+    if (!OwningProcess::GetOwningProcessId(&record->owner, &process_id,
+                                           &create_stamp) ||
+        pid != process_id || create_stamp > analysis_stamp_) {
+      continue;
+    }
     GlobalActivityTracker::ModuleInfo info;
     if (record->DecodeTo(&info, allocator_->GetAllocSize(
                                     allocator_->GetAsReference(record)))) {
       modules.push_back(std::move(info));
     }
   }
 
   return modules;
 }
 
@@ skipping 113 matching lines @@
       } break;
     }
   }
 
   // Reverse the list of PIDs so that they get popped in the order found.
   std::reverse(process_ids_.begin(), process_ids_.end());
 }
 
 }  // namespace debug
 }  // namespace base