Use ThreadPool for dbus

The `zbus` blocking API just wraps the async API with `block_on`, so we
may as well use our own executor.

Author: ids1024

Cargo.lock

@@ -67,6 +67,7 @@ reis = { version = "0.5", features = ["calloop"] }
 clap_lex = "0.7"
 parking_lot = "0.12.3"
 futures-executor = { version = "0.3.31", features = ["thread-pool"] }
+futures-util = "0.3.31"
 
 [dependencies.id_tree]
 branch = "feature/copy_clone"

Cargo.toml

@@ -1,15 +1,20 @@
 use crate::state::{BackendData, Common, State};
 use anyhow::{Context, Result};
 use calloop::{InsertError, LoopHandle, RegistrationToken};
+use futures_executor::{block_on, ThreadPool};
+use futures_util::stream::StreamExt;
 use std::collections::HashMap;
 use zbus::blocking::{fdo::DBusProxy, Connection};
 
 mod power;
 
-pub fn init(evlh: &LoopHandle<'static, State>) -> Result<Vec<RegistrationToken>> {
+pub fn init(
+    evlh: &LoopHandle<'static, State>,
+    executor: &ThreadPool,
+) -> Result<Vec<RegistrationToken>> {
     let mut tokens = Vec::new();
 
-    match power::init() {
+    match block_on(power::init()) {
         Ok(power_daemon) => {
             let (tx, rx) = calloop::channel::channel();
 
@@ -35,29 +40,17 @@ pub fn init(evlh: &LoopHandle<'static, State>) -> Result<Vec<RegistrationToken>>
                 .with_context(|| "Failed to add channel to event_loop")?;
 
             // start helper thread
-            let result = std::thread::Builder::new()
-                .name("system76-power-hotplug".to_string())
-                .spawn(move || {
-                    if let Ok(mut msg_iter) = power_daemon.receive_hot_plug_detect() {
-                        while let Some(msg) = msg_iter.next() {
-                            if tx.send(msg).is_err() {
-                                break;
-                            }
+            executor.spawn_ok(async move {
+                if let Ok(mut msg_iter) = power_daemon.receive_hot_plug_detect().await {
+                    while let Some(msg) = msg_iter.next().await {
+                        if tx.send(msg).is_err() {
+                            break;
                         }
                     }
-                })
-                .with_context(|| "Failed to start helper thread");
-
-            match result {
-                Ok(_handle) => {
-                    tokens.push(token);
-                    // detach thread
                 }
-                Err(err) => {
-                    evlh.remove(token);
-                    return Err(err);
-                }
-            }
+            });
+
+            tokens.push(token);
         }
         Err(err) => {
             tracing::info!(?err, "Failed to connect to com.system76.PowerDaemon");

src/dbus/mod.rs

@@ -18,7 +18,7 @@
 //!
 //! …consequently `zbus-xmlgen` did not generate code for the above interfaces.
 
-use zbus::blocking::Connection;
+use zbus::Connection;
 
 #[zbus::proxy(
     interface = "com.system76.PowerDaemon",
@@ -79,9 +79,9 @@ pub trait PowerDaemon {
     fn power_profile_switch(&self, profile: &str) -> zbus::Result<()>;
 }
 
-pub fn init() -> anyhow::Result<PowerDaemonProxyBlocking<'static>> {
-    let conn = Connection::system()?;
-    let proxy = PowerDaemonProxyBlocking::new(&conn)?;
-    proxy.0.introspect()?;
+pub async fn init() -> anyhow::Result<PowerDaemonProxy<'static>> {
+    let conn = Connection::system().await?;
+    let proxy = PowerDaemonProxy::new(&conn).await?;
+    proxy.0.introspect().await?;
     Ok(proxy)
 }

src/dbus/power.rs

@@ -592,7 +592,9 @@ impl State {
         );
         let workspace_state = WorkspaceState::new(dh, client_is_privileged);
 
-        if let Err(err) = crate::dbus::init(&handle) {
+        let async_executor = ThreadPool::builder().pool_size(1).create().unwrap();
+
+        if let Err(err) = crate::dbus::init(&handle, &async_executor) {
             tracing::warn!(?err, "Failed to initialize dbus handlers");
         }
 
@@ -608,7 +610,7 @@ impl State {
                 display_handle: dh.clone(),
                 event_loop_handle: handle,
                 event_loop_signal: signal,
-                async_executor: ThreadPool::builder().pool_size(1).create().unwrap(),
+                async_executor,
 
                 popups: PopupManager::default(),
                 shell,