Stack sampling profiler: set process and thread information

chrome/browser/metrics/thread_watcher.cc

 // Copyright (c) 2012 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 "chrome/browser/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 17 matching lines @@
 #include "components/metrics/call_stack_profile_metrics_provider.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/notification_service.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 using content::BrowserThread;
 
+namespace {
+
+base::StackSamplingProfiler::SamplingParams GetJankTimeBombSamplingParams() {
+  base::StackSamplingProfiler::SamplingParams params;
+  params.initial_delay = base::TimeDelta::FromMilliseconds(0);
+  params.bursts = 1;
+  // 5 seconds at 10Hz.
+  params.samples_per_burst = 50;
+  params.sampling_interval = base::TimeDelta::FromMilliseconds(100);
+  return params;
+}
+
+}  // namespace
+
 // ThreadWatcher methods and members.
 ThreadWatcher::ThreadWatcher(const WatchingParams& params)
     : thread_id_(params.thread_id),
       thread_name_(params.thread_name),
       watched_runner_(BrowserThread::GetTaskRunnerForThread(params.thread_id)),
       sleep_time_(params.sleep_time),
       unresponsive_time_(params.unresponsive_time),
       ping_time_(base::TimeTicks::Now()),
       pong_time_(ping_time_),
       ping_sequence_number_(0),
@@ skipping 860 matching lines @@
       base::TimeDelta::FromSeconds(10));
 }
 
 // static
 void StartupTimeBomb::DisarmStartupTimeBomb() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (g_startup_timebomb_)
     g_startup_timebomb_->Disarm();
 }
 
-base::StackSamplingProfiler::SamplingParams GetJankTimeBombSamplingParams() {
-  base::StackSamplingProfiler::SamplingParams params;
-  params.initial_delay = base::TimeDelta::FromMilliseconds(0);
-  params.bursts = 1;
-  // 5 seconds at 10Hz.
-  params.samples_per_burst = 50;
-  params.sampling_interval = base::TimeDelta::FromMilliseconds(100);
-  return params;
-}
-
 // JankTimeBomb methods and members.
 //
-JankTimeBomb::JankTimeBomb(base::TimeDelta duration)
-    : weak_ptr_factory_(this) {
+JankTimeBomb::JankTimeBomb(base::TimeDelta duration,
+                           metrics::CallStackProfileParams::Thread thread)
+    : thread_(thread), weak_ptr_factory_(this) {
   if (IsEnabled()) {
     WatchDogThread::PostDelayedTask(
         FROM_HERE,
         base::Bind(&JankTimeBomb::Alarm,
                    weak_ptr_factory_.GetWeakPtr(),
                    base::PlatformThread::CurrentId()),
         duration);
   }
 }
 
 JankTimeBomb::~JankTimeBomb() {
 }
 
 bool JankTimeBomb::IsEnabled() const {
   version_info::Channel channel = chrome::GetChannel();
   return channel == version_info::Channel::UNKNOWN ||
       channel == version_info::Channel::CANARY ||
       channel == version_info::Channel::DEV;
 }
 
 void JankTimeBomb::Alarm(base::PlatformThreadId thread_id) {
   DCHECK(WatchDogThread::CurrentlyOnWatchDogThread());
   sampling_profiler_.reset(new base::StackSamplingProfiler(
       thread_id,
       GetJankTimeBombSamplingParams(),
       metrics::CallStackProfileMetricsProvider::GetProfilerCallback(
           metrics::CallStackProfileParams(
+              metrics::CallStackProfileParams::BROWSER_PROCESS,
+              thread_,
               metrics::CallStackProfileParams::JANKY_TASK,
               metrics::CallStackProfileParams::PRESERVE_ORDER))));
   // Use synchronous profiler. It will automatically stop collection when
   // destroyed.
   sampling_profiler_->Start();
 }
 
 // ShutdownWatcherHelper methods and members.
 //
 // ShutdownWatcherHelper is a wrapper class for detecting hangs during
@@ skipping 30 matching lines @@
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }