webrtc/modules/congestion_controller/include/send_side_congestion_controller.h - Issue 3010223002: Update thread annotiation macros in modules to use RTC_ prefix

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/congestion_controller/include/send_side_congestion_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

« no previous file with comments | « webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h ('k') | webrtc/modules/congestion_controller/probe_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/congestion_controller/include/send_side_congestion_controller.h

diff --git a/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h b/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h

index 490711f54db3ed668b82cb967037eae63ae9e2c4..b85b5111a47583f65011fcf03fb86b8e27165f24 100644

--- a/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h

+++ b/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h

@@ -126,7 +126,7 @@ class SendSideCongestionController : public CallStatsObserver,

void LimitOutstandingBytes(size_t num_outstanding_bytes);

const Clock* const clock_;

rtc::CriticalSection observer_lock_;

- Observer* observer_ GUARDED_BY(observer_lock_);

+ Observer* observer_ RTC_GUARDED_BY(observer_lock_);

RtcEventLog* const event_log_;

std::unique_ptr<PacedSender> owned_pacer_;

PacedSender* pacer_;

@@ -136,18 +136,18 @@ class SendSideCongestionController : public CallStatsObserver,

const std::unique_ptr<RateLimiter> retransmission_rate_limiter_;

TransportFeedbackAdapter transport_feedback_adapter_;

rtc::CriticalSection network_state_lock_;

- uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_);

- uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_);

- int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_);

- NetworkState network_state_ GUARDED_BY(network_state_lock_);

- bool pause_pacer_ GUARDED_BY(network_state_lock_);

+ uint32_t last_reported_bitrate_bps_ RTC_GUARDED_BY(network_state_lock_);

+ uint8_t last_reported_fraction_loss_ RTC_GUARDED_BY(network_state_lock_);

+ int64_t last_reported_rtt_ RTC_GUARDED_BY(network_state_lock_);

+ NetworkState network_state_ RTC_GUARDED_BY(network_state_lock_);

+ bool pause_pacer_ RTC_GUARDED_BY(network_state_lock_);

// Duplicate the pacer paused state to avoid grabbing a lock when

// pausing the pacer. This can be removed when we move this class

// over to the task queue.

bool pacer_paused_;

rtc::CriticalSection bwe_lock_;

- int min_bitrate_bps_ GUARDED_BY(bwe_lock_);

- std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_);

+ int min_bitrate_bps_ RTC_GUARDED_BY(bwe_lock_);

+ std::unique_ptr<DelayBasedBwe> delay_based_bwe_ RTC_GUARDED_BY(bwe_lock_);

bool in_cwnd_experiment_;

int64_t accepted_queue_ms_;

bool was_in_alr_;