gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use smol async for daemon and daemon-user

Browse Source
This commit is contained in:
Luke D. Jones
2022-06-06 14:20:34 +12:00
parent d4b2d2f403
commit de43a37e9e
6 changed files with 56 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon-user/Cargo.toml
View File

@@ -29,4 +29,4 @@ zbus = "^2.2"
zvariant = "^3.0"
zvariant_derive = "^3.0"
futures = { version = "0.3.19", features = ["executor", "thread-pool"] }
smol = "^1.2"

70
daemon-user/src/daemon.rs
View File

@@ -1,10 +1,10 @@
use futures::executor::ThreadPool;
use rog_dbus::RogDbusClientBlocking;
use rog_user::{
ctrl_anime::{CtrlAnime, CtrlAnimeInner},
user_config::*,
DBUS_NAME,
};
use smol::Executor;
use std::sync::Arc;
use std::sync::Mutex;
use zbus::Connection;
@@ -23,44 +23,48 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut config = UserConfig::new();
config.load_config()?;
let anime_config = UserAnimeConfig::load_config(config.active_anime)?;
let anime = anime_config.create_anime()?;
let anime_config = Arc::new(Mutex::new(anime_config));
let thread_pool = ThreadPool::new().unwrap();
let executor = Executor::new();
let early_return = Arc::new(AtomicBool::new(false));
thread_pool.spawn_ok(async move {
// Create server
let mut connection = Connection::session().await.unwrap();
connection.request_name(DBUS_NAME).await.unwrap();
// Set up the anime data and run loop/thread
if supported.anime_ctrl.0 {
let anime_config = UserAnimeConfig::load_config(config.active_anime)?;
let anime = anime_config.create_anime()?;
let anime_config = Arc::new(Mutex::new(anime_config));
// Set up the anime data and run loop/thread
if supported.anime_ctrl.0 {
// Inner behind mutex required for thread safety
let inner = Arc::new(Mutex::new(
CtrlAnimeInner::new(anime, client, early_return.clone()).unwrap(),
));
// Need new client object for dbus control part
let (client, _) = RogDbusClientBlocking::new().unwrap();
let anime_control =
CtrlAnime::new(anime_config, inner.clone(), client, early_return).unwrap();
anime_control.add_to_server(&mut connection).await;
loop {
if let Ok(inner) = inner.clone().try_lock() {
inner.run().ok();
executor
.spawn(async move {
// Create server
let mut connection = Connection::session().await.unwrap();
connection.request_name(DBUS_NAME).await.unwrap();
// Inner behind mutex required for thread safety
let inner = Arc::new(Mutex::new(
CtrlAnimeInner::new(anime, client, early_return.clone()).unwrap(),
));
// Need new client object for dbus control part
let (client, _) = RogDbusClientBlocking::new().unwrap();
let anime_control =
CtrlAnime::new(anime_config, inner.clone(), client, early_return).unwrap();
anime_control.add_to_server(&mut connection).await;
loop {
if let Ok(inner) = inner.clone().try_lock() {
inner.run().ok();
}
}
}
}
// future::ready(())
});
})
.detach();
}
// if supported.keyboard_led.per_key_led_mode {}
// if supported.keyboard_led.per_key_led_mode {
// executor
// .spawn(async move {
// //
// })
// .detach();
// }
loop {
std::thread::sleep(std::time::Duration::from_millis(1000));
// if let Err(err) = server.try_handle_next() {
// println!("{}", err);
// }
smol::block_on(executor.tick());
}
}