zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate rtc_tools/, sdk/, and system_wrappers/ to webrtc::Mutex.

Browse Source 
Bug: webrtc:11567
Change-Id: Ia85cf457ac16ebec0a70d319506415e4dec46f30
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178903
Reviewed-by: Magnus Flodman <mflodman@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31693}
This commit is contained in:
Markus Handell
2020-07-08 23:04:37 +02:00
committed by Commit Bot
parent e6f3897945
commit 85585f4a52
13 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
View File

@ -16,12 +16,12 @@
#include <memory>
#include <vector>
#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/string_utils.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/system/inline.h"
#include "system_wrappers/include/sleep.h"
#include "test/gtest.h"
@ -118,15 +118,15 @@ class RtcEventDeadlock : public DeadlockInterface {
class RtcCriticalSectionDeadlock : public DeadlockInterface {
public:
RtcCriticalSectionDeadlock()
: critscope_(std::make_unique<rtc::CritScope>(&crit_)) {}
: mutex_lock_(std::make_unique<MutexLock>(&mutex_)) {}
private:
void Deadlock() override { rtc::CritScope lock(&crit_); }
void Deadlock() override { MutexLock lock(&mutex_); }
void Release() override { critscope_.reset(); }
void Release() override { mutex_lock_.reset(); }
rtc::CriticalSection crit_;
std::unique_ptr<rtc::CritScope> critscope_;
Mutex mutex_;
std::unique_ptr<MutexLock> mutex_lock_;
};
class SpinDeadlock : public DeadlockInterface {