Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Side by Side Diff: webrtc/p2p/client/socketmonitor.cc

Issue 2620303003: Replace ASSERT by RTC_DCHECK in all non-test code. (Closed)
Patch Set: Address final nits. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/client/basicportallocator.cc ('k') | webrtc/p2p/quic/quictransport.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 #include "webrtc/p2p/client/socketmonitor.h" 11 #include "webrtc/p2p/client/socketmonitor.h"
12 12
13 #include "webrtc/base/checks.h"
13 #include "webrtc/base/common.h" 14 #include "webrtc/base/common.h"
14 15
15 namespace cricket { 16 namespace cricket {
16 17
17 enum { 18 enum {
18 MSG_MONITOR_POLL, 19 MSG_MONITOR_POLL,
19 MSG_MONITOR_START, 20 MSG_MONITOR_START,
20 MSG_MONITOR_STOP, 21 MSG_MONITOR_STOP,
21 MSG_MONITOR_SIGNAL 22 MSG_MONITOR_SIGNAL
22 }; 23 };
(...skipping 20 matching lines...) Expand all
43 } 44 }
44 45
45 void ConnectionMonitor::Stop() { 46 void ConnectionMonitor::Stop() {
46 network_thread_->Post(RTC_FROM_HERE, this, MSG_MONITOR_STOP); 47 network_thread_->Post(RTC_FROM_HERE, this, MSG_MONITOR_STOP);
47 } 48 }
48 49
49 void ConnectionMonitor::OnMessage(rtc::Message *message) { 50 void ConnectionMonitor::OnMessage(rtc::Message *message) {
50 rtc::CritScope cs(&crit_); 51 rtc::CritScope cs(&crit_);
51 switch (message->message_id) { 52 switch (message->message_id) {
52 case MSG_MONITOR_START: 53 case MSG_MONITOR_START:
53 ASSERT(rtc::Thread::Current() == network_thread_); 54 RTC_DCHECK(rtc::Thread::Current() == network_thread_);
54 if (!monitoring_) { 55 if (!monitoring_) {
55 monitoring_ = true; 56 monitoring_ = true;
56 PollConnectionStats_w(); 57 PollConnectionStats_w();
57 } 58 }
58 break; 59 break;
59 60
60 case MSG_MONITOR_STOP: 61 case MSG_MONITOR_STOP:
61 ASSERT(rtc::Thread::Current() == network_thread_); 62 RTC_DCHECK(rtc::Thread::Current() == network_thread_);
62 if (monitoring_) { 63 if (monitoring_) {
63 monitoring_ = false; 64 monitoring_ = false;
64 network_thread_->Clear(this); 65 network_thread_->Clear(this);
65 } 66 }
66 break; 67 break;
67 68
68 case MSG_MONITOR_POLL: 69 case MSG_MONITOR_POLL:
69 ASSERT(rtc::Thread::Current() == network_thread_); 70 RTC_DCHECK(rtc::Thread::Current() == network_thread_);
70 PollConnectionStats_w(); 71 PollConnectionStats_w();
71 break; 72 break;
72 73
73 case MSG_MONITOR_SIGNAL: { 74 case MSG_MONITOR_SIGNAL: {
74 ASSERT(rtc::Thread::Current() == monitoring_thread_); 75 RTC_DCHECK(rtc::Thread::Current() == monitoring_thread_);
75 std::vector<ConnectionInfo> infos = connection_infos_; 76 std::vector<ConnectionInfo> infos = connection_infos_;
76 crit_.Leave(); 77 crit_.Leave();
77 SignalUpdate(this, infos); 78 SignalUpdate(this, infos);
78 crit_.Enter(); 79 crit_.Enter();
79 break; 80 break;
80 } 81 }
81 } 82 }
82 } 83 }
83 84
84 void ConnectionMonitor::PollConnectionStats_w() { 85 void ConnectionMonitor::PollConnectionStats_w() {
85 ASSERT(rtc::Thread::Current() == network_thread_); 86 RTC_DCHECK(rtc::Thread::Current() == network_thread_);
86 rtc::CritScope cs(&crit_); 87 rtc::CritScope cs(&crit_);
87 88
88 // Gather connection infos 89 // Gather connection infos
89 stats_getter_->GetConnectionStats(&connection_infos_); 90 stats_getter_->GetConnectionStats(&connection_infos_);
90 91
91 // Signal the monitoring thread, start another poll timer 92 // Signal the monitoring thread, start another poll timer
92 monitoring_thread_->Post(RTC_FROM_HERE, this, MSG_MONITOR_SIGNAL); 93 monitoring_thread_->Post(RTC_FROM_HERE, this, MSG_MONITOR_SIGNAL);
93 network_thread_->PostDelayed(RTC_FROM_HERE, rate_, this, MSG_MONITOR_POLL); 94 network_thread_->PostDelayed(RTC_FROM_HERE, rate_, this, MSG_MONITOR_POLL);
94 } 95 }
95 96
96 } // namespace cricket 97 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/client/basicportallocator.cc ('k') | webrtc/p2p/quic/quictransport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698