Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1030)

Unified Diff: webrtc/modules/congestion_controller/probe_controller.h

Issue 3010223002: Update thread annotiation macros in modules to use RTC_ prefix (Closed)
Patch Set: Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/congestion_controller/probe_controller.h
diff --git a/webrtc/modules/congestion_controller/probe_controller.h b/webrtc/modules/congestion_controller/probe_controller.h
index f47bdb0ca273f202dc826c5b3779a6ab6a539df5..7a23360d858c251d66122c743e208da60a73e6b6 100644
--- a/webrtc/modules/congestion_controller/probe_controller.h
+++ b/webrtc/modules/congestion_controller/probe_controller.h
@@ -58,32 +58,33 @@ class ProbeController {
kProbingComplete,
};
- void InitiateExponentialProbing() EXCLUSIVE_LOCKS_REQUIRED(critsect_);
+ void InitiateExponentialProbing() RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
void InitiateProbing(int64_t now_ms,
std::initializer_list<int64_t> bitrates_to_probe,
- bool probe_further) EXCLUSIVE_LOCKS_REQUIRED(critsect_);
+ bool probe_further)
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
rtc::CriticalSection critsect_;
PacedSender* const pacer_;
const Clock* const clock_;
- NetworkState network_state_ GUARDED_BY(critsect_);
- State state_ GUARDED_BY(critsect_);
- int64_t min_bitrate_to_probe_further_bps_ GUARDED_BY(critsect_);
- int64_t time_last_probing_initiated_ms_ GUARDED_BY(critsect_);
- int64_t estimated_bitrate_bps_ GUARDED_BY(critsect_);
- int64_t start_bitrate_bps_ GUARDED_BY(critsect_);
- int64_t max_bitrate_bps_ GUARDED_BY(critsect_);
- int64_t last_bwe_drop_probing_time_ms_ GUARDED_BY(critsect_);
- rtc::Optional<int64_t> alr_end_time_ms_ GUARDED_BY(critsect_);
- bool enable_periodic_alr_probing_ GUARDED_BY(critsect_);
- int64_t time_of_last_large_drop_ms_ GUARDED_BY(critsect_);
- int64_t bitrate_before_last_large_drop_bps_ GUARDED_BY(critsect_);
-
- bool in_rapid_recovery_experiment_ GUARDED_BY(critsect_);
+ NetworkState network_state_ RTC_GUARDED_BY(critsect_);
+ State state_ RTC_GUARDED_BY(critsect_);
+ int64_t min_bitrate_to_probe_further_bps_ RTC_GUARDED_BY(critsect_);
+ int64_t time_last_probing_initiated_ms_ RTC_GUARDED_BY(critsect_);
+ int64_t estimated_bitrate_bps_ RTC_GUARDED_BY(critsect_);
+ int64_t start_bitrate_bps_ RTC_GUARDED_BY(critsect_);
+ int64_t max_bitrate_bps_ RTC_GUARDED_BY(critsect_);
+ int64_t last_bwe_drop_probing_time_ms_ RTC_GUARDED_BY(critsect_);
+ rtc::Optional<int64_t> alr_end_time_ms_ RTC_GUARDED_BY(critsect_);
+ bool enable_periodic_alr_probing_ RTC_GUARDED_BY(critsect_);
+ int64_t time_of_last_large_drop_ms_ RTC_GUARDED_BY(critsect_);
+ int64_t bitrate_before_last_large_drop_bps_ RTC_GUARDED_BY(critsect_);
+
+ bool in_rapid_recovery_experiment_ RTC_GUARDED_BY(critsect_);
// For WebRTC.BWE.MidCallProbing.* metric.
- bool mid_call_probing_waiting_for_result_ GUARDED_BY(&critsect_);
- int64_t mid_call_probing_bitrate_bps_ GUARDED_BY(&critsect_);
- int64_t mid_call_probing_succcess_threshold_ GUARDED_BY(&critsect_);
+ bool mid_call_probing_waiting_for_result_ RTC_GUARDED_BY(&critsect_);
+ int64_t mid_call_probing_bitrate_bps_ RTC_GUARDED_BY(&critsect_);
+ int64_t mid_call_probing_succcess_threshold_ RTC_GUARDED_BY(&critsect_);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ProbeController);
};

Powered by Google App Engine
This is Rietveld 408576698