OLD | NEW |
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/common/child_thread.h" | 5 #include "content/common/child_thread.h" |
6 | 6 |
7 #include "base/allocator/allocator_extension.h" | 7 #include "base/allocator/allocator_extension.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/process.h" | 10 #include "base/process.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/tracked_objects.h" | 12 #include "base/tracked_objects.h" |
| 13 #include "content/common/child_histogram_message_filter.h" |
13 #include "content/common/child_process.h" | 14 #include "content/common/child_process.h" |
14 #include "content/common/child_process_messages.h" | 15 #include "content/common/child_process_messages.h" |
15 #include "content/common/child_trace_message_filter.h" | 16 #include "content/common/child_trace_message_filter.h" |
16 #include "content/common/fileapi/file_system_dispatcher.h" | 17 #include "content/common/fileapi/file_system_dispatcher.h" |
17 #include "content/common/quota_dispatcher.h" | 18 #include "content/common/quota_dispatcher.h" |
18 #include "content/common/resource_dispatcher.h" | 19 #include "content/common/resource_dispatcher.h" |
19 #include "content/common/socket_stream_dispatcher.h" | 20 #include "content/common/socket_stream_dispatcher.h" |
20 #include "content/public/common/content_switches.h" | 21 #include "content/public/common/content_switches.h" |
21 #include "ipc/ipc_logging.h" | 22 #include "ipc/ipc_logging.h" |
22 #include "ipc/ipc_switches.h" | 23 #include "ipc/ipc_switches.h" |
(...skipping 26 matching lines...) Expand all Loading... |
49 ChildProcess::current()->io_message_loop_proxy(), true, | 50 ChildProcess::current()->io_message_loop_proxy(), true, |
50 ChildProcess::current()->GetShutDownEvent())); | 51 ChildProcess::current()->GetShutDownEvent())); |
51 #ifdef IPC_MESSAGE_LOG_ENABLED | 52 #ifdef IPC_MESSAGE_LOG_ENABLED |
52 IPC::Logging::GetInstance()->SetIPCSender(this); | 53 IPC::Logging::GetInstance()->SetIPCSender(this); |
53 #endif | 54 #endif |
54 | 55 |
55 resource_dispatcher_.reset(new ResourceDispatcher(this)); | 56 resource_dispatcher_.reset(new ResourceDispatcher(this)); |
56 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); | 57 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); |
57 file_system_dispatcher_.reset(new FileSystemDispatcher()); | 58 file_system_dispatcher_.reset(new FileSystemDispatcher()); |
58 quota_dispatcher_.reset(new QuotaDispatcher()); | 59 quota_dispatcher_.reset(new QuotaDispatcher()); |
| 60 histogram_message_filter_ = new ChildHistogramMessageFilter(); |
59 | 61 |
60 sync_message_filter_ = | 62 sync_message_filter_ = |
61 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); | 63 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); |
62 channel_->AddFilter(sync_message_filter_.get()); | 64 channel_->AddFilter(sync_message_filter_.get()); |
63 channel_->AddFilter(new ChildTraceMessageFilter()); | 65 channel_->AddFilter(new ChildTraceMessageFilter()); |
| 66 channel_->AddFilter(histogram_message_filter_); |
64 } | 67 } |
65 | 68 |
66 ChildThread::~ChildThread() { | 69 ChildThread::~ChildThread() { |
67 #ifdef IPC_MESSAGE_LOG_ENABLED | 70 #ifdef IPC_MESSAGE_LOG_ENABLED |
68 IPC::Logging::GetInstance()->SetIPCSender(NULL); | 71 IPC::Logging::GetInstance()->SetIPCSender(NULL); |
69 #endif | 72 #endif |
70 | 73 |
71 channel_->RemoveFilter(sync_message_filter_.get()); | 74 channel_->RemoveFilter(sync_message_filter_.get()); |
72 | 75 |
73 // Close this channel before resetting the message loop attached to it so | 76 // Close this channel before resetting the message loop attached to it so |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 } | 279 } |
277 | 280 |
278 // The child process shutdown sequence is a request response based mechanism, | 281 // The child process shutdown sequence is a request response based mechanism, |
279 // where we send out an initial feeler request to the child process host | 282 // where we send out an initial feeler request to the child process host |
280 // instance in the browser to verify if it's ok to shutdown the child process. | 283 // instance in the browser to verify if it's ok to shutdown the child process. |
281 // The browser then sends back a response if it's ok to shutdown. This avoids | 284 // The browser then sends back a response if it's ok to shutdown. This avoids |
282 // race conditions if the process refcount is 0 but there's an IPC message | 285 // race conditions if the process refcount is 0 but there's an IPC message |
283 // inflight that would addref it. | 286 // inflight that would addref it. |
284 Send(new ChildProcessHostMsg_ShutdownRequest); | 287 Send(new ChildProcessHostMsg_ShutdownRequest); |
285 } | 288 } |
OLD | NEW |