OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "remoting/jingle_glue/jingle_thread.h" | 5 #include "remoting/jingle_glue/jingle_thread.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop_proxy.h" |
9 #include "base/message_pump.h" | 10 #include "base/message_pump.h" |
10 #include "base/time.h" | 11 #include "base/time.h" |
11 #include "third_party/libjingle/source/talk/base/ssladapter.h" | 12 #include "third_party/libjingle/source/talk/base/ssladapter.h" |
12 | 13 |
13 namespace remoting { | 14 namespace remoting { |
14 | 15 |
15 const uint32 kRunTasksMessageId = 1; | 16 const uint32 kRunTasksMessageId = 1; |
16 const uint32 kStopMessageId = 2; | 17 const uint32 kStopMessageId = 2; |
17 | 18 |
18 namespace { | 19 namespace { |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 JingleThread::~JingleThread() { } | 147 JingleThread::~JingleThread() { } |
147 | 148 |
148 void JingleThread::Start() { | 149 void JingleThread::Start() { |
149 Thread::Start(); | 150 Thread::Start(); |
150 started_event_.Wait(); | 151 started_event_.Wait(); |
151 } | 152 } |
152 | 153 |
153 void JingleThread::Run() { | 154 void JingleThread::Run() { |
154 JingleThreadMessageLoop message_loop(this); | 155 JingleThreadMessageLoop message_loop(this); |
155 message_loop_ = &message_loop; | 156 message_loop_ = &message_loop; |
| 157 message_loop_proxy_ = base::MessageLoopProxy::CreateForCurrentThread(); |
156 | 158 |
157 TaskPump task_pump; | 159 TaskPump task_pump; |
158 task_pump_ = &task_pump; | 160 task_pump_ = &task_pump; |
159 | 161 |
160 // Signal after we've initialized |message_loop_| and |task_pump_|. | 162 // Signal after we've initialized |message_loop_| and |task_pump_|. |
161 started_event_.Signal(); | 163 started_event_.Signal(); |
162 | 164 |
163 message_loop.Run(); | 165 message_loop.Run(); |
164 | 166 |
165 stopped_event_.Signal(); | 167 stopped_event_.Signal(); |
166 | 168 |
167 task_pump_ = NULL; | 169 task_pump_ = NULL; |
168 message_loop_ = NULL; | 170 message_loop_ = NULL; |
169 } | 171 } |
170 | 172 |
171 void JingleThread::Stop() { | 173 void JingleThread::Stop() { |
172 message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask()); | 174 message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask()); |
173 stopped_event_.Wait(); | 175 stopped_event_.Wait(); |
174 | 176 |
175 // This will wait until the thread is actually finished. | 177 // This will wait until the thread is actually finished. |
176 Thread::Stop(); | 178 Thread::Stop(); |
177 } | 179 } |
178 | 180 |
179 MessageLoop* JingleThread::message_loop() { | 181 MessageLoop* JingleThread::message_loop() { |
180 return message_loop_; | 182 return message_loop_; |
181 } | 183 } |
182 | 184 |
| 185 base::MessageLoopProxy* JingleThread::message_loop_proxy() { |
| 186 return message_loop_proxy_; |
| 187 } |
| 188 |
183 TaskPump* JingleThread::task_pump() { | 189 TaskPump* JingleThread::task_pump() { |
184 return task_pump_; | 190 return task_pump_; |
185 } | 191 } |
186 | 192 |
187 } // namespace remoting | 193 } // namespace remoting |
OLD | NEW |