Skip to content

Callbacks in worker thread#25

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
EddyTheCo merged 14 commits into from
Apr 13, 2026
Merged

Callbacks in worker thread #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c74e34
Fix clang warnings
EddyTheCo Jan 1, 2026
ccf105e
CMakeLists: Remove unused includes
EddyTheCo Apr 1, 2026
6718a47
gconnman_serv_test: Wired can not be removed
EddyTheCo Apr 1, 2026
0cc47de
.gitignore: Ignore CMakeLists.txt.user
EddyTheCo Mar 18, 2026
0cc9899
Proxy: remove passing proxy member in methods
EddyTheCo Jan 7, 2026
09acff0
gproxy.hpp: Reuse callMethod
EddyTheCo Mar 20, 2026
b5f2caf
tests: Add check thread id of callbacks
EddyTheCo Mar 20, 2026
6c6fdd8
gdbus: Add thread default context
EddyTheCo Mar 20, 2026
4c2c5d0
gproxy: use g_main_context_invoke in proxy callMethod
EddyTheCo Mar 18, 2026
c194530
gdbus: Expose stop method
EddyTheCo Apr 13, 2026
f9ca6ad
connman: Make explicit the destruction order
EddyTheCo Apr 13, 2026
6cf4b20
gproxy.hpp: Initialize the glib proxy on worker thread
EddyTheCo Apr 1, 2026
108d847
gconnman_manager.cpp: Connect signals in worker thread
EddyTheCo Apr 1, 2026
2d686e2
gconnman_agent: Register object in worker thread
EddyTheCo Apr 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
add_subdirectory(tests)
endif(BUILD_TESTS)
if(BUILD_EXAMPLES)
include(CTest)
add_subdirectory(examples)
endif(BUILD_EXAMPLES)
if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
)
set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
include(CPack)
include(CPackIFW)
cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down
29 changes: 14 additions & 15 deletions examples/connmanctl.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
bool connecting = false;
Connman connman;
const auto manager = connman.manager();
manager->onRequestInputPassphrase([&](auto service) -> auto {
manager->onRequestInputPassphrase([&](const auto& service) -> auto {
const auto name = service->properties().getName();

std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
}
}
// Trim whitespace
line.erase(line.begin(),
std::find_if(line.begin(), line.end(), [](int character) {
line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
return std::isspace(character) == 0;
}));
line.erase(std::find_if(line.rbegin(), line.rend(),
[](int character) {
return std::isspace(character) == 0;
})
line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
.base(),
line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
<< service->objPath() << "\n";
}
} else {
auto iterator = std::find_if(
services.begin(), services.end(),
[&arg](const auto& service) {
auto iterator = std::ranges::find_if(
services, [&arg](const auto& service) {
return service->objPath() == arg ||
service->properties().getName() == arg;
});
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
}
const bool connect = (cmd == "connect");
const auto services = manager->services();
auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
return service->objPath() == arg ||
service->properties().getName() == arg;
});
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
continue;
}
const auto services = manager->services();
auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
return service->objPath() == arg ||
service->properties().getName() == arg;
});
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
}
std::cout << "Exiting.\n";
return 0;
}
}
4 changes: 2 additions & 2 deletions include/amarula/dbus/connman/gagent.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
GDBusConnection *connection_{nullptr};
std::string path_{"/net/amarula/gconnman/agent"};

explicit Agent(GDBusConnection *connection,
const std::string &path = std::string());
explicit Agent(DBus *dbus, const std::string &path = std::string());

using RequestInputCallback =
std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down
2 changes: 1 addition & 1 deletion include/amarula/dbus/connman/gconnman.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
auto operator=(const Connman&) -> Connman& = delete;
Connman(Connman&&) = delete;
auto operator=(Connman&&) -> Connman& = delete;
~Connman() { dbus_.reset(); }
~Connman();

[[nodiscard]] auto clock() const { return clock_; }
[[nodiscard]] auto manager() const { return manager_; }
Expand Down
4 changes: 3 additions & 1 deletion include/amarula/dbus/connman/gmanager.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
void onTechnologiesChanged(OnTechListChangedCallback callback);
void onServicesChanged(OnServListChangedCallback callback);

auto internalAgentPath() const -> std::string { return agent_->path_; };
[[nodiscard]] auto internalAgentPath() const -> std::string {
return agent_->path_;
};

private:
enum class InputType : std::uint8_t {
Expand Down
3 changes: 3 additions & 0 deletions include/amarula/dbus/gdbus.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
unsigned int pending_calls_{0};
GDBusConnection* connection_ = nullptr;
GMainLoop* loop_{nullptr};
GMainContext* ctx_{nullptr};

static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
void start();
void onAnyAsyncDone();
void onAnyAsyncStart();
void stop();

[[nodiscard]] auto connection() const { return connection_; }
[[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G
164 changes: 132 additions & 32 deletions include/amarula/dbus/gproxy.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
}

protected:
template <typename Callback>
void connectSignal(const std::string& signal_name, Callback callback,
gpointer user_data) {
struct Data {
GDBusProxy* proxy;
std::string signal_name;
Callback callback;
gpointer user_data;
};

auto* data = new Data{proxy_, signal_name, callback, user_data};

g_main_context_invoke_full(
dbus_->context(), G_PRIORITY_DEFAULT,
[](gpointer user_data) -> gboolean {
auto* data = static_cast<Data*>(user_data);

g_signal_connect(data->proxy, data->signal_name.c_str(),
G_CALLBACK(data->callback), data->user_data);

return G_SOURCE_REMOVE;
},
data,
[](gpointer user_data) { delete static_cast<Data*>(user_data); });
}

void updateProperties(GVariant* properties) {
GVariantIter* iter = g_variant_iter_new(properties);
GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

void getProperties(PropertiesCallback callback = nullptr) {
auto data = prepareCallback(std::move(callback));
callMethod(proxy_, nullptr, "GetProperties", nullptr,
callMethod(nullptr, "GetProperties", nullptr,
&DBusProxy::get_property_cb, data.release());
}

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
dbus_->onAnyAsyncDone();
}

explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
const gchar* interface_name)
explicit DBusProxy(DBus* dbus, const std::string& name,
const std::string& obj_path,
const std::string& interface_name)
: dbus_{dbus} {
GError* err = nullptr;

proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
obj_path, interface_name, nullptr, &err);
if (proxy_ == nullptr) {
std::string const msg =
"Failed to create proxy: " + std::string(err->message);
g_error_free(err);
throw std::runtime_error(msg);
struct Data {
DBusProxy* proxy;
std::string name;
std::string obj_path;
std::string interface_name;
std::mutex mtx;
std::condition_variable cv;
bool done{false};
std::string error;
};

auto data = Data{this, name, obj_path, interface_name};

g_main_context_invoke_full(
dbus_->context(), G_PRIORITY_HIGH,
[](gpointer user_data) -> gboolean {
auto* data = static_cast<Data*>(user_data);

GError* err = nullptr;

data->proxy->proxy_ = g_dbus_proxy_new_sync(
data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
nullptr, data->name.c_str(), data->obj_path.c_str(),
data->interface_name.c_str(), nullptr, &err);

if (data->proxy->proxy_ == nullptr) {
data->error =
"Failed to create proxy: " + std::string(err->message);
g_error_free(err);
} else {
g_signal_connect(
data->proxy->proxy_, "g-signal::PropertyChanged",
G_CALLBACK(&DBusProxy::on_properties_changed_cb),
data->proxy);
}

return G_SOURCE_REMOVE;
},
&data,
[](gpointer user_data) {
auto* data = static_cast<Data*>(user_data);
{
std::lock_guard<std::mutex> const lock(data->mtx);
data->done = true;
}
data->cv.notify_all();
});
{
std::unique_lock<std::mutex> lock(data.mtx);
data.cv.wait(lock, [&] { return data.done; });
}

if (!data.error.empty()) {
throw std::runtime_error(data.error);
}
g_signal_connect(proxy_, "g-signal::PropertyChanged",
G_CALLBACK(&DBusProxy::on_properties_changed_cb),
this);
}

template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
self->template executeCallBack<PropertiesSetCallback>(counter, success);
}

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
GVariant* arg_value, GCancellable* cancellable,
GAsyncReadyCallback callback, gpointer user_data
void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
gpointer user_data

) {
std::array<GVariant*, 2> tuple_elements{
g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
g_dbus_proxy_call(proxy, "SetProperty", parameters,
G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
user_data);
}

static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
const gchar* arg_name, GVariant* parameters,
GAsyncReadyCallback callback, gpointer user_data) {
g_dbus_proxy_call(
proxy, arg_name,
(parameters != nullptr) ? parameters
: g_variant_new_tuple(nullptr, 0),
G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
callMethod(cancellable, "SetProperty", parameters, callback, user_data);
}

void callMethod(GCancellable* cancellable, const std::string& arg_name,
GVariant* parameters, GAsyncReadyCallback callback,
gpointer user_data) {
struct Data {
GDBusProxy* proxy;
std::string arg_name;
GVariant* parameters;
GCancellable* cancellable;
GAsyncReadyCallback callback;
gpointer user_data;
};

auto data = std::make_unique<Data>(
Data{proxy_, arg_name,
(parameters != nullptr)
? g_variant_ref_sink(parameters)
: g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
(cancellable != nullptr)
? static_cast<GCancellable*>(g_object_ref(cancellable))
: nullptr,
callback, user_data});

g_main_context_invoke_full(
dbus_->context(), G_PRIORITY_DEFAULT,
[](gpointer user_data) -> gboolean {
auto* data = static_cast<Data*>(user_data);

g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
data->cancellable, data->callback,
data->user_data);

return G_SOURCE_REMOVE;
},
data.release(),
[](gpointer user_data) {
std::unique_ptr<Data> data(static_cast<Data*>(user_data));
g_variant_unref(data->parameters);
if (data->cancellable != nullptr) {
g_object_unref(data->cancellable);
}
});
}
};

Expand Down
7 changes: 7 additions & 0 deletions src/dbus/gconnman.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
clock_->getProperties();
}

Connman::~Connman() {
dbus_->stop();
manager_.reset();
clock_.reset();
dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Callbacks in worker thread by EddyTheCo · Pull Request #25 · amarula/libcppconnman · GitHub
Skip to content
Callbacks in worker thread#25

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

EddyTheCo
merged 14 commits into

from

Apr 13, 2026
 Merged


Callbacks in worker thread
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
1c74e34

Fix clang warnings


EddyTheCo Jan 1, 2026
ccf105e

CMakeLists: Remove unused includes


EddyTheCo Apr 1, 2026
6718a47

gconnman_serv_test: Wired can not be removed


EddyTheCo Apr 1, 2026
0cc47de

.gitignore: Ignore CMakeLists.txt.user


EddyTheCo Mar 18, 2026
0cc9899

Proxy: remove passing proxy member in methods


EddyTheCo Jan 7, 2026
09acff0

gproxy.hpp: Reuse callMethod


EddyTheCo Mar 20, 2026
b5f2caf

tests: Add check thread id of callbacks


EddyTheCo Mar 20, 2026
6c6fdd8

gdbus: Add thread default context


EddyTheCo Mar 20, 2026
4c2c5d0

gproxy: use g_main_context_invoke in proxy callMethod


EddyTheCo Mar 18, 2026
c194530

gdbus: Expose stop method


EddyTheCo Apr 13, 2026
f9ca6ad

connman: Make explicit the destruction order


EddyTheCo Apr 13, 2026
6cf4b20

gproxy.hpp: Initialize the glib proxy on worker thread


EddyTheCo Apr 1, 2026
108d847

gconnman_manager.cpp: Connect signals in worker thread


EddyTheCo Apr 1, 2026
2d686e2

gconnman_agent: Register object in worker thread


EddyTheCo Apr 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user

2 changes: 0 additions & 2 deletions
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 add_subdirectory(tests)
 endif(BUILD_TESTS)
 if(BUILD_EXAMPLES)
 include(CTest)
 add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
 if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 )
 set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
 include(CPack)
 include(CPackIFW)
 cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down

29 changes: 14 additions & 15 deletions
examples/connmanctl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
 bool connecting = false;
 Connman connman;
 const auto manager = connman.manager();
 manager->onRequestInputPassphrase([&](auto service) -> auto {
 manager->onRequestInputPassphrase([&](const auto& service) -> auto {
 const auto name = service->properties().getName();

 std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
 }
 }
 // Trim whitespace
 line.erase(line.begin(),
 std::find_if(line.begin(), line.end(), [](int character) {
 line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
 return std::isspace(character) == 0;
 }));
 line.erase(std::find_if(line.rbegin(), line.rend(),
 [](int character) {
 return std::isspace(character) == 0;
 })
 line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
 .base(),
 line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
 << service->objPath() << "\n";
 }
 } else {
 auto iterator = std::find_if(
 services.begin(), services.end(),
 [&arg](const auto& service) {
 auto iterator = std::ranges::find_if(
 services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
 }
 const bool connect = (cmd == "connect");
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
 continue;
 }
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
 }
 std::cout << "Exiting.\n";
 return 0;
}
}

4 changes: 2 additions & 2 deletions
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
 GDBusConnection *connection_{nullptr};
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(GDBusConnection *connection,
 const std::string &path = std::string());
 explicit Agent(DBus *dbus, const std::string &path = std::string());

 using RequestInputCallback =
 std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down

2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gconnman.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
 auto operator=(const Connman&) -> Connman& = delete;
 Connman(Connman&&) = delete;
 auto operator=(Connman&&) -> Connman& = delete;
 ~Connman() { dbus_.reset(); }
 ~Connman();

 [[nodiscard]] auto clock() const { return clock_; }
 [[nodiscard]] auto manager() const { return manager_; }
Expand Down

4 changes: 3 additions & 1 deletion
include/amarula/dbus/connman/gmanager.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
 void onTechnologiesChanged(OnTechListChangedCallback callback);
 void onServicesChanged(OnServListChangedCallback callback);

 auto internalAgentPath() const -> std::string { return agent_->path_; };
 [[nodiscard]] auto internalAgentPath() const -> std::string {
 return agent_->path_;
 };

 private:
 enum class InputType : std::uint8_t {
Expand Down

3 changes: 3 additions & 0 deletions
include/amarula/dbus/gdbus.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
 unsigned int pending_calls_{0};
 GDBusConnection* connection_ = nullptr;
 GMainLoop* loop_{nullptr};
 GMainContext* ctx_{nullptr};

 static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
 void start();
 void onAnyAsyncDone();
 void onAnyAsyncStart();
 void stop();

 [[nodiscard]] auto connection() const { return connection_; }
 [[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G

164 changes: 132 additions & 32 deletions
include/amarula/dbus/gproxy.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 }

 protected:
 template <typename Callback>
 void connectSignal(const std::string& signal_name, Callback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string signal_name;
 Callback callback;
 gpointer user_data;
 };

 auto* data = new Data{proxy_, signal_name, callback, user_data};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_signal_connect(data->proxy, data->signal_name.c_str(),
 G_CALLBACK(data->callback), data->user_data);

 return G_SOURCE_REMOVE;
 },
 data,
 [](gpointer user_data) { delete static_cast<Data*>(user_data); });
 }

 void updateProperties(GVariant* properties) {
 GVariantIter* iter = g_variant_iter_new(properties);
 GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

 void getProperties(PropertiesCallback callback = nullptr) {
 auto data = prepareCallback(std::move(callback));
 callMethod(proxy_, nullptr, "GetProperties", nullptr,
 callMethod(nullptr, "GetProperties", nullptr,
 &DBusProxy::get_property_cb, data.release());
 }

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 dbus_->onAnyAsyncDone();
 }

 explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
 const gchar* interface_name)
 explicit DBusProxy(DBus* dbus, const std::string& name,
 const std::string& obj_path,
 const std::string& interface_name)
 : dbus_{dbus} {
 GError* err = nullptr;

 proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
 G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
 obj_path, interface_name, nullptr, &err);
 if (proxy_ == nullptr) {
 std::string const msg =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 throw std::runtime_error(msg);
 struct Data {
 DBusProxy* proxy;
 std::string name;
 std::string obj_path;
 std::string interface_name;
 std::mutex mtx;
 std::condition_variable cv;
 bool done{false};
 std::string error;
 };

 auto data = Data{this, name, obj_path, interface_name};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_HIGH,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 GError* err = nullptr;

 data->proxy->proxy_ = g_dbus_proxy_new_sync(
 data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
 nullptr, data->name.c_str(), data->obj_path.c_str(),
 data->interface_name.c_str(), nullptr, &err);

 if (data->proxy->proxy_ == nullptr) {
 data->error =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 } else {
 g_signal_connect(
 data->proxy->proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 data->proxy);
 }

 return G_SOURCE_REMOVE;
 },
 &data,
 [](gpointer user_data) {
 auto* data = static_cast<Data*>(user_data);
 {
 std::lock_guard<std::mutex> const lock(data->mtx);
 data->done = true;
 }
 data->cv.notify_all();
 });
 {
 std::unique_lock<std::mutex> lock(data.mtx);
 data.cv.wait(lock, [&] { return data.done; });
 }

 if (!data.error.empty()) {
 throw std::runtime_error(data.error);
 }
 g_signal_connect(proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 this);
 }

 template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 self->template executeCallBack<PropertiesSetCallback>(counter, success);
 }

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
 GVariant* arg_value, GCancellable* cancellable,
 GAsyncReadyCallback callback, gpointer user_data
 void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
 gpointer user_data

 ) {
 std::array<GVariant*, 2> tuple_elements{
 g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

 GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
 g_dbus_proxy_call(proxy, "SetProperty", parameters,
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
 user_data);
 }

 static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
 const gchar* arg_name, GVariant* parameters,
 GAsyncReadyCallback callback, gpointer user_data) {
 g_dbus_proxy_call(
 proxy, arg_name,
 (parameters != nullptr) ? parameters
 : g_variant_new_tuple(nullptr, 0),
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
 callMethod(cancellable, "SetProperty", parameters, callback, user_data);
 }

 void callMethod(GCancellable* cancellable, const std::string& arg_name,
 GVariant* parameters, GAsyncReadyCallback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string arg_name;
 GVariant* parameters;
 GCancellable* cancellable;
 GAsyncReadyCallback callback;
 gpointer user_data;
 };

 auto data = std::make_unique<Data>(
 Data{proxy_, arg_name,
 (parameters != nullptr)
 ? g_variant_ref_sink(parameters)
 : g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
 (cancellable != nullptr)
 ? static_cast<GCancellable*>(g_object_ref(cancellable))
 : nullptr,
 callback, user_data});

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
 data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
 data->cancellable, data->callback,
 data->user_data);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data*>(user_data));
 g_variant_unref(data->parameters);
 if (data->cancellable != nullptr) {
 g_object_unref(data->cancellable);
 }
 });
 }
};

Expand Down

7 changes: 7 additions & 0 deletions
src/dbus/gconnman.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
 clock_->getProperties();
}

Connman::~Connman() {
 dbus_->stop();
 manager_.reset();
 clock_.reset();
 dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Callbacks in worker thread by EddyTheCo · Pull Request #25 · amarula/libcppconnman · GitHub
Skip to content
Callbacks in worker thread#25

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

EddyTheCo
merged 14 commits into

from

Apr 13, 2026
 Merged


Callbacks in worker thread
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
1c74e34

Fix clang warnings


EddyTheCo Jan 1, 2026
ccf105e

CMakeLists: Remove unused includes


EddyTheCo Apr 1, 2026
6718a47

gconnman_serv_test: Wired can not be removed


EddyTheCo Apr 1, 2026
0cc47de

.gitignore: Ignore CMakeLists.txt.user


EddyTheCo Mar 18, 2026
0cc9899

Proxy: remove passing proxy member in methods


EddyTheCo Jan 7, 2026
09acff0

gproxy.hpp: Reuse callMethod


EddyTheCo Mar 20, 2026
b5f2caf

tests: Add check thread id of callbacks


EddyTheCo Mar 20, 2026
6c6fdd8

gdbus: Add thread default context


EddyTheCo Mar 20, 2026
4c2c5d0

gproxy: use g_main_context_invoke in proxy callMethod


EddyTheCo Mar 18, 2026
c194530

gdbus: Expose stop method


EddyTheCo Apr 13, 2026
f9ca6ad

connman: Make explicit the destruction order


EddyTheCo Apr 13, 2026
6cf4b20

gproxy.hpp: Initialize the glib proxy on worker thread


EddyTheCo Apr 1, 2026
108d847

gconnman_manager.cpp: Connect signals in worker thread


EddyTheCo Apr 1, 2026
2d686e2

gconnman_agent: Register object in worker thread


EddyTheCo Apr 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user

2 changes: 0 additions & 2 deletions
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 add_subdirectory(tests)
 endif(BUILD_TESTS)
 if(BUILD_EXAMPLES)
 include(CTest)
 add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
 if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 )
 set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
 include(CPack)
 include(CPackIFW)
 cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down

29 changes: 14 additions & 15 deletions
examples/connmanctl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
 bool connecting = false;
 Connman connman;
 const auto manager = connman.manager();
 manager->onRequestInputPassphrase([&](auto service) -> auto {
 manager->onRequestInputPassphrase([&](const auto& service) -> auto {
 const auto name = service->properties().getName();

 std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
 }
 }
 // Trim whitespace
 line.erase(line.begin(),
 std::find_if(line.begin(), line.end(), [](int character) {
 line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
 return std::isspace(character) == 0;
 }));
 line.erase(std::find_if(line.rbegin(), line.rend(),
 [](int character) {
 return std::isspace(character) == 0;
 })
 line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
 .base(),
 line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
 << service->objPath() << "\n";
 }
 } else {
 auto iterator = std::find_if(
 services.begin(), services.end(),
 [&arg](const auto& service) {
 auto iterator = std::ranges::find_if(
 services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
 }
 const bool connect = (cmd == "connect");
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
 continue;
 }
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
 }
 std::cout << "Exiting.\n";
 return 0;
}
}

4 changes: 2 additions & 2 deletions
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
 GDBusConnection *connection_{nullptr};
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(GDBusConnection *connection,
 const std::string &path = std::string());
 explicit Agent(DBus *dbus, const std::string &path = std::string());

 using RequestInputCallback =
 std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down

2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gconnman.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
 auto operator=(const Connman&) -> Connman& = delete;
 Connman(Connman&&) = delete;
 auto operator=(Connman&&) -> Connman& = delete;
 ~Connman() { dbus_.reset(); }
 ~Connman();

 [[nodiscard]] auto clock() const { return clock_; }
 [[nodiscard]] auto manager() const { return manager_; }
Expand Down

4 changes: 3 additions & 1 deletion
include/amarula/dbus/connman/gmanager.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
 void onTechnologiesChanged(OnTechListChangedCallback callback);
 void onServicesChanged(OnServListChangedCallback callback);

 auto internalAgentPath() const -> std::string { return agent_->path_; };
 [[nodiscard]] auto internalAgentPath() const -> std::string {
 return agent_->path_;
 };

 private:
 enum class InputType : std::uint8_t {
Expand Down

3 changes: 3 additions & 0 deletions
include/amarula/dbus/gdbus.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
 unsigned int pending_calls_{0};
 GDBusConnection* connection_ = nullptr;
 GMainLoop* loop_{nullptr};
 GMainContext* ctx_{nullptr};

 static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
 void start();
 void onAnyAsyncDone();
 void onAnyAsyncStart();
 void stop();

 [[nodiscard]] auto connection() const { return connection_; }
 [[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G

164 changes: 132 additions & 32 deletions
include/amarula/dbus/gproxy.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 }

 protected:
 template <typename Callback>
 void connectSignal(const std::string& signal_name, Callback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string signal_name;
 Callback callback;
 gpointer user_data;
 };

 auto* data = new Data{proxy_, signal_name, callback, user_data};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_signal_connect(data->proxy, data->signal_name.c_str(),
 G_CALLBACK(data->callback), data->user_data);

 return G_SOURCE_REMOVE;
 },
 data,
 [](gpointer user_data) { delete static_cast<Data*>(user_data); });
 }

 void updateProperties(GVariant* properties) {
 GVariantIter* iter = g_variant_iter_new(properties);
 GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

 void getProperties(PropertiesCallback callback = nullptr) {
 auto data = prepareCallback(std::move(callback));
 callMethod(proxy_, nullptr, "GetProperties", nullptr,
 callMethod(nullptr, "GetProperties", nullptr,
 &DBusProxy::get_property_cb, data.release());
 }

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 dbus_->onAnyAsyncDone();
 }

 explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
 const gchar* interface_name)
 explicit DBusProxy(DBus* dbus, const std::string& name,
 const std::string& obj_path,
 const std::string& interface_name)
 : dbus_{dbus} {
 GError* err = nullptr;

 proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
 G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
 obj_path, interface_name, nullptr, &err);
 if (proxy_ == nullptr) {
 std::string const msg =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 throw std::runtime_error(msg);
 struct Data {
 DBusProxy* proxy;
 std::string name;
 std::string obj_path;
 std::string interface_name;
 std::mutex mtx;
 std::condition_variable cv;
 bool done{false};
 std::string error;
 };

 auto data = Data{this, name, obj_path, interface_name};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_HIGH,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 GError* err = nullptr;

 data->proxy->proxy_ = g_dbus_proxy_new_sync(
 data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
 nullptr, data->name.c_str(), data->obj_path.c_str(),
 data->interface_name.c_str(), nullptr, &err);

 if (data->proxy->proxy_ == nullptr) {
 data->error =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 } else {
 g_signal_connect(
 data->proxy->proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 data->proxy);
 }

 return G_SOURCE_REMOVE;
 },
 &data,
 [](gpointer user_data) {
 auto* data = static_cast<Data*>(user_data);
 {
 std::lock_guard<std::mutex> const lock(data->mtx);
 data->done = true;
 }
 data->cv.notify_all();
 });
 {
 std::unique_lock<std::mutex> lock(data.mtx);
 data.cv.wait(lock, [&] { return data.done; });
 }

 if (!data.error.empty()) {
 throw std::runtime_error(data.error);
 }
 g_signal_connect(proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 this);
 }

 template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 self->template executeCallBack<PropertiesSetCallback>(counter, success);
 }

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
 GVariant* arg_value, GCancellable* cancellable,
 GAsyncReadyCallback callback, gpointer user_data
 void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
 gpointer user_data

 ) {
 std::array<GVariant*, 2> tuple_elements{
 g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

 GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
 g_dbus_proxy_call(proxy, "SetProperty", parameters,
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
 user_data);
 }

 static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
 const gchar* arg_name, GVariant* parameters,
 GAsyncReadyCallback callback, gpointer user_data) {
 g_dbus_proxy_call(
 proxy, arg_name,
 (parameters != nullptr) ? parameters
 : g_variant_new_tuple(nullptr, 0),
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
 callMethod(cancellable, "SetProperty", parameters, callback, user_data);
 }

 void callMethod(GCancellable* cancellable, const std::string& arg_name,
 GVariant* parameters, GAsyncReadyCallback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string arg_name;
 GVariant* parameters;
 GCancellable* cancellable;
 GAsyncReadyCallback callback;
 gpointer user_data;
 };

 auto data = std::make_unique<Data>(
 Data{proxy_, arg_name,
 (parameters != nullptr)
 ? g_variant_ref_sink(parameters)
 : g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
 (cancellable != nullptr)
 ? static_cast<GCancellable*>(g_object_ref(cancellable))
 : nullptr,
 callback, user_data});

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
 data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
 data->cancellable, data->callback,
 data->user_data);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data*>(user_data));
 g_variant_unref(data->parameters);
 if (data->cancellable != nullptr) {
 g_object_unref(data->cancellable);
 }
 });
 }
};

Expand Down

7 changes: 7 additions & 0 deletions
src/dbus/gconnman.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
 clock_->getProperties();
}

Connman::~Connman() {
 dbus_->stop();
 manager_.reset();
 clock_.reset();
 dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Callbacks in worker thread by EddyTheCo · Pull Request #25 · amarula/libcppconnman · GitHub
Skip to content
Callbacks in worker thread#25

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

EddyTheCo
merged 14 commits into

from

Apr 13, 2026
 Merged


Callbacks in worker thread
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
1c74e34

Fix clang warnings


EddyTheCo Jan 1, 2026
ccf105e

CMakeLists: Remove unused includes


EddyTheCo Apr 1, 2026
6718a47

gconnman_serv_test: Wired can not be removed


EddyTheCo Apr 1, 2026
0cc47de

.gitignore: Ignore CMakeLists.txt.user


EddyTheCo Mar 18, 2026
0cc9899

Proxy: remove passing proxy member in methods


EddyTheCo Jan 7, 2026
09acff0

gproxy.hpp: Reuse callMethod


EddyTheCo Mar 20, 2026
b5f2caf

tests: Add check thread id of callbacks


EddyTheCo Mar 20, 2026
6c6fdd8

gdbus: Add thread default context


EddyTheCo Mar 20, 2026
4c2c5d0

gproxy: use g_main_context_invoke in proxy callMethod


EddyTheCo Mar 18, 2026
c194530

gdbus: Expose stop method


EddyTheCo Apr 13, 2026
f9ca6ad

connman: Make explicit the destruction order


EddyTheCo Apr 13, 2026
6cf4b20

gproxy.hpp: Initialize the glib proxy on worker thread


EddyTheCo Apr 1, 2026
108d847

gconnman_manager.cpp: Connect signals in worker thread


EddyTheCo Apr 1, 2026
2d686e2

gconnman_agent: Register object in worker thread


EddyTheCo Apr 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user

2 changes: 0 additions & 2 deletions
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 add_subdirectory(tests)
 endif(BUILD_TESTS)
 if(BUILD_EXAMPLES)
 include(CTest)
 add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
 if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 )
 set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
 include(CPack)
 include(CPackIFW)
 cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down

29 changes: 14 additions & 15 deletions
examples/connmanctl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
 bool connecting = false;
 Connman connman;
 const auto manager = connman.manager();
 manager->onRequestInputPassphrase([&](auto service) -> auto {
 manager->onRequestInputPassphrase([&](const auto& service) -> auto {
 const auto name = service->properties().getName();

 std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
 }
 }
 // Trim whitespace
 line.erase(line.begin(),
 std::find_if(line.begin(), line.end(), [](int character) {
 line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
 return std::isspace(character) == 0;
 }));
 line.erase(std::find_if(line.rbegin(), line.rend(),
 [](int character) {
 return std::isspace(character) == 0;
 })
 line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
 .base(),
 line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
 << service->objPath() << "\n";
 }
 } else {
 auto iterator = std::find_if(
 services.begin(), services.end(),
 [&arg](const auto& service) {
 auto iterator = std::ranges::find_if(
 services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
 }
 const bool connect = (cmd == "connect");
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
 continue;
 }
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
 }
 std::cout << "Exiting.\n";
 return 0;
}
}

4 changes: 2 additions & 2 deletions
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
 GDBusConnection *connection_{nullptr};
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(GDBusConnection *connection,
 const std::string &path = std::string());
 explicit Agent(DBus *dbus, const std::string &path = std::string());

 using RequestInputCallback =
 std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down

2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gconnman.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
 auto operator=(const Connman&) -> Connman& = delete;
 Connman(Connman&&) = delete;
 auto operator=(Connman&&) -> Connman& = delete;
 ~Connman() { dbus_.reset(); }
 ~Connman();

 [[nodiscard]] auto clock() const { return clock_; }
 [[nodiscard]] auto manager() const { return manager_; }
Expand Down

4 changes: 3 additions & 1 deletion
include/amarula/dbus/connman/gmanager.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
 void onTechnologiesChanged(OnTechListChangedCallback callback);
 void onServicesChanged(OnServListChangedCallback callback);

 auto internalAgentPath() const -> std::string { return agent_->path_; };
 [[nodiscard]] auto internalAgentPath() const -> std::string {
 return agent_->path_;
 };

 private:
 enum class InputType : std::uint8_t {
Expand Down

3 changes: 3 additions & 0 deletions
include/amarula/dbus/gdbus.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
 unsigned int pending_calls_{0};
 GDBusConnection* connection_ = nullptr;
 GMainLoop* loop_{nullptr};
 GMainContext* ctx_{nullptr};

 static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
 void start();
 void onAnyAsyncDone();
 void onAnyAsyncStart();
 void stop();

 [[nodiscard]] auto connection() const { return connection_; }
 [[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G

164 changes: 132 additions & 32 deletions
include/amarula/dbus/gproxy.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 }

 protected:
 template <typename Callback>
 void connectSignal(const std::string& signal_name, Callback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string signal_name;
 Callback callback;
 gpointer user_data;
 };

 auto* data = new Data{proxy_, signal_name, callback, user_data};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_signal_connect(data->proxy, data->signal_name.c_str(),
 G_CALLBACK(data->callback), data->user_data);

 return G_SOURCE_REMOVE;
 },
 data,
 [](gpointer user_data) { delete static_cast<Data*>(user_data); });
 }

 void updateProperties(GVariant* properties) {
 GVariantIter* iter = g_variant_iter_new(properties);
 GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

 void getProperties(PropertiesCallback callback = nullptr) {
 auto data = prepareCallback(std::move(callback));
 callMethod(proxy_, nullptr, "GetProperties", nullptr,
 callMethod(nullptr, "GetProperties", nullptr,
 &DBusProxy::get_property_cb, data.release());
 }

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 dbus_->onAnyAsyncDone();
 }

 explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
 const gchar* interface_name)
 explicit DBusProxy(DBus* dbus, const std::string& name,
 const std::string& obj_path,
 const std::string& interface_name)
 : dbus_{dbus} {
 GError* err = nullptr;

 proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
 G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
 obj_path, interface_name, nullptr, &err);
 if (proxy_ == nullptr) {
 std::string const msg =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 throw std::runtime_error(msg);
 struct Data {
 DBusProxy* proxy;
 std::string name;
 std::string obj_path;
 std::string interface_name;
 std::mutex mtx;
 std::condition_variable cv;
 bool done{false};
 std::string error;
 };

 auto data = Data{this, name, obj_path, interface_name};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_HIGH,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 GError* err = nullptr;

 data->proxy->proxy_ = g_dbus_proxy_new_sync(
 data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
 nullptr, data->name.c_str(), data->obj_path.c_str(),
 data->interface_name.c_str(), nullptr, &err);

 if (data->proxy->proxy_ == nullptr) {
 data->error =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 } else {
 g_signal_connect(
 data->proxy->proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 data->proxy);
 }

 return G_SOURCE_REMOVE;
 },
 &data,
 [](gpointer user_data) {
 auto* data = static_cast<Data*>(user_data);
 {
 std::lock_guard<std::mutex> const lock(data->mtx);
 data->done = true;
 }
 data->cv.notify_all();
 });
 {
 std::unique_lock<std::mutex> lock(data.mtx);
 data.cv.wait(lock, [&] { return data.done; });
 }

 if (!data.error.empty()) {
 throw std::runtime_error(data.error);
 }
 g_signal_connect(proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 this);
 }

 template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 self->template executeCallBack<PropertiesSetCallback>(counter, success);
 }

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
 GVariant* arg_value, GCancellable* cancellable,
 GAsyncReadyCallback callback, gpointer user_data
 void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
 gpointer user_data

 ) {
 std::array<GVariant*, 2> tuple_elements{
 g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

 GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
 g_dbus_proxy_call(proxy, "SetProperty", parameters,
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
 user_data);
 }

 static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
 const gchar* arg_name, GVariant* parameters,
 GAsyncReadyCallback callback, gpointer user_data) {
 g_dbus_proxy_call(
 proxy, arg_name,
 (parameters != nullptr) ? parameters
 : g_variant_new_tuple(nullptr, 0),
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
 callMethod(cancellable, "SetProperty", parameters, callback, user_data);
 }

 void callMethod(GCancellable* cancellable, const std::string& arg_name,
 GVariant* parameters, GAsyncReadyCallback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string arg_name;
 GVariant* parameters;
 GCancellable* cancellable;
 GAsyncReadyCallback callback;
 gpointer user_data;
 };

 auto data = std::make_unique<Data>(
 Data{proxy_, arg_name,
 (parameters != nullptr)
 ? g_variant_ref_sink(parameters)
 : g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
 (cancellable != nullptr)
 ? static_cast<GCancellable*>(g_object_ref(cancellable))
 : nullptr,
 callback, user_data});

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
 data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
 data->cancellable, data->callback,
 data->user_data);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data*>(user_data));
 g_variant_unref(data->parameters);
 if (data->cancellable != nullptr) {
 g_object_unref(data->cancellable);
 }
 });
 }
};

Expand Down

7 changes: 7 additions & 0 deletions
src/dbus/gconnman.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
 clock_->getProperties();
}

Connman::~Connman() {
 dbus_->stop();
 manager_.reset();
 clock_.reset();
 dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Callbacks in worker thread by EddyTheCo · Pull Request #25 · amarula/libcppconnman · GitHub
Skip to content
Callbacks in worker thread#25

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

EddyTheCo
merged 14 commits into

from

Apr 13, 2026
 Merged


Callbacks in worker thread
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
1c74e34

Fix clang warnings


EddyTheCo Jan 1, 2026
ccf105e

CMakeLists: Remove unused includes


EddyTheCo Apr 1, 2026
6718a47

gconnman_serv_test: Wired can not be removed


EddyTheCo Apr 1, 2026
0cc47de

.gitignore: Ignore CMakeLists.txt.user


EddyTheCo Mar 18, 2026
0cc9899

Proxy: remove passing proxy member in methods


EddyTheCo Jan 7, 2026
09acff0

gproxy.hpp: Reuse callMethod


EddyTheCo Mar 20, 2026
b5f2caf

tests: Add check thread id of callbacks


EddyTheCo Mar 20, 2026
6c6fdd8

gdbus: Add thread default context


EddyTheCo Mar 20, 2026
4c2c5d0

gproxy: use g_main_context_invoke in proxy callMethod


EddyTheCo Mar 18, 2026
c194530

gdbus: Expose stop method


EddyTheCo Apr 13, 2026
f9ca6ad

connman: Make explicit the destruction order


EddyTheCo Apr 13, 2026
6cf4b20

gproxy.hpp: Initialize the glib proxy on worker thread


EddyTheCo Apr 1, 2026
108d847

gconnman_manager.cpp: Connect signals in worker thread


EddyTheCo Apr 1, 2026
2d686e2

gconnman_agent: Register object in worker thread


EddyTheCo Apr 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user

2 changes: 0 additions & 2 deletions
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 add_subdirectory(tests)
 endif(BUILD_TESTS)
 if(BUILD_EXAMPLES)
 include(CTest)
 add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
 if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 )
 set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
 include(CPack)
 include(CPackIFW)
 cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down

29 changes: 14 additions & 15 deletions
examples/connmanctl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
 bool connecting = false;
 Connman connman;
 const auto manager = connman.manager();
 manager->onRequestInputPassphrase([&](auto service) -> auto {
 manager->onRequestInputPassphrase([&](const auto& service) -> auto {
 const auto name = service->properties().getName();

 std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
 }
 }
 // Trim whitespace
 line.erase(line.begin(),
 std::find_if(line.begin(), line.end(), [](int character) {
 line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
 return std::isspace(character) == 0;
 }));
 line.erase(std::find_if(line.rbegin(), line.rend(),
 [](int character) {
 return std::isspace(character) == 0;
 })
 line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
 .base(),
 line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
 << service->objPath() << "\n";
 }
 } else {
 auto iterator = std::find_if(
 services.begin(), services.end(),
 [&arg](const auto& service) {
 auto iterator = std::ranges::find_if(
 services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
 }
 const bool connect = (cmd == "connect");
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
 continue;
 }
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
 }
 std::cout << "Exiting.\n";
 return 0;
}
}

4 changes: 2 additions & 2 deletions
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
 GDBusConnection *connection_{nullptr};
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(GDBusConnection *connection,
 const std::string &path = std::string());
 explicit Agent(DBus *dbus, const std::string &path = std::string());

 using RequestInputCallback =
 std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down

2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gconnman.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
 auto operator=(const Connman&) -> Connman& = delete;
 Connman(Connman&&) = delete;
 auto operator=(Connman&&) -> Connman& = delete;
 ~Connman() { dbus_.reset(); }
 ~Connman();

 [[nodiscard]] auto clock() const { return clock_; }
 [[nodiscard]] auto manager() const { return manager_; }
Expand Down

4 changes: 3 additions & 1 deletion
include/amarula/dbus/connman/gmanager.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
 void onTechnologiesChanged(OnTechListChangedCallback callback);
 void onServicesChanged(OnServListChangedCallback callback);

 auto internalAgentPath() const -> std::string { return agent_->path_; };
 [[nodiscard]] auto internalAgentPath() const -> std::string {
 return agent_->path_;
 };

 private:
 enum class InputType : std::uint8_t {
Expand Down

3 changes: 3 additions & 0 deletions
include/amarula/dbus/gdbus.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
 unsigned int pending_calls_{0};
 GDBusConnection* connection_ = nullptr;
 GMainLoop* loop_{nullptr};
 GMainContext* ctx_{nullptr};

 static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
 void start();
 void onAnyAsyncDone();
 void onAnyAsyncStart();
 void stop();

 [[nodiscard]] auto connection() const { return connection_; }
 [[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G

164 changes: 132 additions & 32 deletions
include/amarula/dbus/gproxy.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 }

 protected:
 template <typename Callback>
 void connectSignal(const std::string& signal_name, Callback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string signal_name;
 Callback callback;
 gpointer user_data;
 };

 auto* data = new Data{proxy_, signal_name, callback, user_data};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_signal_connect(data->proxy, data->signal_name.c_str(),
 G_CALLBACK(data->callback), data->user_data);

 return G_SOURCE_REMOVE;
 },
 data,
 [](gpointer user_data) { delete static_cast<Data*>(user_data); });
 }

 void updateProperties(GVariant* properties) {
 GVariantIter* iter = g_variant_iter_new(properties);
 GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

 void getProperties(PropertiesCallback callback = nullptr) {
 auto data = prepareCallback(std::move(callback));
 callMethod(proxy_, nullptr, "GetProperties", nullptr,
 callMethod(nullptr, "GetProperties", nullptr,
 &DBusProxy::get_property_cb, data.release());
 }

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 dbus_->onAnyAsyncDone();
 }

 explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
 const gchar* interface_name)
 explicit DBusProxy(DBus* dbus, const std::string& name,
 const std::string& obj_path,
 const std::string& interface_name)
 : dbus_{dbus} {
 GError* err = nullptr;

 proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
 G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
 obj_path, interface_name, nullptr, &err);
 if (proxy_ == nullptr) {
 std::string const msg =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 throw std::runtime_error(msg);
 struct Data {
 DBusProxy* proxy;
 std::string name;
 std::string obj_path;
 std::string interface_name;
 std::mutex mtx;
 std::condition_variable cv;
 bool done{false};
 std::string error;
 };

 auto data = Data{this, name, obj_path, interface_name};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_HIGH,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 GError* err = nullptr;

 data->proxy->proxy_ = g_dbus_proxy_new_sync(
 data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
 nullptr, data->name.c_str(), data->obj_path.c_str(),
 data->interface_name.c_str(), nullptr, &err);

 if (data->proxy->proxy_ == nullptr) {
 data->error =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 } else {
 g_signal_connect(
 data->proxy->proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 data->proxy);
 }

 return G_SOURCE_REMOVE;
 },
 &data,
 [](gpointer user_data) {
 auto* data = static_cast<Data*>(user_data);
 {
 std::lock_guard<std::mutex> const lock(data->mtx);
 data->done = true;
 }
 data->cv.notify_all();
 });
 {
 std::unique_lock<std::mutex> lock(data.mtx);
 data.cv.wait(lock, [&] { return data.done; });
 }

 if (!data.error.empty()) {
 throw std::runtime_error(data.error);
 }
 g_signal_connect(proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 this);
 }

 template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 self->template executeCallBack<PropertiesSetCallback>(counter, success);
 }

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
 GVariant* arg_value, GCancellable* cancellable,
 GAsyncReadyCallback callback, gpointer user_data
 void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
 gpointer user_data

 ) {
 std::array<GVariant*, 2> tuple_elements{
 g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

 GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
 g_dbus_proxy_call(proxy, "SetProperty", parameters,
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
 user_data);
 }

 static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
 const gchar* arg_name, GVariant* parameters,
 GAsyncReadyCallback callback, gpointer user_data) {
 g_dbus_proxy_call(
 proxy, arg_name,
 (parameters != nullptr) ? parameters
 : g_variant_new_tuple(nullptr, 0),
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
 callMethod(cancellable, "SetProperty", parameters, callback, user_data);
 }

 void callMethod(GCancellable* cancellable, const std::string& arg_name,
 GVariant* parameters, GAsyncReadyCallback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string arg_name;
 GVariant* parameters;
 GCancellable* cancellable;
 GAsyncReadyCallback callback;
 gpointer user_data;
 };

 auto data = std::make_unique<Data>(
 Data{proxy_, arg_name,
 (parameters != nullptr)
 ? g_variant_ref_sink(parameters)
 : g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
 (cancellable != nullptr)
 ? static_cast<GCancellable*>(g_object_ref(cancellable))
 : nullptr,
 callback, user_data});

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
 data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
 data->cancellable, data->callback,
 data->user_data);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data*>(user_data));
 g_variant_unref(data->parameters);
 if (data->cancellable != nullptr) {
 g_object_unref(data->cancellable);
 }
 });
 }
};

Expand Down

7 changes: 7 additions & 0 deletions
src/dbus/gconnman.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
 clock_->getProperties();
}

Connman::~Connman() {
 dbus_->stop();
 manager_.reset();
 clock_.reset();
 dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Callbacks in worker thread by EddyTheCo · Pull Request #25 · amarula/libcppconnman · GitHub
Skip to content
Callbacks in worker thread#25

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

EddyTheCo
merged 14 commits into

from

Apr 13, 2026
 Merged


Callbacks in worker thread
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
1c74e34

Fix clang warnings


EddyTheCo Jan 1, 2026
ccf105e

CMakeLists: Remove unused includes


EddyTheCo Apr 1, 2026
6718a47

gconnman_serv_test: Wired can not be removed


EddyTheCo Apr 1, 2026
0cc47de

.gitignore: Ignore CMakeLists.txt.user


EddyTheCo Mar 18, 2026
0cc9899

Proxy: remove passing proxy member in methods


EddyTheCo Jan 7, 2026
09acff0

gproxy.hpp: Reuse callMethod


EddyTheCo Mar 20, 2026
b5f2caf

tests: Add check thread id of callbacks


EddyTheCo Mar 20, 2026
6c6fdd8

gdbus: Add thread default context


EddyTheCo Mar 20, 2026
4c2c5d0

gproxy: use g_main_context_invoke in proxy callMethod


EddyTheCo Mar 18, 2026
c194530

gdbus: Expose stop method


EddyTheCo Apr 13, 2026
f9ca6ad

connman: Make explicit the destruction order


EddyTheCo Apr 13, 2026
6cf4b20

gproxy.hpp: Initialize the glib proxy on worker thread


EddyTheCo Apr 1, 2026
108d847

gconnman_manager.cpp: Connect signals in worker thread


EddyTheCo Apr 1, 2026
2d686e2

gconnman_agent: Register object in worker thread


EddyTheCo Apr 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user

2 changes: 0 additions & 2 deletions
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 add_subdirectory(tests)
 endif(BUILD_TESTS)
 if(BUILD_EXAMPLES)
 include(CTest)
 add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
 if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 )
 set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
 include(CPack)
 include(CPackIFW)
 cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down

29 changes: 14 additions & 15 deletions
examples/connmanctl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
 bool connecting = false;
 Connman connman;
 const auto manager = connman.manager();
 manager->onRequestInputPassphrase([&](auto service) -> auto {
 manager->onRequestInputPassphrase([&](const auto& service) -> auto {
 const auto name = service->properties().getName();

 std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
 }
 }
 // Trim whitespace
 line.erase(line.begin(),
 std::find_if(line.begin(), line.end(), [](int character) {
 line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
 return std::isspace(character) == 0;
 }));
 line.erase(std::find_if(line.rbegin(), line.rend(),
 [](int character) {
 return std::isspace(character) == 0;
 })
 line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
 .base(),
 line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
 << service->objPath() << "\n";
 }
 } else {
 auto iterator = std::find_if(
 services.begin(), services.end(),
 [&arg](const auto& service) {
 auto iterator = std::ranges::find_if(
 services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
 }
 const bool connect = (cmd == "connect");
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
 continue;
 }
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
 }
 std::cout << "Exiting.\n";
 return 0;
}
}

4 changes: 2 additions & 2 deletions
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
 GDBusConnection *connection_{nullptr};
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(GDBusConnection *connection,
 const std::string &path = std::string());
 explicit Agent(DBus *dbus, const std::string &path = std::string());

 using RequestInputCallback =
 std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down

2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gconnman.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
 auto operator=(const Connman&) -> Connman& = delete;
 Connman(Connman&&) = delete;
 auto operator=(Connman&&) -> Connman& = delete;
 ~Connman() { dbus_.reset(); }
 ~Connman();

 [[nodiscard]] auto clock() const { return clock_; }
 [[nodiscard]] auto manager() const { return manager_; }
Expand Down

4 changes: 3 additions & 1 deletion
include/amarula/dbus/connman/gmanager.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
 void onTechnologiesChanged(OnTechListChangedCallback callback);
 void onServicesChanged(OnServListChangedCallback callback);

 auto internalAgentPath() const -> std::string { return agent_->path_; };
 [[nodiscard]] auto internalAgentPath() const -> std::string {
 return agent_->path_;
 };

 private:
 enum class InputType : std::uint8_t {
Expand Down

3 changes: 3 additions & 0 deletions
include/amarula/dbus/gdbus.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
 unsigned int pending_calls_{0};
 GDBusConnection* connection_ = nullptr;
 GMainLoop* loop_{nullptr};
 GMainContext* ctx_{nullptr};

 static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
 void start();
 void onAnyAsyncDone();
 void onAnyAsyncStart();
 void stop();

 [[nodiscard]] auto connection() const { return connection_; }
 [[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G

164 changes: 132 additions & 32 deletions
include/amarula/dbus/gproxy.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 }

 protected:
 template <typename Callback>
 void connectSignal(const std::string& signal_name, Callback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string signal_name;
 Callback callback;
 gpointer user_data;
 };

 auto* data = new Data{proxy_, signal_name, callback, user_data};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_signal_connect(data->proxy, data->signal_name.c_str(),
 G_CALLBACK(data->callback), data->user_data);

 return G_SOURCE_REMOVE;
 },
 data,
 [](gpointer user_data) { delete static_cast<Data*>(user_data); });
 }

 void updateProperties(GVariant* properties) {
 GVariantIter* iter = g_variant_iter_new(properties);
 GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

 void getProperties(PropertiesCallback callback = nullptr) {
 auto data = prepareCallback(std::move(callback));
 callMethod(proxy_, nullptr, "GetProperties", nullptr,
 callMethod(nullptr, "GetProperties", nullptr,
 &DBusProxy::get_property_cb, data.release());
 }

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 dbus_->onAnyAsyncDone();
 }

 explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
 const gchar* interface_name)
 explicit DBusProxy(DBus* dbus, const std::string& name,
 const std::string& obj_path,
 const std::string& interface_name)
 : dbus_{dbus} {
 GError* err = nullptr;

 proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
 G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
 obj_path, interface_name, nullptr, &err);
 if (proxy_ == nullptr) {
 std::string const msg =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 throw std::runtime_error(msg);
 struct Data {
 DBusProxy* proxy;
 std::string name;
 std::string obj_path;
 std::string interface_name;
 std::mutex mtx;
 std::condition_variable cv;
 bool done{false};
 std::string error;
 };

 auto data = Data{this, name, obj_path, interface_name};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_HIGH,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 GError* err = nullptr;

 data->proxy->proxy_ = g_dbus_proxy_new_sync(
 data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
 nullptr, data->name.c_str(), data->obj_path.c_str(),
 data->interface_name.c_str(), nullptr, &err);

 if (data->proxy->proxy_ == nullptr) {
 data->error =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 } else {
 g_signal_connect(
 data->proxy->proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 data->proxy);
 }

 return G_SOURCE_REMOVE;
 },
 &data,
 [](gpointer user_data) {
 auto* data = static_cast<Data*>(user_data);
 {
 std::lock_guard<std::mutex> const lock(data->mtx);
 data->done = true;
 }
 data->cv.notify_all();
 });
 {
 std::unique_lock<std::mutex> lock(data.mtx);
 data.cv.wait(lock, [&] { return data.done; });
 }

 if (!data.error.empty()) {
 throw std::runtime_error(data.error);
 }
 g_signal_connect(proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 this);
 }

 template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 self->template executeCallBack<PropertiesSetCallback>(counter, success);
 }

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
 GVariant* arg_value, GCancellable* cancellable,
 GAsyncReadyCallback callback, gpointer user_data
 void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
 gpointer user_data

 ) {
 std::array<GVariant*, 2> tuple_elements{
 g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

 GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
 g_dbus_proxy_call(proxy, "SetProperty", parameters,
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
 user_data);
 }

 static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
 const gchar* arg_name, GVariant* parameters,
 GAsyncReadyCallback callback, gpointer user_data) {
 g_dbus_proxy_call(
 proxy, arg_name,
 (parameters != nullptr) ? parameters
 : g_variant_new_tuple(nullptr, 0),
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
 callMethod(cancellable, "SetProperty", parameters, callback, user_data);
 }

 void callMethod(GCancellable* cancellable, const std::string& arg_name,
 GVariant* parameters, GAsyncReadyCallback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string arg_name;
 GVariant* parameters;
 GCancellable* cancellable;
 GAsyncReadyCallback callback;
 gpointer user_data;
 };

 auto data = std::make_unique<Data>(
 Data{proxy_, arg_name,
 (parameters != nullptr)
 ? g_variant_ref_sink(parameters)
 : g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
 (cancellable != nullptr)
 ? static_cast<GCancellable*>(g_object_ref(cancellable))
 : nullptr,
 callback, user_data});

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
 data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
 data->cancellable, data->callback,
 data->user_data);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data*>(user_data));
 g_variant_unref(data->parameters);
 if (data->cancellable != nullptr) {
 g_object_unref(data->cancellable);
 }
 });
 }
};

Expand Down

7 changes: 7 additions & 0 deletions
src/dbus/gconnman.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
 clock_->getProperties();
}

Connman::~Connman() {
 dbus_->stop();
 manager_.reset();
 clock_.reset();
 dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Callbacks in worker thread by EddyTheCo · Pull Request #25 · amarula/libcppconnman · GitHub
Skip to content
Callbacks in worker thread#25

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

EddyTheCo
merged 14 commits into

from

Apr 13, 2026
 Merged


Callbacks in worker thread
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
1c74e34

Fix clang warnings


EddyTheCo Jan 1, 2026
ccf105e

CMakeLists: Remove unused includes


EddyTheCo Apr 1, 2026
6718a47

gconnman_serv_test: Wired can not be removed


EddyTheCo Apr 1, 2026
0cc47de

.gitignore: Ignore CMakeLists.txt.user


EddyTheCo Mar 18, 2026
0cc9899

Proxy: remove passing proxy member in methods


EddyTheCo Jan 7, 2026
09acff0

gproxy.hpp: Reuse callMethod


EddyTheCo Mar 20, 2026
b5f2caf

tests: Add check thread id of callbacks


EddyTheCo Mar 20, 2026
6c6fdd8

gdbus: Add thread default context


EddyTheCo Mar 20, 2026
4c2c5d0

gproxy: use g_main_context_invoke in proxy callMethod


EddyTheCo Mar 18, 2026
c194530

gdbus: Expose stop method


EddyTheCo Apr 13, 2026
f9ca6ad

connman: Make explicit the destruction order


EddyTheCo Apr 13, 2026
6cf4b20

gproxy.hpp: Initialize the glib proxy on worker thread


EddyTheCo Apr 1, 2026
108d847

gconnman_manager.cpp: Connect signals in worker thread


EddyTheCo Apr 1, 2026
2d686e2

gconnman_agent: Register object in worker thread


EddyTheCo Apr 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user

2 changes: 0 additions & 2 deletions
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 add_subdirectory(tests)
 endif(BUILD_TESTS)
 if(BUILD_EXAMPLES)
 include(CTest)
 add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
 if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 )
 set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
 include(CPack)
 include(CPackIFW)
 cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down

29 changes: 14 additions & 15 deletions
examples/connmanctl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
 bool connecting = false;
 Connman connman;
 const auto manager = connman.manager();
 manager->onRequestInputPassphrase([&](auto service) -> auto {
 manager->onRequestInputPassphrase([&](const auto& service) -> auto {
 const auto name = service->properties().getName();

 std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
 }
 }
 // Trim whitespace
 line.erase(line.begin(),
 std::find_if(line.begin(), line.end(), [](int character) {
 line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
 return std::isspace(character) == 0;
 }));
 line.erase(std::find_if(line.rbegin(), line.rend(),
 [](int character) {
 return std::isspace(character) == 0;
 })
 line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
 .base(),
 line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
 << service->objPath() << "\n";
 }
 } else {
 auto iterator = std::find_if(
 services.begin(), services.end(),
 [&arg](const auto& service) {
 auto iterator = std::ranges::find_if(
 services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
 }
 const bool connect = (cmd == "connect");
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
 continue;
 }
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
 }
 std::cout << "Exiting.\n";
 return 0;
}
}

4 changes: 2 additions & 2 deletions
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
 GDBusConnection *connection_{nullptr};
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(GDBusConnection *connection,
 const std::string &path = std::string());
 explicit Agent(DBus *dbus, const std::string &path = std::string());

 using RequestInputCallback =
 std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down

2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gconnman.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
 auto operator=(const Connman&) -> Connman& = delete;
 Connman(Connman&&) = delete;
 auto operator=(Connman&&) -> Connman& = delete;
 ~Connman() { dbus_.reset(); }
 ~Connman();

 [[nodiscard]] auto clock() const { return clock_; }
 [[nodiscard]] auto manager() const { return manager_; }
Expand Down

4 changes: 3 additions & 1 deletion
include/amarula/dbus/connman/gmanager.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
 void onTechnologiesChanged(OnTechListChangedCallback callback);
 void onServicesChanged(OnServListChangedCallback callback);

 auto internalAgentPath() const -> std::string { return agent_->path_; };
 [[nodiscard]] auto internalAgentPath() const -> std::string {
 return agent_->path_;
 };

 private:
 enum class InputType : std::uint8_t {
Expand Down

3 changes: 3 additions & 0 deletions
include/amarula/dbus/gdbus.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
 unsigned int pending_calls_{0};
 GDBusConnection* connection_ = nullptr;
 GMainLoop* loop_{nullptr};
 GMainContext* ctx_{nullptr};

 static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
 void start();
 void onAnyAsyncDone();
 void onAnyAsyncStart();
 void stop();

 [[nodiscard]] auto connection() const { return connection_; }
 [[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G

164 changes: 132 additions & 32 deletions
include/amarula/dbus/gproxy.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 }

 protected:
 template <typename Callback>
 void connectSignal(const std::string& signal_name, Callback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string signal_name;
 Callback callback;
 gpointer user_data;
 };

 auto* data = new Data{proxy_, signal_name, callback, user_data};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_signal_connect(data->proxy, data->signal_name.c_str(),
 G_CALLBACK(data->callback), data->user_data);

 return G_SOURCE_REMOVE;
 },
 data,
 [](gpointer user_data) { delete static_cast<Data*>(user_data); });
 }

 void updateProperties(GVariant* properties) {
 GVariantIter* iter = g_variant_iter_new(properties);
 GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

 void getProperties(PropertiesCallback callback = nullptr) {
 auto data = prepareCallback(std::move(callback));
 callMethod(proxy_, nullptr, "GetProperties", nullptr,
 callMethod(nullptr, "GetProperties", nullptr,
 &DBusProxy::get_property_cb, data.release());
 }

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 dbus_->onAnyAsyncDone();
 }

 explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
 const gchar* interface_name)
 explicit DBusProxy(DBus* dbus, const std::string& name,
 const std::string& obj_path,
 const std::string& interface_name)
 : dbus_{dbus} {
 GError* err = nullptr;

 proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
 G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
 obj_path, interface_name, nullptr, &err);
 if (proxy_ == nullptr) {
 std::string const msg =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 throw std::runtime_error(msg);
 struct Data {
 DBusProxy* proxy;
 std::string name;
 std::string obj_path;
 std::string interface_name;
 std::mutex mtx;
 std::condition_variable cv;
 bool done{false};
 std::string error;
 };

 auto data = Data{this, name, obj_path, interface_name};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_HIGH,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 GError* err = nullptr;

 data->proxy->proxy_ = g_dbus_proxy_new_sync(
 data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
 nullptr, data->name.c_str(), data->obj_path.c_str(),
 data->interface_name.c_str(), nullptr, &err);

 if (data->proxy->proxy_ == nullptr) {
 data->error =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 } else {
 g_signal_connect(
 data->proxy->proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 data->proxy);
 }

 return G_SOURCE_REMOVE;
 },
 &data,
 [](gpointer user_data) {
 auto* data = static_cast<Data*>(user_data);
 {
 std::lock_guard<std::mutex> const lock(data->mtx);
 data->done = true;
 }
 data->cv.notify_all();
 });
 {
 std::unique_lock<std::mutex> lock(data.mtx);
 data.cv.wait(lock, [&] { return data.done; });
 }

 if (!data.error.empty()) {
 throw std::runtime_error(data.error);
 }
 g_signal_connect(proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 this);
 }

 template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 self->template executeCallBack<PropertiesSetCallback>(counter, success);
 }

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
 GVariant* arg_value, GCancellable* cancellable,
 GAsyncReadyCallback callback, gpointer user_data
 void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
 gpointer user_data

 ) {
 std::array<GVariant*, 2> tuple_elements{
 g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

 GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
 g_dbus_proxy_call(proxy, "SetProperty", parameters,
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
 user_data);
 }

 static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
 const gchar* arg_name, GVariant* parameters,
 GAsyncReadyCallback callback, gpointer user_data) {
 g_dbus_proxy_call(
 proxy, arg_name,
 (parameters != nullptr) ? parameters
 : g_variant_new_tuple(nullptr, 0),
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
 callMethod(cancellable, "SetProperty", parameters, callback, user_data);
 }

 void callMethod(GCancellable* cancellable, const std::string& arg_name,
 GVariant* parameters, GAsyncReadyCallback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string arg_name;
 GVariant* parameters;
 GCancellable* cancellable;
 GAsyncReadyCallback callback;
 gpointer user_data;
 };

 auto data = std::make_unique<Data>(
 Data{proxy_, arg_name,
 (parameters != nullptr)
 ? g_variant_ref_sink(parameters)
 : g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
 (cancellable != nullptr)
 ? static_cast<GCancellable*>(g_object_ref(cancellable))
 : nullptr,
 callback, user_data});

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
 data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
 data->cancellable, data->callback,
 data->user_data);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data*>(user_data));
 g_variant_unref(data->parameters);
 if (data->cancellable != nullptr) {
 g_object_unref(data->cancellable);
 }
 });
 }
};

Expand Down

7 changes: 7 additions & 0 deletions
src/dbus/gconnman.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
 clock_->getProperties();
}

Connman::~Connman() {
 dbus_->stop();
 manager_.reset();
 clock_.reset();
 dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Callbacks in worker thread by EddyTheCo · Pull Request #25 · amarula/libcppconnman · GitHub
Skip to content
Callbacks in worker thread#25

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

EddyTheCo
merged 14 commits into

from

Apr 13, 2026
 Merged


Callbacks in worker thread
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
1c74e34

Fix clang warnings


EddyTheCo Jan 1, 2026
ccf105e

CMakeLists: Remove unused includes


EddyTheCo Apr 1, 2026
6718a47

gconnman_serv_test: Wired can not be removed


EddyTheCo Apr 1, 2026
0cc47de

.gitignore: Ignore CMakeLists.txt.user


EddyTheCo Mar 18, 2026
0cc9899

Proxy: remove passing proxy member in methods


EddyTheCo Jan 7, 2026
09acff0

gproxy.hpp: Reuse callMethod


EddyTheCo Mar 20, 2026
b5f2caf

tests: Add check thread id of callbacks


EddyTheCo Mar 20, 2026
6c6fdd8

gdbus: Add thread default context


EddyTheCo Mar 20, 2026
4c2c5d0

gproxy: use g_main_context_invoke in proxy callMethod


EddyTheCo Mar 18, 2026
c194530

gdbus: Expose stop method


EddyTheCo Apr 13, 2026
f9ca6ad

connman: Make explicit the destruction order


EddyTheCo Apr 13, 2026
6cf4b20

gproxy.hpp: Initialize the glib proxy on worker thread


EddyTheCo Apr 1, 2026
108d847

gconnman_manager.cpp: Connect signals in worker thread


EddyTheCo Apr 1, 2026
2d686e2

gconnman_agent: Register object in worker thread


EddyTheCo Apr 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,4 @@ build*
doc
tags
CMakeUserPresets.json
CMakeLists.txt.user

2 changes: 0 additions & 2 deletions
CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 add_subdirectory(tests)
 endif(BUILD_TESTS)
 if(BUILD_EXAMPLES)
 include(CTest)
 add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
 if(BUILD_DOCS)
Expand All@@ -106,7 +105,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 )
 set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
 include(CPack)
 include(CPackIFW)
 cpack_add_component(${PROJECT_NAME})
endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

Expand Down

29 changes: 14 additions & 15 deletions
examples/connmanctl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
#include <condition_variable>
#include <iostream>
#include <mutex>
#include <ranges>
#include <sstream>
#include <string>

Expand All@@ -19,7 +20,7 @@ auto main() -> int {
 bool connecting = false;
 Connman connman;
 const auto manager = connman.manager();
 manager->onRequestInputPassphrase([&](auto service) -> auto {
 manager->onRequestInputPassphrase([&](const auto& service) -> auto {
 const auto name = service->properties().getName();

 std::string passphrase;
Expand All@@ -46,14 +47,13 @@ auto main() -> int {
 }
 }
 // Trim whitespace
 line.erase(line.begin(),
 std::find_if(line.begin(), line.end(), [](int character) {
 line.erase(line.begin(), std::ranges::find_if(line, [](int character) {
 return std::isspace(character) == 0;
 }));
 line.erase(std::find_if(line.rbegin(), line.rend(),
 [](int character) {
 return std::isspace(character) == 0;
 })
 line.erase(std::ranges::find_if(std::ranges::reverse_view(line),
[](int character) {
return std::isspace(character) == 0;
})
 .base(),
 line.end());

Expand DownExpand Up@@ -118,9 +118,8 @@ auto main() -> int {
 << service->objPath() << "\n";
 }
 } else {
 auto iterator = std::find_if(
 services.begin(), services.end(),
 [&arg](const auto& service) {
 auto iterator = std::ranges::find_if(
 services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -225,8 +224,8 @@ auto main() -> int {
 }
 const bool connect = (cmd == "connect");
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -279,8 +278,8 @@ auto main() -> int {
 continue;
 }
 const auto services = manager->services();
 auto iterator = std::find_if(
services.begin(), services.end(), [&arg](const auto& service) {
 auto iterator =
std::ranges::find_if(services, [&arg](const auto& service) {
 return service->objPath() == arg ||
 service->properties().getName() == arg;
 });
Expand DownExpand Up@@ -311,4 +310,4 @@ auto main() -> int {
 }
 std::cout << "Exiting.\n";
 return 0;
}
}

4 changes: 2 additions & 2 deletions
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#include <gio/gio.h>
#include <glib.h>

#include <amarula/dbus/gdbus.hpp>
#include <functional>
#include <string>
#include <utility>
Expand All@@ -15,8 +16,7 @@ class Agent {
 GDBusConnection *connection_{nullptr};
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(GDBusConnection *connection,
 const std::string &path = std::string());
 explicit Agent(DBus *dbus, const std::string &path = std::string());

 using RequestInputCallback =
 std::function<GVariant *(const gchar *service, GVariant *fields)>;
Expand Down

2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gconnman.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ class Connman {
 auto operator=(const Connman&) -> Connman& = delete;
 Connman(Connman&&) = delete;
 auto operator=(Connman&&) -> Connman& = delete;
 ~Connman() { dbus_.reset(); }
 ~Connman();

 [[nodiscard]] auto clock() const { return clock_; }
 [[nodiscard]] auto manager() const { return manager_; }
Expand Down

4 changes: 3 additions & 1 deletion
include/amarula/dbus/connman/gmanager.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,9 @@ class Manager : public DBusProxy<ManaProperties> {
 void onTechnologiesChanged(OnTechListChangedCallback callback);
 void onServicesChanged(OnServListChangedCallback callback);

 auto internalAgentPath() const -> std::string { return agent_->path_; };
 [[nodiscard]] auto internalAgentPath() const -> std::string {
 return agent_->path_;
 };

 private:
 enum class InputType : std::uint8_t {
Expand Down

3 changes: 3 additions & 0 deletions
include/amarula/dbus/gdbus.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ class DBus {
 unsigned int pending_calls_{0};
 GDBusConnection* connection_ = nullptr;
 GMainLoop* loop_{nullptr};
 GMainContext* ctx_{nullptr};

 static auto on_loop_started(gpointer user_data) -> gboolean;

Expand All@@ -33,8 +34,10 @@ class DBus {
 void start();
 void onAnyAsyncDone();
 void onAnyAsyncStart();
 void stop();

 [[nodiscard]] auto connection() const { return connection_; }
 [[nodiscard]] auto context() { return ctx_; }
};

} // namespace Amarula::DBus::G

164 changes: 132 additions & 32 deletions
include/amarula/dbus/gproxy.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,32 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 }

 protected:
 template <typename Callback>
 void connectSignal(const std::string& signal_name, Callback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string signal_name;
 Callback callback;
 gpointer user_data;
 };

 auto* data = new Data{proxy_, signal_name, callback, user_data};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_signal_connect(data->proxy, data->signal_name.c_str(),
 G_CALLBACK(data->callback), data->user_data);

 return G_SOURCE_REMOVE;
 },
 data,
 [](gpointer user_data) { delete static_cast<Data*>(user_data); });
 }

 void updateProperties(GVariant* properties) {
 GVariantIter* iter = g_variant_iter_new(properties);
 GVariant* prop = nullptr;
Expand DownExpand Up@@ -135,7 +161,7 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {

 void getProperties(PropertiesCallback callback = nullptr) {
 auto data = prepareCallback(std::move(callback));
 callMethod(proxy_, nullptr, "GetProperties", nullptr,
 callMethod(nullptr, "GetProperties", nullptr,
 &DBusProxy::get_property_cb, data.release());
 }

Expand DownExpand Up@@ -176,23 +202,65 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 dbus_->onAnyAsyncDone();
 }

 explicit DBusProxy(DBus* dbus, const gchar* name, const gchar* obj_path,
 const gchar* interface_name)
 explicit DBusProxy(DBus* dbus, const std::string& name,
 const std::string& obj_path,
 const std::string& interface_name)
 : dbus_{dbus} {
 GError* err = nullptr;

 proxy_ = g_dbus_proxy_new_sync(dbus_->connection(),
 G_DBUS_PROXY_FLAGS_NONE, nullptr, name,
 obj_path, interface_name, nullptr, &err);
 if (proxy_ == nullptr) {
 std::string const msg =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 throw std::runtime_error(msg);
 struct Data {
 DBusProxy* proxy;
 std::string name;
 std::string obj_path;
 std::string interface_name;
 std::mutex mtx;
 std::condition_variable cv;
 bool done{false};
 std::string error;
 };

 auto data = Data{this, name, obj_path, interface_name};

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_HIGH,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 GError* err = nullptr;

 data->proxy->proxy_ = g_dbus_proxy_new_sync(
 data->proxy->dbus_->connection(), G_DBUS_PROXY_FLAGS_NONE,
 nullptr, data->name.c_str(), data->obj_path.c_str(),
 data->interface_name.c_str(), nullptr, &err);

 if (data->proxy->proxy_ == nullptr) {
 data->error =
 "Failed to create proxy: " + std::string(err->message);
 g_error_free(err);
 } else {
 g_signal_connect(
 data->proxy->proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 data->proxy);
 }

 return G_SOURCE_REMOVE;
 },
 &data,
 [](gpointer user_data) {
 auto* data = static_cast<Data*>(user_data);
 {
 std::lock_guard<std::mutex> const lock(data->mtx);
 data->done = true;
 }
 data->cv.notify_all();
 });
 {
 std::unique_lock<std::mutex> lock(data.mtx);
 data.cv.wait(lock, [&] { return data.done; });
 }

 if (!data.error.empty()) {
 throw std::runtime_error(data.error);
 }
 g_signal_connect(proxy_, "g-signal::PropertyChanged",
 G_CALLBACK(&DBusProxy::on_properties_changed_cb),
 this);
 }

 template <typename T>
Expand DownExpand Up@@ -226,28 +294,60 @@ class DBusProxy : public std::enable_shared_from_this<DBusProxy<Properties>> {
 self->template executeCallBack<PropertiesSetCallback>(counter, success);
 }

static void setProperty(GDBusProxy* proxy, const gchar* arg_name,
 GVariant* arg_value, GCancellable* cancellable,
 GAsyncReadyCallback callback, gpointer user_data
 void setProperty(const gchar* arg_name, GVariant* arg_value,
GCancellable* cancellable, GAsyncReadyCallback callback,
 gpointer user_data

 ) {
 std::array<GVariant*, 2> tuple_elements{
 g_variant_new_string(arg_name), g_variant_new_variant(arg_value)};

 GVariant* parameters = g_variant_new_tuple(tuple_elements.data(), 2);
 g_dbus_proxy_call(proxy, "SetProperty", parameters,
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback,
 user_data);
 }

 static void callMethod(GDBusProxy* proxy, GCancellable* cancellable,
 const gchar* arg_name, GVariant* parameters,
 GAsyncReadyCallback callback, gpointer user_data) {
 g_dbus_proxy_call(
 proxy, arg_name,
 (parameters != nullptr) ? parameters
 : g_variant_new_tuple(nullptr, 0),
 G_DBUS_CALL_FLAGS_NONE, -1, cancellable, callback, user_data);
 callMethod(cancellable, "SetProperty", parameters, callback, user_data);
 }

 void callMethod(GCancellable* cancellable, const std::string& arg_name,
 GVariant* parameters, GAsyncReadyCallback callback,
 gpointer user_data) {
 struct Data {
 GDBusProxy* proxy;
 std::string arg_name;
 GVariant* parameters;
 GCancellable* cancellable;
 GAsyncReadyCallback callback;
 gpointer user_data;
 };

 auto data = std::make_unique<Data>(
 Data{proxy_, arg_name,
 (parameters != nullptr)
 ? g_variant_ref_sink(parameters)
 : g_variant_ref_sink(g_variant_new_tuple(nullptr, 0)),
 (cancellable != nullptr)
 ? static_cast<GCancellable*>(g_object_ref(cancellable))
 : nullptr,
 callback, user_data});

 g_main_context_invoke_full(
 dbus_->context(), G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto* data = static_cast<Data*>(user_data);

 g_dbus_proxy_call(data->proxy, data->arg_name.c_str(),
 data->parameters, G_DBUS_CALL_FLAGS_NONE, -1,
 data->cancellable, data->callback,
 data->user_data);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data*>(user_data));
 g_variant_unref(data->parameters);
 if (data->cancellable != nullptr) {
 g_object_unref(data->cancellable);
 }
 });
 }
};

Expand Down

7 changes: 7 additions & 0 deletions
src/dbus/gconnman.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,11 @@ Connman::Connman()
 clock_->getProperties();
}

Connman::~Connman() {
 dbus_->stop();
 manager_.reset();
 clock_.reset();
 dbus_.reset();
}

} // namespace Amarula::DBus::G::Connman
Loading
Loading