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

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

Issue 12212089: content: convert child process notifications to observer usage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: private Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/browser_child_process_host_impl.h ('k') | content/browser/mach_broker_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser_child_process_host_impl.h" 5 #include "content/browser/browser_child_process_host_impl.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/process_util.h" 15 #include "base/process_util.h"
16 #include "base/stl_util.h" 16 #include "base/stl_util.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "content/browser/histogram_message_filter.h" 18 #include "content/browser/histogram_message_filter.h"
19 #include "content/browser/loader/resource_message_filter.h" 19 #include "content/browser/loader/resource_message_filter.h"
20 #include "content/browser/profiler_message_filter.h" 20 #include "content/browser/profiler_message_filter.h"
21 #include "content/browser/tracing/trace_message_filter.h" 21 #include "content/browser/tracing/trace_message_filter.h"
22 #include "content/common/child_process_host_impl.h" 22 #include "content/common/child_process_host_impl.h"
23 #include "content/common/plugin_messages.h" 23 #include "content/common/plugin_messages.h"
24 #include "content/public/browser/browser_child_process_host_delegate.h" 24 #include "content/public/browser/browser_child_process_host_delegate.h"
25 #include "content/public/browser/browser_child_process_observer.h"
25 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
26 #include "content/public/browser/child_process_data.h" 27 #include "content/public/browser/child_process_data.h"
27 #include "content/public/browser/content_browser_client.h" 28 #include "content/public/browser/content_browser_client.h"
28 #include "content/public/browser/notification_service.h"
29 #include "content/public/browser/notification_types.h"
30 #include "content/public/common/content_switches.h" 29 #include "content/public/common/content_switches.h"
31 #include "content/public/common/result_codes.h" 30 #include "content/public/common/result_codes.h"
32 31
33 #if defined(OS_MACOSX) 32 #if defined(OS_MACOSX)
34 #include "content/browser/mach_broker_mac.h" 33 #include "content/browser/mach_broker_mac.h"
35 #endif 34 #endif
36 35
37 namespace content { 36 namespace content {
38 namespace { 37 namespace {
39 38
40 static base::LazyInstance<BrowserChildProcessHostImpl::BrowserChildProcessList> 39 static base::LazyInstance<BrowserChildProcessHostImpl::BrowserChildProcessList>
41 g_child_process_list = LAZY_INSTANCE_INITIALIZER; 40 g_child_process_list = LAZY_INSTANCE_INITIALIZER;
42 41
43 // Helper functions since the child process related notifications happen on the 42 base::LazyInstance<ObserverList<BrowserChildProcessObserver> >
44 // UI thread. 43 g_observers = LAZY_INSTANCE_INITIALIZER;
45 void ChildNotificationHelper(int notification_type, 44
46 const ChildProcessData& data) { 45 void NotifyProcessHostConnected(const ChildProcessData& data) {
47 NotificationService::current()->Notify( 46 FOR_EACH_OBSERVER(BrowserChildProcessObserver, g_observers.Get(),
48 notification_type, NotificationService::AllSources(), 47 BrowserChildProcessHostConnected(data));
49 Details<const ChildProcessData>(&data)); 48 }
49
50 void NotifyProcessHostDisconnected(const ChildProcessData& data) {
51 FOR_EACH_OBSERVER(BrowserChildProcessObserver, g_observers.Get(),
52 BrowserChildProcessHostDisconnected(data));
53 }
54
55 void NotifyProcessCrashed(const ChildProcessData& data) {
56 FOR_EACH_OBSERVER(BrowserChildProcessObserver, g_observers.Get(),
57 BrowserChildProcessCrashed(data));
50 } 58 }
51 59
52 } // namespace 60 } // namespace
53 61
54 BrowserChildProcessHost* BrowserChildProcessHost::Create( 62 BrowserChildProcessHost* BrowserChildProcessHost::Create(
55 ProcessType type, 63 ProcessType type,
56 BrowserChildProcessHostDelegate* delegate) { 64 BrowserChildProcessHostDelegate* delegate) {
57 return new BrowserChildProcessHostImpl(type, delegate); 65 return new BrowserChildProcessHostImpl(type, delegate);
58 } 66 }
59 67
60 #if defined(OS_MACOSX) 68 #if defined(OS_MACOSX)
61 base::ProcessMetrics::PortProvider* BrowserChildProcessHost::GetPortProvider() { 69 base::ProcessMetrics::PortProvider* BrowserChildProcessHost::GetPortProvider() {
62 return MachBroker::GetInstance(); 70 return MachBroker::GetInstance();
63 } 71 }
64 #endif 72 #endif
65 73
74 // static
66 BrowserChildProcessHostImpl::BrowserChildProcessList* 75 BrowserChildProcessHostImpl::BrowserChildProcessList*
67 BrowserChildProcessHostImpl::GetIterator() { 76 BrowserChildProcessHostImpl::GetIterator() {
68 return g_child_process_list.Pointer(); 77 return g_child_process_list.Pointer();
69 } 78 }
70 79
80 // static
81 void BrowserChildProcessHostImpl::AddObserver(
82 BrowserChildProcessObserver* observer) {
83 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
84 g_observers.Get().AddObserver(observer);
85 }
86
87 // static
88 void BrowserChildProcessHostImpl::RemoveObserver(
89 BrowserChildProcessObserver* observer) {
90 // TODO(phajdan.jr): Check thread after fixing http://crbug.com/167126.
91 g_observers.Get().RemoveObserver(observer);
92 }
93
71 BrowserChildProcessHostImpl::BrowserChildProcessHostImpl( 94 BrowserChildProcessHostImpl::BrowserChildProcessHostImpl(
72 ProcessType type, 95 ProcessType type,
73 BrowserChildProcessHostDelegate* delegate) 96 BrowserChildProcessHostDelegate* delegate)
74 : data_(type), 97 : data_(type),
75 delegate_(delegate) { 98 delegate_(delegate) {
76 data_.id = ChildProcessHostImpl::GenerateChildProcessUniqueId(); 99 data_.id = ChildProcessHostImpl::GenerateChildProcessUniqueId();
77 100
78 child_process_host_.reset(ChildProcessHost::Create(this)); 101 child_process_host_.reset(ChildProcessHost::Create(this));
79 child_process_host_->AddFilter(new TraceMessageFilter); 102 child_process_host_->AddFilter(new TraceMessageFilter);
80 child_process_host_->AddFilter(new ProfilerMessageFilter(type)); 103 child_process_host_->AddFilter(new ProfilerMessageFilter(type));
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 g_child_process_list.Get().remove(this); 198 g_child_process_list.Get().remove(this);
176 child_process_host_->ForceShutdown(); 199 child_process_host_->ForceShutdown();
177 } 200 }
178 201
179 void BrowserChildProcessHostImpl::SetTerminateChildOnShutdown( 202 void BrowserChildProcessHostImpl::SetTerminateChildOnShutdown(
180 bool terminate_on_shutdown) { 203 bool terminate_on_shutdown) {
181 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 204 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
182 child_process_->SetTerminateChildOnShutdown(terminate_on_shutdown); 205 child_process_->SetTerminateChildOnShutdown(terminate_on_shutdown);
183 } 206 }
184 207
185 void BrowserChildProcessHostImpl::Notify(int type) { 208 void BrowserChildProcessHostImpl::NotifyProcessInstanceCreated(
186 BrowserThread::PostTask( 209 const ChildProcessData& data) {
187 BrowserThread::UI, 210 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
188 FROM_HERE, 211 FOR_EACH_OBSERVER(BrowserChildProcessObserver, g_observers.Get(),
189 base::Bind(&ChildNotificationHelper, type, data_)); 212 BrowserChildProcessInstanceCreated(data));
190 } 213 }
191 214
192 base::TerminationStatus BrowserChildProcessHostImpl::GetTerminationStatus( 215 base::TerminationStatus BrowserChildProcessHostImpl::GetTerminationStatus(
193 int* exit_code) { 216 int* exit_code) {
194 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 217 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
195 if (!child_process_.get()) // If the delegate doesn't use Launch() helper. 218 if (!child_process_.get()) // If the delegate doesn't use Launch() helper.
196 return base::GetTerminationStatus(data_.handle, exit_code); 219 return base::GetTerminationStatus(data_.handle, exit_code);
197 return child_process_->GetChildTerminationStatus(false /* known_dead */, 220 return child_process_->GetChildTerminationStatus(false /* known_dead */,
198 exit_code); 221 exit_code);
199 } 222 }
200 223
201 bool BrowserChildProcessHostImpl::OnMessageReceived( 224 bool BrowserChildProcessHostImpl::OnMessageReceived(
202 const IPC::Message& message) { 225 const IPC::Message& message) {
203 return delegate_->OnMessageReceived(message); 226 return delegate_->OnMessageReceived(message);
204 } 227 }
205 228
206 void BrowserChildProcessHostImpl::OnChannelConnected(int32 peer_pid) { 229 void BrowserChildProcessHostImpl::OnChannelConnected(int32 peer_pid) {
207 Notify(NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED); 230 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
231 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
232 base::Bind(&NotifyProcessHostConnected, data_));
208 delegate_->OnChannelConnected(peer_pid); 233 delegate_->OnChannelConnected(peer_pid);
209 } 234 }
210 235
211 void BrowserChildProcessHostImpl::OnChannelError() { 236 void BrowserChildProcessHostImpl::OnChannelError() {
212 delegate_->OnChannelError(); 237 delegate_->OnChannelError();
213 } 238 }
214 239
215 bool BrowserChildProcessHostImpl::CanShutdown() { 240 bool BrowserChildProcessHostImpl::CanShutdown() {
216 return delegate_->CanShutdown(); 241 return delegate_->CanShutdown();
217 } 242 }
218 243
219 void BrowserChildProcessHostImpl::OnChildDisconnected() { 244 void BrowserChildProcessHostImpl::OnChildDisconnected() {
245 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
220 DCHECK(data_.handle != base::kNullProcessHandle); 246 DCHECK(data_.handle != base::kNullProcessHandle);
221 int exit_code; 247 int exit_code;
222 base::TerminationStatus status = GetTerminationStatus(&exit_code); 248 base::TerminationStatus status = GetTerminationStatus(&exit_code);
223 switch (status) { 249 switch (status) {
224 case base::TERMINATION_STATUS_PROCESS_CRASHED: 250 case base::TERMINATION_STATUS_PROCESS_CRASHED:
225 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: { 251 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: {
226 delegate_->OnProcessCrashed(exit_code); 252 delegate_->OnProcessCrashed(exit_code);
227 // Report that this child process crashed. 253 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
228 Notify(NOTIFICATION_CHILD_PROCESS_CRASHED); 254 base::Bind(&NotifyProcessCrashed, data_));
229 UMA_HISTOGRAM_ENUMERATION("ChildProcess.Crashed", 255 UMA_HISTOGRAM_ENUMERATION("ChildProcess.Crashed",
230 data_.type, 256 data_.type,
231 PROCESS_TYPE_MAX); 257 PROCESS_TYPE_MAX);
232 break; 258 break;
233 } 259 }
234 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: { 260 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: {
235 delegate_->OnProcessCrashed(exit_code); 261 delegate_->OnProcessCrashed(exit_code);
236 // Report that this child process was killed. 262 // Report that this child process was killed.
237 UMA_HISTOGRAM_ENUMERATION("ChildProcess.Killed", 263 UMA_HISTOGRAM_ENUMERATION("ChildProcess.Killed",
238 data_.type, 264 data_.type,
239 PROCESS_TYPE_MAX); 265 PROCESS_TYPE_MAX);
240 break; 266 break;
241 } 267 }
242 case base::TERMINATION_STATUS_STILL_RUNNING: { 268 case base::TERMINATION_STATUS_STILL_RUNNING: {
243 UMA_HISTOGRAM_ENUMERATION("ChildProcess.DisconnectedAlive", 269 UMA_HISTOGRAM_ENUMERATION("ChildProcess.DisconnectedAlive",
244 data_.type, 270 data_.type,
245 PROCESS_TYPE_MAX); 271 PROCESS_TYPE_MAX);
246 } 272 }
247 default: 273 default:
248 break; 274 break;
249 } 275 }
250 UMA_HISTOGRAM_ENUMERATION("ChildProcess.Disconnected", 276 UMA_HISTOGRAM_ENUMERATION("ChildProcess.Disconnected",
251 data_.type, 277 data_.type,
252 PROCESS_TYPE_MAX); 278 PROCESS_TYPE_MAX);
253 // Notify in the main loop of the disconnection. 279 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
254 Notify(NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED); 280 base::Bind(&NotifyProcessHostDisconnected, data_));
255 delete delegate_; // Will delete us 281 delete delegate_; // Will delete us
256 } 282 }
257 283
258 bool BrowserChildProcessHostImpl::Send(IPC::Message* message) { 284 bool BrowserChildProcessHostImpl::Send(IPC::Message* message) {
259 return child_process_host_->Send(message); 285 return child_process_host_->Send(message);
260 } 286 }
261 287
262 void BrowserChildProcessHostImpl::OnProcessLaunched() { 288 void BrowserChildProcessHostImpl::OnProcessLaunched() {
263 if (!child_process_->GetHandle()) { 289 if (!child_process_->GetHandle()) {
264 delete delegate_; // Will delete us 290 delete delegate_; // Will delete us
265 return; 291 return;
266 } 292 }
267 data_.handle = child_process_->GetHandle(); 293 data_.handle = child_process_->GetHandle();
268 delegate_->OnProcessLaunched(); 294 delegate_->OnProcessLaunched();
269 } 295 }
270 296
271 } // namespace content 297 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_child_process_host_impl.h ('k') | content/browser/mach_broker_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698