zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A little cleanup in p2ptransportchannel and transportchannel.

Browse Source 
No functional changes.

BUG=

Review URL: https://codereview.webrtc.org/1411103012

Cr-Commit-Position: refs/heads/master@{#10614}
This commit is contained in:
honghaiz
2015-11-11 16:15:07 -08:00
committed by Commit bot
parent 066ded99cb
commit a8e9f5e4e4
3 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
webrtc/p2p/base/p2ptransportchannel.cc
View File

@ -984,12 +984,8 @@ void P2PTransportChannel::SortConnections() {
// Now update the writable state of the channel with the information we have // Now update the writable state of the channel with the information we have
// so far. // so far.
if (best_connection_ && best_connection_->writable()) { if (all_connections_timedout) {
HandleWritable();
} else if (all_connections_timedout) {
HandleAllTimedOut(); HandleAllTimedOut();
} else {
HandleNotWritable();
} }
// Update the state of this channel. This method is called whenever the // Update the state of this channel. This method is called whenever the
@ -1055,12 +1051,8 @@ void P2PTransportChannel::SwitchBestConnectionTo(Connection* conn) {
} }
void P2PTransportChannel::UpdateChannelState() { void P2PTransportChannel::UpdateChannelState() {
// The Handle* functions already set the writable state. We'll just double-
// check it here.
bool writable = best_connection_ && best_connection_->writable(); bool writable = best_connection_ && best_connection_->writable();
ASSERT(writable == this->writable()); set_writable(writable);
if (writable != this->writable())
LOG(LS_ERROR) << "UpdateChannelState: writable state mismatch";
bool receiving = false; bool receiving = false;
for (const Connection* connection : connections_) { for (const Connection* connection : connections_) {
@ -1091,22 +1083,6 @@ void P2PTransportChannel::MaybeStopPortAllocatorSessions() {
} }
} }
// Go into the writable state and notify upper layer if it was not before.
void P2PTransportChannel::HandleWritable() {
ASSERT(worker_thread_ == rtc::Thread::Current());
if (!writable()) {
set_writable(true);
}
}
// Notify upper layer about channel not writable state, if it was before.
void P2PTransportChannel::HandleNotWritable() {
ASSERT(worker_thread_ == rtc::Thread::Current());
if (writable()) {
set_writable(false);
}
}
// If all connections timed out, delete them all. // If all connections timed out, delete them all.
void P2PTransportChannel::HandleAllTimedOut() { void P2PTransportChannel::HandleAllTimedOut() {
for (Connection* connection : connections_) { for (Connection* connection : connections_) {

2
webrtc/p2p/base/p2ptransportchannel.h
View File

@ -178,8 +178,6 @@ class P2PTransportChannel : public TransportChannelImpl,
void SortConnections(); void SortConnections();
void SwitchBestConnectionTo(Connection* conn); void SwitchBestConnectionTo(Connection* conn);
void UpdateChannelState(); void UpdateChannelState();
void HandleWritable();
void HandleNotWritable();
void HandleAllTimedOut(); void HandleAllTimedOut();
void MaybeStopPortAllocatorSessions(); void MaybeStopPortAllocatorSessions();

3
webrtc/p2p/base/transportchannel.h
View File

@ -154,9 +154,6 @@ class TransportChannel : public sigslot::has_slots<> {
std::string ToString() const; std::string ToString() const;
protected: protected:
// TODO(honghaiz): Remove this once chromium's unit tests no longer call it.
void set_readable(bool readable) { set_receiving(readable); }
// Sets the writable state, signaling if necessary. // Sets the writable state, signaling if necessary.
void set_writable(bool writable); void set_writable(bool writable);