OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 { | 346 { |
347 CritScope cs(&crit_); | 347 CritScope cs(&crit_); |
348 _SendMessage smsg; | 348 _SendMessage smsg; |
349 smsg.thread = current_thread; | 349 smsg.thread = current_thread; |
350 smsg.msg = msg; | 350 smsg.msg = msg; |
351 smsg.ready = &ready; | 351 smsg.ready = &ready; |
352 sendlist_.push_back(smsg); | 352 sendlist_.push_back(smsg); |
353 } | 353 } |
354 | 354 |
355 // Wait for a reply | 355 // Wait for a reply |
356 WakeUpSocketServer(); | 356 |
| 357 ss_->WakeUp(); |
357 | 358 |
358 bool waited = false; | 359 bool waited = false; |
359 crit_.Enter(); | 360 crit_.Enter(); |
360 while (!ready) { | 361 while (!ready) { |
361 crit_.Leave(); | 362 crit_.Leave(); |
362 // We need to limit "ReceiveSends" to |this| thread to avoid an arbitrary | 363 // We need to limit "ReceiveSends" to |this| thread to avoid an arbitrary |
363 // thread invoking calls on the current thread. | 364 // thread invoking calls on the current thread. |
364 current_thread->ReceiveSendsFromThread(this); | 365 current_thread->ReceiveSendsFromThread(this); |
365 current_thread->socketserver()->Wait(kForever, false); | 366 current_thread->socketserver()->Wait(kForever, false); |
366 waited = true; | 367 waited = true; |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 if (SUCCEEDED(hr)) { | 534 if (SUCCEEDED(hr)) { |
534 Thread::Run(); | 535 Thread::Run(); |
535 CoUninitialize(); | 536 CoUninitialize(); |
536 } else { | 537 } else { |
537 LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr; | 538 LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr; |
538 } | 539 } |
539 } | 540 } |
540 #endif | 541 #endif |
541 | 542 |
542 } // namespace rtc | 543 } // namespace rtc |
OLD | NEW |