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

Unified Diff: webrtc/p2p/base/transportcontroller.cc

Issue 2019423006: Adding more detail to MessageQueue::Dispatch logging. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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/base/transportcontroller.cc
diff --git a/webrtc/p2p/base/transportcontroller.cc b/webrtc/p2p/base/transportcontroller.cc
index a961541dc3e9e4dd1ac2b1655d126f1b1eee7566..e5d1605c6d6e60faf8fb048af7653e0081d4cb4f 100644
--- a/webrtc/p2p/base/transportcontroller.cc
+++ b/webrtc/p2p/base/transportcontroller.cc
@@ -51,52 +51,55 @@ TransportController::TransportController(rtc::Thread* signaling_thread,
TransportController::~TransportController() {
network_thread_->Invoke<void>(
- rtc::Bind(&TransportController::DestroyAllTransports_n, this));
+ FROM_HERE, rtc::Bind(&TransportController::DestroyAllTransports_n, this));
signaling_thread_->Clear(this);
}
bool TransportController::SetSslMaxProtocolVersion(
rtc::SSLProtocolVersion version) {
- return network_thread_->Invoke<bool>(rtc::Bind(
- &TransportController::SetSslMaxProtocolVersion_n, this, version));
+ return network_thread_->Invoke<bool>(
+ FROM_HERE, rtc::Bind(&TransportController::SetSslMaxProtocolVersion_n,
+ this, version));
}
void TransportController::SetIceConfig(const IceConfig& config) {
network_thread_->Invoke<void>(
- rtc::Bind(&TransportController::SetIceConfig_n, this, config));
+ FROM_HERE, rtc::Bind(&TransportController::SetIceConfig_n, this, config));
}
void TransportController::SetIceRole(IceRole ice_role) {
network_thread_->Invoke<void>(
- rtc::Bind(&TransportController::SetIceRole_n, this, ice_role));
+ FROM_HERE, rtc::Bind(&TransportController::SetIceRole_n, this, ice_role));
}
bool TransportController::GetSslRole(const std::string& transport_name,
rtc::SSLRole* role) {
- return network_thread_->Invoke<bool>(rtc::Bind(
- &TransportController::GetSslRole_n, this, transport_name, role));
+ return network_thread_->Invoke<bool>(
+ FROM_HERE, rtc::Bind(&TransportController::GetSslRole_n, this,
+ transport_name, role));
}
bool TransportController::SetLocalCertificate(
const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) {
- return network_thread_->Invoke<bool>(rtc::Bind(
- &TransportController::SetLocalCertificate_n, this, certificate));
+ return network_thread_->Invoke<bool>(
+ FROM_HERE, rtc::Bind(&TransportController::SetLocalCertificate_n, this,
+ certificate));
}
bool TransportController::GetLocalCertificate(
const std::string& transport_name,
rtc::scoped_refptr<rtc::RTCCertificate>* certificate) {
return network_thread_->Invoke<bool>(
- rtc::Bind(&TransportController::GetLocalCertificate_n, this,
- transport_name, certificate));
+ FROM_HERE, rtc::Bind(&TransportController::GetLocalCertificate_n, this,
+ transport_name, certificate));
}
std::unique_ptr<rtc::SSLCertificate>
TransportController::GetRemoteSSLCertificate(
const std::string& transport_name) {
return network_thread_->Invoke<std::unique_ptr<rtc::SSLCertificate>>(
- rtc::Bind(&TransportController::GetRemoteSSLCertificate_n, this,
- transport_name));
+ FROM_HERE, rtc::Bind(&TransportController::GetRemoteSSLCertificate_n,
+ this, transport_name));
}
bool TransportController::SetLocalTransportDescription(
@@ -105,8 +108,8 @@ bool TransportController::SetLocalTransportDescription(
ContentAction action,
std::string* err) {
return network_thread_->Invoke<bool>(
- rtc::Bind(&TransportController::SetLocalTransportDescription_n, this,
- transport_name, tdesc, action, err));
+ FROM_HERE, rtc::Bind(&TransportController::SetLocalTransportDescription_n,
+ this, transport_name, tdesc, action, err));
}
bool TransportController::SetRemoteTransportDescription(
@@ -115,38 +118,42 @@ bool TransportController::SetRemoteTransportDescription(
ContentAction action,
std::string* err) {
return network_thread_->Invoke<bool>(
+ FROM_HERE,
rtc::Bind(&TransportController::SetRemoteTransportDescription_n, this,
transport_name, tdesc, action, err));
}
void TransportController::MaybeStartGathering() {
network_thread_->Invoke<void>(
- rtc::Bind(&TransportController::MaybeStartGathering_n, this));
+ FROM_HERE, rtc::Bind(&TransportController::MaybeStartGathering_n, this));
}
bool TransportController::AddRemoteCandidates(const std::string& transport_name,
const Candidates& candidates,
std::string* err) {
return network_thread_->Invoke<bool>(
- rtc::Bind(&TransportController::AddRemoteCandidates_n, this,
- transport_name, candidates, err));
+ FROM_HERE, rtc::Bind(&TransportController::AddRemoteCandidates_n, this,
+ transport_name, candidates, err));
}
bool TransportController::RemoveRemoteCandidates(const Candidates& candidates,
std::string* err) {
- return network_thread_->Invoke<bool>(rtc::Bind(
- &TransportController::RemoveRemoteCandidates_n, this, candidates, err));
+ return network_thread_->Invoke<bool>(
+ FROM_HERE, rtc::Bind(&TransportController::RemoveRemoteCandidates_n, this,
+ candidates, err));
}
bool TransportController::ReadyForRemoteCandidates(
const std::string& transport_name) {
- return network_thread_->Invoke<bool>(rtc::Bind(
- &TransportController::ReadyForRemoteCandidates_n, this, transport_name));
+ return network_thread_->Invoke<bool>(
+ FROM_HERE, rtc::Bind(&TransportController::ReadyForRemoteCandidates_n,
+ this, transport_name));
}
bool TransportController::GetStats(const std::string& transport_name,
TransportStats* stats) {
return network_thread_->Invoke<bool>(
+ FROM_HERE,
rtc::Bind(&TransportController::GetStats_n, this, transport_name, stats));
}
@@ -555,14 +562,14 @@ void TransportController::OnChannelCandidateGathered_n(
candidates.push_back(candidate);
CandidatesData* data =
new CandidatesData(channel->transport_name(), candidates);
- signaling_thread_->Post(this, MSG_CANDIDATESGATHERED, data);
+ signaling_thread_->Post(FROM_HERE, this, MSG_CANDIDATESGATHERED, data);
}
void TransportController::OnChannelCandidatesRemoved_n(
TransportChannelImpl* channel,
const Candidates& candidates) {
invoker_.AsyncInvoke<void>(
- signaling_thread_,
+ FROM_HERE, signaling_thread_,
rtc::Bind(&TransportController::OnChannelCandidatesRemoved, this,
candidates));
}
@@ -638,13 +645,13 @@ void TransportController::UpdateAggregateStates_n() {
if (connection_state_ != new_connection_state) {
connection_state_ = new_connection_state;
signaling_thread_->Post(
- this, MSG_ICECONNECTIONSTATE,
+ FROM_HERE, this, MSG_ICECONNECTIONSTATE,
new rtc::TypedMessageData<IceConnectionState>(new_connection_state));
}
if (receiving_ != any_receiving) {
receiving_ = any_receiving;
- signaling_thread_->Post(this, MSG_RECEIVING,
+ signaling_thread_->Post(FROM_HERE, this, MSG_RECEIVING,
new rtc::TypedMessageData<bool>(any_receiving));
}
@@ -656,7 +663,7 @@ void TransportController::UpdateAggregateStates_n() {
if (gathering_state_ != new_gathering_state) {
gathering_state_ = new_gathering_state;
signaling_thread_->Post(
- this, MSG_ICEGATHERINGSTATE,
+ FROM_HERE, this, MSG_ICEGATHERINGSTATE,
new rtc::TypedMessageData<IceGatheringState>(new_gathering_state));
}
}

Powered by Google App Engine
This is Rietveld 408576698