Skip to content

Fixed LICENSE install and self-deadlock in callbacks #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreaRicchi merged 2 commits into from
Jul 2, 2026
Merged

Fixed LICENSE install and self-deadlock in callbacks #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a14abe9
build: use CMAKE_CURRENT_SOURCE_DIR for LICENSE install
AndreaRicchi Jul 1, 2026
a32c5e7
gconnman_manager: Do not hold mtx_ while invoking changed callbacks
AndreaRicchi Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ install(
NAMESPACE Amarula::
COMPONENT ${PROJECT_NAME}-dev)
install(
FILES ${CMAKE_SOURCE_DIR}/LICENSE
FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
DESTINATION ${CMAKE_INSTALL_DATADIR}/Amarula/${PROJECT_NAME}
COMPONENT ${PROJECT_NAME})
include(CMakePackageConfigHelpers)
Expand Down
86 changes: 58 additions & 28 deletions src/dbus/gconnman_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ void Manager::process_services_changed(
}
}
services_ = new_order_of_services;
services_changed_cb_(services_);
}

void Manager::setup_agent() {
Expand Down Expand Up @@ -261,16 +260,29 @@ void Manager::get_proxies_cb(GObject* proxy, GAsyncResult* res,
if (success) {
proxies = self->template arrays_to_proxies<ProxyType>(out_properties);
g_variant_unref(out_properties);
std::lock_guard<std::mutex> const lock(self->mtx_);
if constexpr (std::is_same_v<ProxyType, Service>) {
self->services_ = proxies;
if (!self->services_.empty()) {
self->services_changed_cb_(self->services_);
OnServListChangedCallback callback;
{
std::lock_guard<std::mutex> const lock(self->mtx_);
self->services_ = proxies;
if (!self->services_.empty()) {
callback = self->services_changed_cb_;
}
}
if (callback) {
callback(proxies);
}
} else {
self->technologies_ = proxies;
if (!self->technologies_.empty()) {
self->technologies_changed_cb_(self->technologies_);
OnTechListChangedCallback callback;
{
std::lock_guard<std::mutex> const lock(self->mtx_);
self->technologies_ = proxies;
if (!self->technologies_.empty()) {
callback = self->technologies_changed_cb_;
}
}
if (callback) {
callback(proxies);
}
}

Expand Down Expand Up @@ -314,25 +326,34 @@ void Manager::on_technology_added_removed_cb(GDBusProxy* /*proxy*/,
GVariant* parameters,
gpointer user_data) {
auto* self = static_cast<Manager*>(user_data);
std::lock_guard<std::mutex> const lock(self->mtx_);
if (g_strcmp0(signal_name, "g-signal::TechnologyAdded") == 0U) {
const auto technology =
self->template dict_to_proxy<Technology>(parameters);
self->technologies_.push_back(technology);

} else if (g_strcmp0(signal_name, "g-signal::TechnologyRemoved") == 0U) {
const auto object_path =
std::string(g_variant_get_string(parameters, nullptr));

self->technologies_.erase(
std::remove_if(self->technologies_.begin(),
self->technologies_.end(),
[&object_path](const auto& technology) {
return technology->objPath() == object_path;
}),
self->technologies_.end());
Manager::ProxyList<Technology> updated_technologies;
OnTechListChangedCallback callback;
{
std::lock_guard<std::mutex> const lock(self->mtx_);
if (g_strcmp0(signal_name, "g-signal::TechnologyAdded") == 0U) {
const auto technology =
self->template dict_to_proxy<Technology>(parameters);
self->technologies_.push_back(technology);

} else if (g_strcmp0(signal_name, "g-signal::TechnologyRemoved") ==
0U) {
const auto object_path =
std::string(g_variant_get_string(parameters, nullptr));
Comment thread
EddyTheCo marked this conversation as resolved.

self->technologies_.erase(
std::remove_if(self->technologies_.begin(),
self->technologies_.end(),
[&object_path](const auto& technology) {
return technology->objPath() == object_path;
}),
self->technologies_.end());
}
updated_technologies = self->technologies_;
callback = self->technologies_changed_cb_;
}
if (callback) {
callback(updated_technologies);
}
self->technologies_changed_cb_(self->technologies_);
}

void Manager::on_services_changed_cb(GDBusProxy* /*proxy*/,
Expand Down Expand Up @@ -371,8 +392,17 @@ void Manager::on_services_changed_cb(GDBusProxy* /*proxy*/,
}
g_variant_unref(removed);

std::lock_guard<std::mutex> const lock(self->mtx_);
self->process_services_changed(services_removed, services_changed);
Manager::ProxyList<Service> updated_services;
OnServListChangedCallback callback;
{
std::lock_guard<std::mutex> const lock(self->mtx_);
self->process_services_changed(services_removed, services_changed);
updated_services = self->services_;
callback = self->services_changed_cb_;
}
if (callback) {
callback(updated_services);
}
}

void Manager::onTechnologiesChanged(OnTechListChangedCallback callback) {
Expand Down
Loading