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

Unified Diff: webrtc/p2p/quic/quictransportchannel.cc

Issue 2396513003: Restore thread name consistency for webrtc/p2p/ . (Closed)
Patch Set: Do not reuse terms 'network thread' or 'worker thread' for the test relayserver. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/p2p/quic/quictransportchannel.cc
diff --git a/webrtc/p2p/quic/quictransportchannel.cc b/webrtc/p2p/quic/quictransportchannel.cc
index 29819c6269607b20aaf0ee23607721ea0bf68f48..da0531aa773b7329a2ad4decf8e507d2f78719f2 100644
--- a/webrtc/p2p/quic/quictransportchannel.cc
+++ b/webrtc/p2p/quic/quictransportchannel.cc
@@ -126,9 +126,9 @@ namespace cricket {
QuicTransportChannel::QuicTransportChannel(TransportChannelImpl* channel)
: TransportChannelImpl(channel->transport_name(), channel->component()),
- worker_thread_(rtc::Thread::Current()),
+ network_thread_(rtc::Thread::Current()),
channel_(channel),
- helper_(worker_thread_) {
+ helper_(network_thread_) {
channel_->SignalWritableState.connect(this,
&QuicTransportChannel::OnWritableState);
channel_->SignalReadPacket.connect(this, &QuicTransportChannel::OnReadPacket);
@@ -273,7 +273,7 @@ int QuicTransportChannel::SendPacket(const char* data,
// - Once the QUIC handshake completes, the state is that of the
// |channel_| again.
void QuicTransportChannel::OnWritableState(TransportChannel* channel) {
- ASSERT(rtc::Thread::Current() == worker_thread_);
+ ASSERT(rtc::Thread::Current() == network_thread_);
ASSERT(channel == channel_.get());
LOG_J(LS_VERBOSE, this)
<< "QuicTransportChannel: channel writable state changed to "
@@ -307,7 +307,7 @@ void QuicTransportChannel::OnWritableState(TransportChannel* channel) {
}
void QuicTransportChannel::OnReceivingState(TransportChannel* channel) {
- ASSERT(rtc::Thread::Current() == worker_thread_);
+ ASSERT(rtc::Thread::Current() == network_thread_);
ASSERT(channel == channel_.get());
LOG_J(LS_VERBOSE, this)
<< "QuicTransportChannel: channel receiving state changed to "
@@ -323,7 +323,7 @@ void QuicTransportChannel::OnReadPacket(TransportChannel* channel,
size_t size,
const rtc::PacketTime& packet_time,
int flags) {
- ASSERT(rtc::Thread::Current() == worker_thread_);
+ ASSERT(rtc::Thread::Current() == network_thread_);
ASSERT(channel == channel_.get());
ASSERT(flags == 0);
@@ -360,7 +360,7 @@ void QuicTransportChannel::OnReadPacket(TransportChannel* channel,
void QuicTransportChannel::OnSentPacket(TransportChannel* channel,
const rtc::SentPacket& sent_packet) {
- ASSERT(rtc::Thread::Current() == worker_thread_);
+ ASSERT(rtc::Thread::Current() == network_thread_);
SignalSentPacket(this, sent_packet);
}
@@ -506,7 +506,7 @@ bool QuicTransportChannel::StartQuicHandshake() {
}
bool QuicTransportChannel::HandleQuicPacket(const char* data, size_t size) {
- ASSERT(rtc::Thread::Current() == worker_thread_);
+ ASSERT(rtc::Thread::Current() == network_thread_);
return quic_->OnReadPacket(data, size);
}
« webrtc/p2p/quic/quictransportchannel.h ('K') | « webrtc/p2p/quic/quictransportchannel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698