admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add thread annotations to PhysicalSocketServer members

Browse Source 
Bug: webrtc:11567
Change-Id: Icfaeedef968c9529e263ca8b359dcabde3eb8684
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175003
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31301}
This commit is contained in:
Niels Möller 2020-05-18 10:17:41 +02:00 committed by Commit Bot
parent 2c0bf26629
commit 8ce078de5d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtc_base/physical_socket_server.h
View File

@ -24,6 +24,7 @@
#include "rtc_base/net_helpers.h"
#include "rtc_base/socket_server.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/thread_annotations.h"
#if defined(WEBRTC_POSIX)
typedef int SOCKET;
@ -82,7 +83,7 @@ class RTC_EXPORT PhysicalSocketServer : public SocketServer {
private:
typedef std::set<Dispatcher*> DispatcherSet;
void AddRemovePendingDispatchers();
void AddRemovePendingDispatchers() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
#if defined(WEBRTC_POSIX)
bool WaitSelect(int cms, bool process_io);
@ -97,11 +98,11 @@ class RTC_EXPORT PhysicalSocketServer : public SocketServer {
const int epoll_fd_ = INVALID_SOCKET;
std::vector<struct epoll_event> epoll_events_;
#endif // WEBRTC_USE_EPOLL
DispatcherSet dispatchers_;
DispatcherSet pending_add_dispatchers_;
DispatcherSet pending_remove_dispatchers_;
bool processing_dispatchers_ = false;
Signaler* signal_wakeup_;
DispatcherSet dispatchers_ RTC_GUARDED_BY(crit_);
DispatcherSet pending_add_dispatchers_ RTC_GUARDED_BY(crit_);
DispatcherSet pending_remove_dispatchers_ RTC_GUARDED_BY(crit_);
bool processing_dispatchers_ RTC_GUARDED_BY(crit_) = false;
Signaler* signal_wakeup_; // Assigned in constructor only
CriticalSection crit_;
#if defined(WEBRTC_WIN)
const WSAEVENT socket_ev_;