generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PeerConnection(Java): auto-WrapCurrentThread() when creating PeerConnectionFactory.

Browse Source 
Various pieces of talk/ assume that the current Thread is ThreadManager'd
without checking this, so unconditionally wrap the caller's thread in case it
was created by Java code unbeknownst to ThreadManager.

BUG=2947
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/9419004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6154 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2014-05-14 17:33:32 +00:00
parent a70dff4427
commit 2c98af7935
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -1928,6 +1928,12 @@ class OwnedFactoryAndThreads {
JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)( JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)(
JNIEnv* jni, jclass) { JNIEnv* jni, jclass) {
// talk/ assumes pretty widely that the current Thread is ThreadManager'd, but
// ThreadManager only WrapCurrentThread()s the thread where it is first
// created. Since the semantics around when auto-wrapping happens in
// talk/base/ are convoluted, we simply wrap here to avoid having to think
// about ramifications of auto-wrapping there.
talk_base::ThreadManager::Instance()->WrapCurrentThread();
webrtc::Trace::CreateTrace(); webrtc::Trace::CreateTrace();
Thread* worker_thread = new Thread(); Thread* worker_thread = new Thread();
worker_thread->SetName("worker_thread", NULL); worker_thread->SetName("worker_thread", NULL);