gfe-relnote: use QUIC_foo instead of ABSL_foo for mutex annotations in QUIC. Not flag protected. No behavior change.
This effectively reverts cr/266433516 and cr/266428140 (which were in turn reverts of cr/265958257 and cr/265940959) and then replaces the ABSL_ prefixes with QUIC_
PiperOrigin-RevId: 266445797
Change-Id: I369c0c929e5dc44a332635e695d526a2f91fa3f6
diff --git a/quic/test_tools/packet_dropping_test_writer.h b/quic/test_tools/packet_dropping_test_writer.h
index 92c8956..4b3e8af 100644
--- a/quic/test_tools/packet_dropping_test_writer.h
+++ b/quic/test_tools/packet_dropping_test_writer.h
@@ -161,14 +161,14 @@
uint64_t num_calls_to_write_;
QuicMutex config_mutex_;
- int32_t fake_packet_loss_percentage_ GUARDED_BY(config_mutex_);
- int32_t fake_drop_first_n_packets_ GUARDED_BY(config_mutex_);
- int32_t fake_blocked_socket_percentage_ GUARDED_BY(config_mutex_);
- int32_t fake_packet_reorder_percentage_ GUARDED_BY(config_mutex_);
- QuicTime::Delta fake_packet_delay_ GUARDED_BY(config_mutex_);
- QuicBandwidth fake_bandwidth_ GUARDED_BY(config_mutex_);
- QuicByteCount buffer_size_ GUARDED_BY(config_mutex_);
- int32_t num_consecutive_packet_lost_ GUARDED_BY(config_mutex_);
+ int32_t fake_packet_loss_percentage_ QUIC_GUARDED_BY(config_mutex_);
+ int32_t fake_drop_first_n_packets_ QUIC_GUARDED_BY(config_mutex_);
+ int32_t fake_blocked_socket_percentage_ QUIC_GUARDED_BY(config_mutex_);
+ int32_t fake_packet_reorder_percentage_ QUIC_GUARDED_BY(config_mutex_);
+ QuicTime::Delta fake_packet_delay_ QUIC_GUARDED_BY(config_mutex_);
+ QuicBandwidth fake_bandwidth_ QUIC_GUARDED_BY(config_mutex_);
+ QuicByteCount buffer_size_ QUIC_GUARDED_BY(config_mutex_);
+ int32_t num_consecutive_packet_lost_ QUIC_GUARDED_BY(config_mutex_);
};
} // namespace test
diff --git a/quic/test_tools/quic_crypto_server_config_peer.h b/quic/test_tools/quic_crypto_server_config_peer.h
index 3f5a984..baaa9b8 100644
--- a/quic/test_tools/quic_crypto_server_config_peer.h
+++ b/quic/test_tools/quic_crypto_server_config_peer.h
@@ -73,7 +73,7 @@
// ConfigsDebug returns a std::string that contains debugging information
// about the set of Configs loaded in |server_config_| and their status.
std::string ConfigsDebug()
- SHARED_LOCKS_REQUIRED(server_config_->configs_lock_);
+ QUIC_SHARED_LOCKS_REQUIRED(server_config_->configs_lock_);
void SelectNewPrimaryConfig(int seconds);
diff --git a/quic/test_tools/server_thread.h b/quic/test_tools/server_thread.h
index ffbce7f..d430297 100644
--- a/quic/test_tools/server_thread.h
+++ b/quic/test_tools/server_thread.h
@@ -73,13 +73,13 @@
std::unique_ptr<QuicServer> server_;
QuicSocketAddress address_;
mutable QuicMutex port_lock_;
- int port_ GUARDED_BY(port_lock_);
+ int port_ QUIC_GUARDED_BY(port_lock_);
bool initialized_;
QuicMutex scheduled_actions_lock_;
QuicDeque<std::function<void()>> scheduled_actions_
- GUARDED_BY(scheduled_actions_lock_);
+ QUIC_GUARDED_BY(scheduled_actions_lock_);
};
} // namespace test
