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

Adding DCHECKs and constness to DtlsIdentityStore.

Browse Source 
R=hbos@webrtc.org, hbos
BUG=

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

Cr-Commit-Position: refs/heads/master@{#9402}
This commit is contained in:
Tommi 2015-06-09 17:33:06 +02:00
parent 441f634731
commit 532caeae2d
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
talk/app/webrtc/dtlsidentitystore.cc
View File

@ -57,13 +57,14 @@ class DtlsIdentityStore::WorkerTask : public sigslot::has_slots<>,
explicit WorkerTask(DtlsIdentityStore* store) explicit WorkerTask(DtlsIdentityStore* store)
: signaling_thread_(rtc::Thread::Current()), store_(store) { : signaling_thread_(rtc::Thread::Current()), store_(store) {
store_->SignalDestroyed.connect(this, &WorkerTask::OnStoreDestroyed); store_->SignalDestroyed.connect(this, &WorkerTask::OnStoreDestroyed);
}; }
virtual ~WorkerTask() { DCHECK(rtc::Thread::Current() == signaling_thread_); } virtual ~WorkerTask() { DCHECK(rtc::Thread::Current() == signaling_thread_); }
void GenerateIdentity() { private:
void GenerateIdentity_w() {
rtc::scoped_ptr<rtc::SSLIdentity> identity( rtc::scoped_ptr<rtc::SSLIdentity> identity(
rtc::SSLIdentity::Generate(DtlsIdentityStore::kIdentityName)); rtc::SSLIdentity::Generate(DtlsIdentityStore::kIdentityName));
{ {
rtc::CritScope cs(&cs_); rtc::CritScope cs(&cs_);
@ -76,27 +77,29 @@ class DtlsIdentityStore::WorkerTask : public sigslot::has_slots<>,
void OnMessage(rtc::Message* msg) override { void OnMessage(rtc::Message* msg) override {
switch (msg->message_id) { switch (msg->message_id) {
case MSG_GENERATE_IDENTITY: case MSG_GENERATE_IDENTITY:
GenerateIdentity(); // This message always runs on the worker thread.
GenerateIdentity_w();
// Must delete |this|, owned by msg->pdata, on the signaling thread to // Must delete |this|, owned by msg->pdata, on the signaling thread to
// avoid races on disconnecting the signal. // avoid races on disconnecting the signal.
signaling_thread_->Post(this, MSG_DESTROY, msg->pdata); signaling_thread_->Post(this, MSG_DESTROY, msg->pdata);
break; break;
case MSG_DESTROY: case MSG_DESTROY:
DCHECK(rtc::Thread::Current() == signaling_thread_);
delete msg->pdata; delete msg->pdata;
// |this| has now been deleted. Don't touch member variables.
break; break;
default: default:
CHECK(false) << "Unexpected message type"; CHECK(false) << "Unexpected message type";
} }
} }
private:
void OnStoreDestroyed() { void OnStoreDestroyed() {
rtc::CritScope cs(&cs_); rtc::CritScope cs(&cs_);
store_ = NULL; store_ = NULL;
} }
rtc::Thread* signaling_thread_; rtc::Thread* const signaling_thread_;
rtc::CriticalSection cs_; rtc::CriticalSection cs_;
DtlsIdentityStore* store_; DtlsIdentityStore* store_;
}; };
@ -116,6 +119,7 @@ DtlsIdentityStore::~DtlsIdentityStore() {
} }
void DtlsIdentityStore::Initialize() { void DtlsIdentityStore::Initialize() {
DCHECK(rtc::Thread::Current() == signaling_thread_);
// Do not aggressively generate the free identity if the worker thread and the // Do not aggressively generate the free identity if the worker thread and the
// signaling thread are the same. // signaling thread are the same.
if (worker_thread_ != signaling_thread_) { if (worker_thread_ != signaling_thread_) {
@ -139,6 +143,7 @@ void DtlsIdentityStore::RequestIdentity(DTLSIdentityRequestObserver* observer) {
} }
void DtlsIdentityStore::OnMessage(rtc::Message* msg) { void DtlsIdentityStore::OnMessage(rtc::Message* msg) {
DCHECK(rtc::Thread::Current() == signaling_thread_);
switch (msg->message_id) { switch (msg->message_id) {
case MSG_GENERATE_IDENTITY_RESULT: { case MSG_GENERATE_IDENTITY_RESULT: {
rtc::scoped_ptr<IdentityResultMessageData> pdata( rtc::scoped_ptr<IdentityResultMessageData> pdata(
@ -156,10 +161,12 @@ void DtlsIdentityStore::OnMessage(rtc::Message* msg) {
} }
bool DtlsIdentityStore::HasFreeIdentityForTesting() const { bool DtlsIdentityStore::HasFreeIdentityForTesting() const {
return free_identity_.get(); DCHECK(rtc::Thread::Current() == signaling_thread_);
return free_identity_.get() != nullptr;
} }
void DtlsIdentityStore::GenerateIdentity() { void DtlsIdentityStore::GenerateIdentity() {
DCHECK(rtc::Thread::Current() == signaling_thread_);
pending_jobs_++; pending_jobs_++;
LOG(LS_VERBOSE) << "New DTLS identity generation is posted, " LOG(LS_VERBOSE) << "New DTLS identity generation is posted, "
<< "pending_identities=" << pending_jobs_; << "pending_identities=" << pending_jobs_;
@ -191,6 +198,7 @@ void DtlsIdentityStore::OnIdentityGenerated(
void DtlsIdentityStore::ReturnIdentity( void DtlsIdentityStore::ReturnIdentity(
rtc::scoped_ptr<rtc::SSLIdentity> identity) { rtc::scoped_ptr<rtc::SSLIdentity> identity) {
DCHECK(rtc::Thread::Current() == signaling_thread_);
DCHECK(!free_identity_.get()); DCHECK(!free_identity_.get());
DCHECK(!pending_observers_.empty()); DCHECK(!pending_observers_.empty());
@ -211,8 +219,8 @@ void DtlsIdentityStore::ReturnIdentity(
if (worker_thread_ != signaling_thread_ && if (worker_thread_ != signaling_thread_ &&
pending_observers_.empty() && pending_observers_.empty() &&
pending_jobs_ == 0) { pending_jobs_ == 0) {
// Generate a free identity in the background. // Generate a free identity in the background.
GenerateIdentity(); GenerateIdentity();
} }
} }

4
talk/app/webrtc/dtlsidentitystore.h
View File

@ -79,8 +79,8 @@ class DtlsIdentityStore : public rtc::MessageHandler {
void PostGenerateIdentityResult_w(rtc::scoped_ptr<rtc::SSLIdentity> identity); void PostGenerateIdentityResult_w(rtc::scoped_ptr<rtc::SSLIdentity> identity);
rtc::Thread* signaling_thread_; rtc::Thread* const signaling_thread_;
rtc::Thread* worker_thread_; rtc::Thread* const worker_thread_;
// These members should be accessed on the signaling thread only. // These members should be accessed on the signaling thread only.
int pending_jobs_; int pending_jobs_;