Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Side by Side Diff: content/browser/profiler_message_filter.cc

Issue 1325653003: Type change in StackSamplingProfiler from void* to uintptr_t. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@UMA2_refactor
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/profiler_message_filter.h" 5 #include "content/browser/profiler_message_filter.h"
6 6
7 #include "base/tracked_objects.h" 7 #include "base/tracked_objects.h"
8 #include "content/browser/profiler_controller_impl.h" 8 #include "content/browser/profiler_controller_impl.h"
9 #include "content/browser/tcmalloc_internals_request_job.h" 9 #include "content/browser/tcmalloc_internals_request_job.h"
10 #include "content/common/child_process_messages.h" 10 #include "content/common/child_process_messages.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 ProfilerMessageFilter::ProfilerMessageFilter(content::ProcessType process_type) 14 ProfilerMessageFilter::ProfilerMessageFilter(content::ProcessType process_type)
15 : BrowserMessageFilter(ChildProcessMsgStart), process_type_(process_type) { 15 : BrowserMessageFilter(ChildProcessMsgStart), process_type_(process_type) {
16 } 16 }
17 17
18 void ProfilerMessageFilter::OnChannelConnected(int32 peer_pid) { 18 void ProfilerMessageFilter::OnChannelConnected(int32 peer_pid) {
19 tracked_objects::ThreadData::Status status = 19 tracked_objects::ThreadData::Status status =
20 tracked_objects::ThreadData::status(); 20 tracked_objects::ThreadData::status();
21 Send(new ChildProcessMsg_SetProfilerStatus(status)); 21 Send(new ChildProcessMsg_SetProfilerStatus(status));
22 } 22 }
23 23
24 bool ProfilerMessageFilter::OnMessageReceived(const IPC::Message& message) { 24 bool ProfilerMessageFilter::OnMessageReceived(const IPC::Message& message) {
25 bool handled = true; 25 bool handled = true;
26 IPC_BEGIN_MESSAGE_MAP(ProfilerMessageFilter, message) 26 IPC_BEGIN_MESSAGE_MAP(ProfilerMessageFilter, message)
27 IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ChildProfilerData, 27 IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ChildProfilerData,
28 OnChildProfilerData) 28 OnChildProfilerData)
29 IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ChildStackProfilerData,
30 OnChildStackProfilerData)
29 #if defined(USE_TCMALLOC) 31 #if defined(USE_TCMALLOC)
30 IPC_MESSAGE_HANDLER(ChildProcessHostMsg_TcmallocStats, OnTcmallocStats) 32 IPC_MESSAGE_HANDLER(ChildProcessHostMsg_TcmallocStats, OnTcmallocStats)
31 #endif 33 #endif
32 IPC_MESSAGE_UNHANDLED(handled = false) 34 IPC_MESSAGE_UNHANDLED(handled = false)
33 IPC_END_MESSAGE_MAP() 35 IPC_END_MESSAGE_MAP()
34 return handled; 36 return handled;
35 } 37 }
36 38
37 ProfilerMessageFilter::~ProfilerMessageFilter() {} 39 ProfilerMessageFilter::~ProfilerMessageFilter() {}
38 40
39 void ProfilerMessageFilter::OnChildProfilerData( 41 void ProfilerMessageFilter::OnChildProfilerData(
40 int sequence_number, 42 int sequence_number,
41 const tracked_objects::ProcessDataSnapshot& profiler_data) { 43 const tracked_objects::ProcessDataSnapshot& profiler_data) {
42 ProfilerControllerImpl::GetInstance()->OnProfilerDataCollected( 44 ProfilerControllerImpl::GetInstance()->OnProfilerDataCollected(
43 sequence_number, profiler_data, process_type_); 45 sequence_number, profiler_data, process_type_);
44 } 46 }
45 47
48 void ProfilerMessageFilter::OnChildStackProfilerData(
49 const base::StackSamplingProfiler::CallStackProfiles& profiler_data,
50 const base::CallStackProfileParams& params,
51 base::TimeTicks start_timestamp) {}
52
46 #if defined(USE_TCMALLOC) 53 #if defined(USE_TCMALLOC)
47 void ProfilerMessageFilter::OnTcmallocStats(const std::string& output) { 54 void ProfilerMessageFilter::OnTcmallocStats(const std::string& output) {
48 AboutTcmallocOutputs::GetInstance()->OnStatsForChildProcess( 55 AboutTcmallocOutputs::GetInstance()->OnStatsForChildProcess(
49 peer_pid(), process_type_, output); 56 peer_pid(), process_type_, output);
50 } 57 }
51 #endif 58 #endif
52 59
53 } 60 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698