3c5d2b43ec
Update Thread documentation, fix all subclasses that had a problem.
This is to avoid a data racing between the destructor modifying the vtable, and
Thread::PreRun calling virtual method Run at the same time.
For example:
[ RUN ] FileMediaEngineTest.TestGetCapabilities
==================
WARNING: ThreadSanitizer: data race on vptr (ctor/dtor vs virtual call) (pid=2967)
Read of size 8 at 0x7d480000bd00 by thread T1:
#0 talk_base::Thread::PreRun(void*) /mnt/data/b/build/slave/Linux_Tsan_v2/build/src/out/Release/../../talk/base/thread.cc:353 (libjingle_media_unittest+0x000000234da8)
Previous write of size 8 at 0x7d480000bd00 by main thread:
#0 talk_base::Thread::~Thread() /mnt/data/b/build/slave/Linux_Tsan_v2/build/src/out/Release/../../talk/base/thread.cc:158 (libjingle_media_unittest+0x00000023478c)
#1 ~RtpSenderReceiver /mnt/data/b/build/slave/Linux_Tsan_v2/build/src/out/Release/../../talk/media/base/filemediaengine.cc:122 (libjingle_media_unittest+0x0000001b551f)
...
RISK=P2
TESTED=try bots and tsan
BUG=2078,2080
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2428004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4999 4adac7df-926f-26a2-2b94-8c16560cd09d
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2004--2005, Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "talk/xmpp/xmppthread.h"
|
|
|
|
#include "talk/xmpp/xmppauth.h"
|
|
#include "talk/xmpp/xmppclientsettings.h"
|
|
|
|
namespace buzz {
|
|
namespace {
|
|
|
|
const uint32 MSG_LOGIN = 1;
|
|
const uint32 MSG_DISCONNECT = 2;
|
|
|
|
struct LoginData: public talk_base::MessageData {
|
|
LoginData(const buzz::XmppClientSettings& s) : xcs(s) {}
|
|
virtual ~LoginData() {}
|
|
|
|
buzz::XmppClientSettings xcs;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
XmppThread::XmppThread() {
|
|
pump_ = new buzz::XmppPump(this);
|
|
}
|
|
|
|
XmppThread::~XmppThread() {
|
|
Stop();
|
|
delete pump_;
|
|
}
|
|
|
|
void XmppThread::ProcessMessages(int cms) {
|
|
talk_base::Thread::ProcessMessages(cms);
|
|
}
|
|
|
|
void XmppThread::Login(const buzz::XmppClientSettings& xcs) {
|
|
Post(this, MSG_LOGIN, new LoginData(xcs));
|
|
}
|
|
|
|
void XmppThread::Disconnect() {
|
|
Post(this, MSG_DISCONNECT);
|
|
}
|
|
|
|
void XmppThread::OnStateChange(buzz::XmppEngine::State state) {
|
|
}
|
|
|
|
void XmppThread::OnMessage(talk_base::Message* pmsg) {
|
|
if (pmsg->message_id == MSG_LOGIN) {
|
|
ASSERT(pmsg->pdata != NULL);
|
|
LoginData* data = reinterpret_cast<LoginData*>(pmsg->pdata);
|
|
pump_->DoLogin(data->xcs, new XmppSocket(buzz::TLS_DISABLED),
|
|
new XmppAuth());
|
|
delete data;
|
|
} else if (pmsg->message_id == MSG_DISCONNECT) {
|
|
pump_->DoDisconnect();
|
|
} else {
|
|
ASSERT(false);
|
|
}
|
|
}
|
|
|
|
} // namespace buzz
|