Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-21 15:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #935 from deltachat/address_idle_race

Browse Source 
address last(?) idle race condition heuristically
This commit is contained in:
björn petersen
2019-12-01 19:26:40 +01:00
committed by GitHub
parent 7223a36a71 2423d197cd
commit dfe7dfcfd3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/imap.rs
View File

@@ -972,7 +972,7 @@ impl Imap {
}) })
} }
pub fn interrupt_idle(&self) { pub fn interrupt_idle(&self, context: &Context) {
task::block_on(async move { task::block_on(async move {
let mut interrupt: Option<stop_token::StopSource> = self.interrupt.lock().await.take(); let mut interrupt: Option<stop_token::StopSource> = self.interrupt.lock().await.take();
if interrupt.is_none() { if interrupt.is_none() {
@@ -984,7 +984,12 @@ impl Imap {
} }
// let's manually drop the StopSource // let's manually drop the StopSource
if interrupt.is_some() { if interrupt.is_some() {
eprintln!("low-level: dropping stop-source to interrupt idle"); // the imap thread provided us a stop token but might
// not have entered idle_wait yet, give it some time
// for that to happen. XXX handle this without extra wait
// https://github.com/deltachat/deltachat-core-rust/issues/925
std::thread::sleep(Duration::from_millis(200));
info!(context, "low-level: dropping stop-source to interrupt idle");
std::mem::drop(interrupt) std::mem::drop(interrupt)
} }
}); });

2
src/job_thread.rs
View File

@@ -63,7 +63,7 @@ impl JobThread {
info!(context, "Interrupting {}-IDLE...", self.name); info!(context, "Interrupting {}-IDLE...", self.name);
self.imap.interrupt_idle(); self.imap.interrupt_idle(context);
let &(ref lock, ref cvar) = &*self.state.clone(); let &(ref lock, ref cvar) = &*self.state.clone();
let mut state = lock.lock().unwrap(); let mut state = lock.lock().unwrap();