From 8ce078de5d9e4f2c08d8152cc043b900a31693a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 18 May 2020 10:17:41 +0200 Subject: [PATCH] Add thread annotations to PhysicalSocketServer members Bug: webrtc:11567 Change-Id: Icfaeedef968c9529e263ca8b359dcabde3eb8684 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175003 Commit-Queue: Niels Moller Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#31301} --- rtc_base/physical_socket_server.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rtc_base/physical_socket_server.h b/rtc_base/physical_socket_server.h index e7985db7db..2f53d4d4fe 100644 --- a/rtc_base/physical_socket_server.h +++ b/rtc_base/physical_socket_server.h @@ -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 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 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_;