TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix TSAN errors.

Browse Source 
PiperOrigin-RevId: 627186253
This commit is contained in:
Francis Tsui
2024-04-22 16:12:55 -07:00
committed by Copybara-Service
parent ef924e5003
commit f1631fafe1
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/fake_nearby_connection.cc
+6 -2
View File
@@ -50,8 +50,11 @@ void FakeNearbyConnection::Close() {
NL_DCHECK(!closed_);
closed_ = true;
if (disconnect_listener_) {
std::move(disconnect_listener_)();
{
absl::MutexLock lock(&disconnect_mutex_);
if (disconnect_listener_) {
std::move(disconnect_listener_)();
}
}
absl::MutexLock lock(&read_mutex_);
@@ -66,6 +69,7 @@ void FakeNearbyConnection::Close() {
void FakeNearbyConnection::SetDisconnectionListener(
std::function<void()> listener) {
NL_DCHECK(!closed_);
absl::MutexLock lock(&disconnect_mutex_);
disconnect_listener_ = std::move(listener);
}
sharing/fake_nearby_connection.h
+2 -1
View File
@@ -60,7 +60,8 @@ class FakeNearbyConnection : public NearbyConnection {
std::queue<std::vector<uint8_t>> read_data_ ABSL_GUARDED_BY(read_mutex_);
absl::Mutex write_mutex_;
std::queue<std::vector<uint8_t>> write_data_ ABSL_GUARDED_BY(write_mutex_);
std::function<void()> disconnect_listener_;
absl::Mutex disconnect_mutex_;
std::function<void()> disconnect_listener_ ABSL_GUARDED_BY(disconnect_mutex_);
};
} // namespace sharing