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

Replace some RecursiveCriticalSection with Mutex, in PhysicalSocketServer.

Browse Source 
The one remaining RecursiveCriticalSection likely needs a bit more
care.

Bug: webrtc:11567
Change-Id: Ie81085969197bed03ac8e2d269b58653b86095e0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/206468
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Markus Handell <handellm@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33206}
This commit is contained in:
Niels Möller
2021-02-09 14:44:48 +01:00
committed by Commit Bot
parent c3a486c41e
commit 6d17602e70
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtc_base/physical_socket_server.h
View File

@ -25,6 +25,7 @@
#include "rtc_base/async_resolver_interface.h"
#include "rtc_base/deprecated/recursive_critical_section.h"
#include "rtc_base/socket_server.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/thread_annotations.h"
@ -203,8 +204,8 @@ class PhysicalSocket : public AsyncSocket, public sigslot::has_slots<> {
SOCKET s_;
bool udp_;
int family_ = 0;
RecursiveCriticalSection crit_;
int error_ RTC_GUARDED_BY(crit_);
mutable webrtc::Mutex mutex_;
int error_ RTC_GUARDED_BY(mutex_);
ConnState state_;
AsyncResolver* resolver_;