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 <signal.h> | 5 #include <signal.h> |
6 #include <stdlib.h> | 6 #include <stdlib.h> |
7 | 7 |
8 #include <iostream> | 8 #include <iostream> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 public: | 48 public: |
49 ServerDelegate() : initialized_(false) {} | 49 ServerDelegate() : initialized_(false) {} |
50 | 50 |
51 ~ServerDelegate() override { | 51 ~ServerDelegate() override { |
52 if (!controller_thread_.get()) | 52 if (!controller_thread_.get()) |
53 return; | 53 return; |
54 // The DeviceController instance, if any, is constructed on the controller | 54 // The DeviceController instance, if any, is constructed on the controller |
55 // thread. Make sure that it gets deleted on that same thread. Note that | 55 // thread. Make sure that it gets deleted on that same thread. Note that |
56 // DeleteSoon() is not used here since it would imply reading |controller_| | 56 // DeleteSoon() is not used here since it would imply reading |controller_| |
57 // from the main thread while it's set on the internal thread. | 57 // from the main thread while it's set on the internal thread. |
58 controller_thread_->message_loop_proxy()->PostTask( | 58 controller_thread_->task_runner()->PostTask( |
59 FROM_HERE, | 59 FROM_HERE, base::Bind(&ServerDelegate::DeleteControllerOnInternalThread, |
60 base::Bind(&ServerDelegate::DeleteControllerOnInternalThread, | 60 base::Unretained(this))); |
61 base::Unretained(this))); | |
62 } | 61 } |
63 | 62 |
64 void DeleteControllerOnInternalThread() { | 63 void DeleteControllerOnInternalThread() { |
65 DCHECK( | 64 DCHECK(controller_thread_->task_runner()->RunsTasksOnCurrentThread()); |
66 controller_thread_->message_loop_proxy()->RunsTasksOnCurrentThread()); | |
67 controller_.reset(); | 65 controller_.reset(); |
68 } | 66 } |
69 | 67 |
70 // Daemon::ServerDelegate: | 68 // Daemon::ServerDelegate: |
71 void Init() override { | 69 void Init() override { |
72 DCHECK(!g_notifier); | 70 DCHECK(!g_notifier); |
73 g_notifier = new forwarder2::PipeNotifier(); | 71 g_notifier = new forwarder2::PipeNotifier(); |
74 signal(SIGTERM, KillHandler); | 72 signal(SIGTERM, KillHandler); |
75 signal(SIGINT, KillHandler); | 73 signal(SIGINT, KillHandler); |
76 controller_thread_.reset(new base::Thread("controller_thread")); | 74 controller_thread_.reset(new base::Thread("controller_thread")); |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 return 1; | 158 return 1; |
161 return client_delegate.has_failed(); | 159 return client_delegate.has_failed(); |
162 } | 160 } |
163 | 161 |
164 } // namespace | 162 } // namespace |
165 } // namespace forwarder2 | 163 } // namespace forwarder2 |
166 | 164 |
167 int main(int argc, char** argv) { | 165 int main(int argc, char** argv) { |
168 return forwarder2::RunDeviceForwarder(argc, argv); | 166 return forwarder2::RunDeviceForwarder(argc, argv); |
169 } | 167 } |
OLD | NEW |