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

Add support for request cancellation to GetServiceRecordFD.

Browse Source
This commit is contained in:
Vibhav Pant
2023-09-01 19:59:38 +05:30
parent 3a22a87074
commit 14b12e9afc
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/linux/bluetooth_bluez_profile.cc
+20 -11
View File
@@ -196,19 +196,20 @@ std::optional<sdbus::UnixFd> ProfileManager::GetServiceRecordFD(
<< service_uuid << " on device " << mac_addr;
auto cond = [mac_addr, profile, cancellation_flag]() {
profile->connections_lock_.AssertReaderHeld();
return profile->connections_.count(mac_addr) != 0 ||
(cancellation_flag != nullptr && cancellation_flag->Cancelled());
};
profile->connections_lock_.Lock();
profile->connections_lock_.Await(absl::Condition(&cond));
absl::MutexLock connections_lock(&profile->connections_lock_,
absl::Condition(&cond));
if (cancellation_flag != nullptr && cancellation_flag->Cancelled()) {
NEARBY_LOGS(WARNING)
NEARBY_LOGS(VERBOSE)
<< __func__ << ": " << profile->getObjectPath() << ": "
<< remote_device.GetMacAddress()
<< ": Cancelled waiting for a service record for profile "
<< ": Cancelled waiting for a new connection on profile "
<< service_uuid;
profile->connections_lock_.Unlock();
return std::nullopt;
}
@@ -216,15 +217,15 @@ std::optional<sdbus::UnixFd> ProfileManager::GetServiceRecordFD(
profile->connections_[mac_addr].pop_back();
if (profile->connections_[mac_addr].empty())
profile->connections_.erase(mac_addr);
profile->connections_lock_.Unlock();
return fd;
return std::move(fd);
}
// Listen for a connected profile on any device, returning the connected device
// with its FD.
std::optional<std::pair<std::reference_wrapper<BluetoothDevice>, sdbus::UnixFd>>
ProfileManager::GetServiceRecordFD(absl::string_view service_uuid) {
ProfileManager::GetServiceRecordFD(absl::string_view service_uuid,
const CancellationFlag &cancellation_flag) {
if (!ProfileRegistered(service_uuid)) {
return std::nullopt;
}
@@ -238,12 +239,20 @@ ProfileManager::GetServiceRecordFD(absl::string_view service_uuid) {
<< service_uuid;
profile->connections_lock_.Lock();
auto cond = [profile]() {
auto cond = [profile, &cancellation_flag]() {
profile->connections_lock_.AssertReaderHeld();
return !profile->connections_.empty();
return !profile->connections_.empty() || cancellation_flag.Cancelled();
};
profile->connections_lock_.Await(absl::Condition(&cond));
if (cancellation_flag.Cancelled()) {
NEARBY_LOGS(VERBOSE) << __func__
<< "Cancelled waiting for new connections on profile "
<< profile->getObjectPath();
profile->connections_lock_.Unlock();
return std::nullopt;
}
auto it = profile->connections_.begin();
auto mac_addr = it->first;
auto [fd, properties] = it->second.back();
@@ -258,7 +267,7 @@ ProfileManager::GetServiceRecordFD(absl::string_view service_uuid) {
return std::nullopt;
}
return std::pair(*maybe_device, fd);
return std::pair(*maybe_device, std::move(fd));
}
} // namespace linux
internal/platform/implementation/linux/bluetooth_bluez_profile.h
+4 -3
View File
@@ -53,9 +53,9 @@ class Profile final
Profile(Profile &&) = delete;
Profile &operator=(const Profile &) = delete;
Profile &operator=(Profile &&) = delete;
Profile(sdbus::IConnection &system_bus, absl::string_view profile_object_path,
Profile(sdbus::IConnection &system_bus, sdbus::ObjectPath profile_object_path,
BluetoothDevices &devices)
: AdaptorInterfaces(system_bus, std::string(profile_object_path)),
: AdaptorInterfaces(system_bus, std::move(profile_object_path)),
released_(false),
devices_(devices) {
registerAdaptor();
@@ -130,7 +130,8 @@ class ProfileManager final
ABSL_LOCKS_EXCLUDED(registered_service_uuids_mutex_);
std::optional<
std::pair<std::reference_wrapper<BluetoothDevice>, sdbus::UnixFd>>
GetServiceRecordFD(absl::string_view service_uuid)
GetServiceRecordFD(absl::string_view service_uuid,
const CancellationFlag &cancellation_flag)
ABSL_LOCKS_EXCLUDED(registered_service_uuids_mutex_);
private: