OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "mojo/message_pump/handle_watcher.h" | 5 #include "mojo/message_pump/handle_watcher.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/atomic_sequence_num.h" | 9 #include "base/atomic_sequence_num.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
215 Requests requests_; | 215 Requests requests_; |
216 | 216 |
217 DISALLOW_COPY_AND_ASSIGN(WatcherThreadManager); | 217 DISALLOW_COPY_AND_ASSIGN(WatcherThreadManager); |
218 }; | 218 }; |
219 | 219 |
220 WatcherThreadManager::~WatcherThreadManager() { | 220 WatcherThreadManager::~WatcherThreadManager() { |
221 thread_.Stop(); | 221 thread_.Stop(); |
222 } | 222 } |
223 | 223 |
224 WatcherThreadManager* WatcherThreadManager::GetInstance() { | 224 WatcherThreadManager* WatcherThreadManager::GetInstance() { |
225 return base::Singleton<WatcherThreadManager>::get(); | 225 return base::Singleton<WatcherThreadManager, |
226 base::LeakySingletonTraits<WatcherThreadManager>>:: | |
jam
2015/11/07 05:00:31
we need to leak this because otherwise when the pr
sky
2015/11/08 16:26:36
Please add this comment to the code here.
jam
2015/11/09 18:20:58
Done.
| |
227 get(); | |
226 } | 228 } |
227 | 229 |
228 WatcherID WatcherThreadManager::StartWatching( | 230 WatcherID WatcherThreadManager::StartWatching( |
229 const Handle& handle, | 231 const Handle& handle, |
230 MojoHandleSignals handle_signals, | 232 MojoHandleSignals handle_signals, |
231 base::TimeTicks deadline, | 233 base::TimeTicks deadline, |
232 const base::Callback<void(MojoResult)>& callback) { | 234 const base::Callback<void(MojoResult)>& callback) { |
233 RequestData request_data; | 235 RequestData request_data; |
234 request_data.type = REQUEST_START; | 236 request_data.type = REQUEST_START; |
235 request_data.start_data.id = watcher_id_generator_.GetNext(); | 237 request_data.start_data.id = watcher_id_generator_.GetNext(); |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
466 this, handle, handle_signals, deadline, callback)); | 468 this, handle, handle_signals, deadline, callback)); |
467 } | 469 } |
468 } | 470 } |
469 | 471 |
470 void HandleWatcher::Stop() { | 472 void HandleWatcher::Stop() { |
471 state_.reset(); | 473 state_.reset(); |
472 } | 474 } |
473 | 475 |
474 } // namespace common | 476 } // namespace common |
475 } // namespace mojo | 477 } // namespace mojo |
OLD | NEW |