Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-12 08:28:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

startup: Add spinloop until daemon is ready

Browse source
This commit is contained in:
DashieTM 2024-06-04 23:37:15 +02:00
parent 6a605f1d08
commit 918bf9c70a
7 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.direnv/flake-profile
View file

@ -1 +1 @@
flake-profile-10-link flake-profile-11-link

1
.direnv/flake-profile-10-link
View file

@ -1 +0,0 @@
/nix/store/q1w89c69h80a7vwlbqnsa396203k6hff-nix-shell-env

1
.direnv/flake-profile-11-link Symbolic link
View file

@ -0,0 +1 @@
/nix/store/51yb1yhqssknlmxvvscvj0cqbvs0z915-nix-shell-env

8
Cargo.lock generated
View file

@ -926,9 +926,9 @@ dependencies = [
[[package]] [[package]]
name = "re_set-lib" name = "re_set-lib"
version = "5.2.1" version = "5.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01fb110dc5087cdb0d8df799c3855c13e4ecb41f987e9691bf3d101c2dad1b3a" checksum = "77b4e5846cc4e5f6c51b60b16c2d51f282b5c407238b2e7077f6a0352b65d6cf"
dependencies = [ dependencies = [
"dbus", "dbus",
"dbus-crossroads", "dbus-crossroads",
@ -968,9 +968,9 @@ dependencies = [
[[package]] [[package]]
name = "reset_daemon" name = "reset_daemon"
version = "1.5.0" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e555b347b8b0b67081aeb570096338eae68a8db4b877661254ce17c59e5134dd" checksum = "8cf329c1f14918f24d8d8f1674a16f5103208682f97b5d2bf1621b09c563c9cb"
dependencies = [ dependencies = [
"crossbeam", "crossbeam",
"dbus", "dbus",

2
Cargo.toml
View file

@ -7,7 +7,7 @@ repository = "https://github.com/Xetibo/ReSet"
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
[dependencies] [dependencies]
reset_daemon = "1.5.0" reset_daemon = "2.1.0"
re_set-lib = "5.2.1" re_set-lib = "5.2.1"
# re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" } # re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" }
adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] } adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }

2
flake.nix
View file

@ -37,6 +37,8 @@
# (rust-bin.selectLatestNightlyWith # (rust-bin.selectLatestNightlyWith
# (toolchain: toolchain.default)) # (toolchain: toolchain.default))
rust-bin.nightly."2024-05-10".default rust-bin.nightly."2024-05-10".default
rust-analyzer
clippy
]; ];
}; };

9
src/main.rs
View file

@ -1,3 +1,6 @@
use std::hint::{self};
use std::sync::atomic::AtomicBool;
use std::sync::Arc;
use std::thread; use std::thread;
use std::time::Duration; use std::time::Duration;
@ -71,8 +74,12 @@ async fn daemon_check() {
let res: Result<(), Error> = proxy.method_call(BASE, "RegisterClient", ("ReSet",)); let res: Result<(), Error> = proxy.method_call(BASE, "RegisterClient", ("ReSet",));
res res
}); });
let ready = Arc::new(AtomicBool::new(false));
let res = handle.join(); let res = handle.join();
if res.unwrap().is_err() { if res.unwrap().is_err() {
run_daemon().await; run_daemon(Some(ready.clone())).await;
}
while !ready.load(std::sync::atomic::Ordering::SeqCst) {
hint::spin_loop();
} }
} }