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

Unified Diff: webrtc/pc/channelmanager.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/pc/channelmanager.cc
diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
index 6800d83f60e9891cdc884d45992ba13f6b63b854..97cdce352bb36945594881b6830de0eb4305c4c5 100644
--- a/webrtc/pc/channelmanager.cc
+++ b/webrtc/pc/channelmanager.cc
@@ -81,8 +81,8 @@ ChannelManager::~ChannelManager() {
}
// The media engine needs to be deleted on the worker thread for thread safe
// destruction,
- worker_thread_->Invoke<void>(Bind(
- &ChannelManager::DestructorDeletes_w, this));
+ worker_thread_->Invoke<void>(
+ FROM_HERE, Bind(&ChannelManager::DestructorDeletes_w, this));
}
bool ChannelManager::SetVideoRtxEnabled(bool enable) {
@@ -150,11 +150,12 @@ bool ChannelManager::Init() {
if (!network_thread_->IsCurrent()) {
// Do not allow invoking calls to other threads on the network thread.
network_thread_->Invoke<bool>(
+ FROM_HERE,
rtc::Bind(&rtc::Thread::SetAllowBlockingCalls, network_thread_, false));
}
initialized_ = worker_thread_->Invoke<bool>(
- Bind(&ChannelManager::InitMediaEngine_w, this));
+ FROM_HERE, Bind(&ChannelManager::InitMediaEngine_w, this));
ASSERT(initialized_);
if (!initialized_) {
return false;
@@ -181,7 +182,8 @@ void ChannelManager::Terminate() {
if (!initialized_) {
return;
}
- worker_thread_->Invoke<void>(Bind(&ChannelManager::Terminate_w, this));
+ worker_thread_->Invoke<void>(FROM_HERE,
+ Bind(&ChannelManager::Terminate_w, this));
initialized_ = false;
}
@@ -208,6 +210,7 @@ VoiceChannel* ChannelManager::CreateVoiceChannel(
bool rtcp,
const AudioOptions& options) {
return worker_thread_->Invoke<VoiceChannel*>(
+ FROM_HERE,
Bind(&ChannelManager::CreateVoiceChannel_w, this, media_controller,
transport_controller, content_name, rtcp, options));
}
@@ -241,6 +244,7 @@ void ChannelManager::DestroyVoiceChannel(VoiceChannel* voice_channel) {
TRACE_EVENT0("webrtc", "ChannelManager::DestroyVoiceChannel");
if (voice_channel) {
worker_thread_->Invoke<void>(
+ FROM_HERE,
Bind(&ChannelManager::DestroyVoiceChannel_w, this, voice_channel));
}
}
@@ -266,6 +270,7 @@ VideoChannel* ChannelManager::CreateVideoChannel(
bool rtcp,
const VideoOptions& options) {
return worker_thread_->Invoke<VideoChannel*>(
+ FROM_HERE,
Bind(&ChannelManager::CreateVideoChannel_w, this, media_controller,
transport_controller, content_name, rtcp, options));
}
@@ -300,6 +305,7 @@ void ChannelManager::DestroyVideoChannel(VideoChannel* video_channel) {
TRACE_EVENT0("webrtc", "ChannelManager::DestroyVideoChannel");
if (video_channel) {
worker_thread_->Invoke<void>(
+ FROM_HERE,
Bind(&ChannelManager::DestroyVideoChannel_w, this, video_channel));
}
}
@@ -325,8 +331,8 @@ DataChannel* ChannelManager::CreateDataChannel(
bool rtcp,
DataChannelType channel_type) {
return worker_thread_->Invoke<DataChannel*>(
- Bind(&ChannelManager::CreateDataChannel_w, this, transport_controller,
- content_name, rtcp, channel_type));
+ FROM_HERE, Bind(&ChannelManager::CreateDataChannel_w, this,
+ transport_controller, content_name, rtcp, channel_type));
}
DataChannel* ChannelManager::CreateDataChannel_w(
@@ -360,6 +366,7 @@ void ChannelManager::DestroyDataChannel(DataChannel* data_channel) {
TRACE_EVENT0("webrtc", "ChannelManager::DestroyDataChannel");
if (data_channel) {
worker_thread_->Invoke<void>(
+ FROM_HERE,
Bind(&ChannelManager::DestroyDataChannel_w, this, data_channel));
}
}
@@ -383,6 +390,7 @@ bool ChannelManager::GetOutputVolume(int* level) {
return false;
}
return worker_thread_->Invoke<bool>(
+ FROM_HERE,
Bind(&MediaEngineInterface::GetOutputVolume, media_engine_.get(), level));
}
@@ -390,8 +398,8 @@ bool ChannelManager::SetOutputVolume(int level) {
bool ret = level >= 0 && level <= 255;
if (initialized_) {
ret &= worker_thread_->Invoke<bool>(
- Bind(&MediaEngineInterface::SetOutputVolume,
- media_engine_.get(), level));
+ FROM_HERE, Bind(&MediaEngineInterface::SetOutputVolume,
+ media_engine_.get(), level));
}
if (ret) {
@@ -404,23 +412,25 @@ bool ChannelManager::SetOutputVolume(int level) {
bool ChannelManager::StartAecDump(rtc::PlatformFile file,
int64_t max_size_bytes) {
- return worker_thread_->Invoke<bool>(Bind(&MediaEngineInterface::StartAecDump,
- media_engine_.get(), file,
- max_size_bytes));
+ return worker_thread_->Invoke<bool>(
+ FROM_HERE, Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(),
+ file, max_size_bytes));
}
void ChannelManager::StopAecDump() {
worker_thread_->Invoke<void>(
- Bind(&MediaEngineInterface::StopAecDump, media_engine_.get()));
+ FROM_HERE, Bind(&MediaEngineInterface::StopAecDump, media_engine_.get()));
}
bool ChannelManager::StartRtcEventLog(rtc::PlatformFile file) {
return worker_thread_->Invoke<bool>(
+ FROM_HERE,
Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file));
}
void ChannelManager::StopRtcEventLog() {
worker_thread_->Invoke<void>(
+ FROM_HERE,
Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get()));
}

Powered by Google App Engine
This is Rietveld 408576698