hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix. Potential dead lock, interval.tick() & named pipe (#7162)

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-02-17 16:35:38 +08:00 committed by GitHub
parent d7dcb5feab
commit e942c80afb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui_interface.rs
View File

@ -1044,7 +1044,9 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
loop {
if let Ok(mut c) = ipc::connect(1000, "").await {
let mut timer = time::interval(time::Duration::from_secs(1));
const TIMER_OUT: time::Duration = time::Duration::from_secs(1);
let mut timer = time::interval(TIMER_OUT);
let mut last_timer = time::Instant::now() - TIMER_OUT * 2;
loop {
tokio::select! {
res = c.next() => {
@ -1112,6 +1114,12 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
allow_err!(c.send(&data).await);
}
_ = timer.tick() => {
let now = time::Instant::now();
if last_timer.elapsed() < TIMER_OUT {
continue;
}
last_timer = now;
c.send(&ipc::Data::OnlineStatus(None)).await.ok();
c.send(&ipc::Data::Options(None)).await.ok();
c.send(&ipc::Data::Config(("id".to_owned(), None))).await.ok();