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

Use CancellationFlagListener to ensure that Accept exits.

Browse Source
This commit is contained in:
Vibhav Pant
2023-09-02 22:04:07 +05:30
parent be0379a3de
commit e95710907f
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/linux/bluetooth_bluez_profile.cc
+21 -3
View File
@@ -27,6 +27,7 @@
#include <sdbus-c++/Types.h>
#include "absl/synchronization/mutex.h"
#include "internal/platform/cancellation_flag_listener.h"
#include "internal/platform/implementation/linux/bluetooth_bluez_profile.h"
#include "internal/platform/implementation/linux/bluetooth_classic_device.h"
#include "internal/platform/implementation/linux/bluetooth_devices.h"
@@ -191,6 +192,14 @@ std::optional<sdbus::UnixFd> ProfileManager::GetServiceRecordFD(
auto profile = registered_services_[std::string(service_uuid)];
registered_service_uuids_mutex_.ReaderUnlock();
std::unique_ptr<CancellationFlagListener> cancel_listener;
if (cancellation_flag != nullptr)
cancel_listener = std::make_unique<CancellationFlagListener>(
cancellation_flag, [&profile]() {
profile->connections_lock_.Lock();
profile->connections_lock_.Unlock();
});
NEARBY_LOGS(VERBOSE) << __func__ << ": " << profile->getObjectPath()
<< ": Attempting to get a FD for service "
<< service_uuid << " on device " << mac_addr;
@@ -225,7 +234,7 @@ std::optional<sdbus::UnixFd> ProfileManager::GetServiceRecordFD(
// with its FD.
std::optional<std::pair<std::reference_wrapper<BluetoothDevice>, sdbus::UnixFd>>
ProfileManager::GetServiceRecordFD(absl::string_view service_uuid,
const CancellationFlag &cancellation_flag) {
CancellationFlag *cancellation_flag) {
if (!ProfileRegistered(service_uuid)) {
return std::nullopt;
}
@@ -238,14 +247,23 @@ ProfileManager::GetServiceRecordFD(absl::string_view service_uuid,
<< ": Attempting to get a FD for service "
<< service_uuid;
std::unique_ptr<CancellationFlagListener> cancel_listener;
if (cancellation_flag != nullptr)
cancel_listener = std::make_unique<CancellationFlagListener>(
cancellation_flag, [&profile]() {
profile->connections_lock_.Lock();
profile->connections_lock_.Unlock();
});
profile->connections_lock_.Lock();
auto cond = [profile, &cancellation_flag]() {
profile->connections_lock_.AssertReaderHeld();
return !profile->connections_.empty() || cancellation_flag.Cancelled();
return !profile->connections_.empty() ||
(cancellation_flag != nullptr && cancellation_flag->Cancelled());
};
profile->connections_lock_.Await(absl::Condition(&cond));
if (cancellation_flag.Cancelled()) {
if (cancellation_flag != nullptr && cancellation_flag->Cancelled()) {
NEARBY_LOGS(VERBOSE) << __func__
<< "Cancelled waiting for new connections on profile "
<< profile->getObjectPath();
internal/platform/implementation/linux/bluetooth_bluez_profile.h
+1 -1
View File
@@ -131,7 +131,7 @@ class ProfileManager final
std::optional<
std::pair<std::reference_wrapper<BluetoothDevice>, sdbus::UnixFd>>
GetServiceRecordFD(absl::string_view service_uuid,
const CancellationFlag &cancellation_flag)
CancellationFlag *cancellation_flag)
ABSL_LOCKS_EXCLUDED(registered_service_uuids_mutex_);
private:
internal/platform/implementation/linux/bluetooth_classic_server_socket.cc
+1 -1
View File
@@ -31,7 +31,7 @@ std::unique_ptr<api::BluetoothSocket> BluetoothServerSocket::Accept() {
<< ": accepting new connections for service uuid "
<< service_uuid_;
auto pair = profile_manager_.GetServiceRecordFD(service_uuid_, stopped_);
auto pair = profile_manager_.GetServiceRecordFD(service_uuid_, &stopped_);
if (!pair.has_value()) {
NEARBY_LOGS(ERROR) << __func__
<< "Failed to get a new connection for profile "