mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00

WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
162 lines
4.2 KiB
C++
162 lines
4.2 KiB
C++
/*
|
|
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "rtc_base/signal_thread.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/location.h"
|
|
#include "rtc_base/null_socket_server.h"
|
|
#include "rtc_base/socket_server.h"
|
|
|
|
namespace rtc {
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// SignalThread
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
SignalThread::SignalThread()
|
|
: main_(Thread::Current()), worker_(this), state_(kInit), refcount_(1) {
|
|
main_->SignalQueueDestroyed.connect(this,
|
|
&SignalThread::OnMainThreadDestroyed);
|
|
worker_.SetName("SignalThread", this);
|
|
}
|
|
|
|
SignalThread::~SignalThread() {
|
|
RTC_DCHECK(refcount_ == 0);
|
|
}
|
|
|
|
bool SignalThread::SetName(const std::string& name, const void* obj) {
|
|
EnterExit ee(this);
|
|
RTC_DCHECK(main_->IsCurrent());
|
|
RTC_DCHECK(kInit == state_);
|
|
return worker_.SetName(name, obj);
|
|
}
|
|
|
|
void SignalThread::Start() {
|
|
EnterExit ee(this);
|
|
RTC_DCHECK(main_->IsCurrent());
|
|
if (kInit == state_ || kComplete == state_) {
|
|
state_ = kRunning;
|
|
OnWorkStart();
|
|
worker_.Start();
|
|
} else {
|
|
RTC_NOTREACHED();
|
|
}
|
|
}
|
|
|
|
void SignalThread::Destroy(bool wait) {
|
|
EnterExit ee(this);
|
|
RTC_DCHECK(main_->IsCurrent());
|
|
if ((kInit == state_) || (kComplete == state_)) {
|
|
refcount_--;
|
|
} else if (kRunning == state_ || kReleasing == state_) {
|
|
state_ = kStopping;
|
|
// OnWorkStop() must follow Quit(), so that when the thread wakes up due to
|
|
// OWS(), ContinueWork() will return false.
|
|
worker_.Quit();
|
|
OnWorkStop();
|
|
if (wait) {
|
|
// Release the thread's lock so that it can return from ::Run.
|
|
cs_.Leave();
|
|
worker_.Stop();
|
|
cs_.Enter();
|
|
refcount_--;
|
|
}
|
|
} else {
|
|
RTC_NOTREACHED();
|
|
}
|
|
}
|
|
|
|
void SignalThread::Release() {
|
|
EnterExit ee(this);
|
|
RTC_DCHECK(main_->IsCurrent());
|
|
if (kComplete == state_) {
|
|
refcount_--;
|
|
} else if (kRunning == state_) {
|
|
state_ = kReleasing;
|
|
} else {
|
|
// if (kInit == state_) use Destroy()
|
|
RTC_NOTREACHED();
|
|
}
|
|
}
|
|
|
|
bool SignalThread::ContinueWork() {
|
|
EnterExit ee(this);
|
|
RTC_DCHECK(worker_.IsCurrent());
|
|
return worker_.ProcessMessages(0);
|
|
}
|
|
|
|
void SignalThread::OnMessage(Message* msg) {
|
|
EnterExit ee(this);
|
|
if (ST_MSG_WORKER_DONE == msg->message_id) {
|
|
RTC_DCHECK(main_->IsCurrent());
|
|
OnWorkDone();
|
|
bool do_delete = false;
|
|
if (kRunning == state_) {
|
|
state_ = kComplete;
|
|
} else {
|
|
do_delete = true;
|
|
}
|
|
if (kStopping != state_) {
|
|
// Before signaling that the work is done, make sure that the worker
|
|
// thread actually is done. We got here because DoWork() finished and
|
|
// Run() posted the ST_MSG_WORKER_DONE message. This means the worker
|
|
// thread is about to go away anyway, but sometimes it doesn't actually
|
|
// finish before SignalWorkDone is processed, and for a reusable
|
|
// SignalThread this makes an assert in thread.cc fire.
|
|
//
|
|
// Calling Stop() on the worker ensures that the OS thread that underlies
|
|
// the worker will finish, and will be set to null, enabling us to call
|
|
// Start() again.
|
|
worker_.Stop();
|
|
SignalWorkDone(this);
|
|
}
|
|
if (do_delete) {
|
|
refcount_--;
|
|
}
|
|
}
|
|
}
|
|
|
|
SignalThread::Worker::Worker(SignalThread* parent)
|
|
: Thread(std::make_unique<NullSocketServer>(), /*do_init=*/false),
|
|
parent_(parent) {
|
|
DoInit();
|
|
}
|
|
|
|
SignalThread::Worker::~Worker() {
|
|
Stop();
|
|
}
|
|
|
|
void SignalThread::Worker::Run() {
|
|
parent_->Run();
|
|
}
|
|
|
|
void SignalThread::Run() {
|
|
DoWork();
|
|
{
|
|
EnterExit ee(this);
|
|
if (main_) {
|
|
main_->Post(RTC_FROM_HERE, this, ST_MSG_WORKER_DONE);
|
|
}
|
|
}
|
|
}
|
|
|
|
void SignalThread::OnMainThreadDestroyed() {
|
|
EnterExit ee(this);
|
|
main_ = nullptr;
|
|
}
|
|
|
|
bool SignalThread::Worker::IsProcessingMessagesForTesting() {
|
|
return false;
|
|
}
|
|
|
|
} // namespace rtc
|