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

more aggressively skip perform API when threads are closing

Browse Source
This commit is contained in:
holger krekel
2019-07-16 12:57:19 +02:00
parent c652bae68a
commit 0e80ce9c39
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/src/deltachat/account.py
View File

@@ -341,8 +341,9 @@ class Account(object):
def shutdown(self, wait=True): def shutdown(self, wait=True):
""" stop threads and close and remove underlying dc_context and callbacks. """ """ stop threads and close and remove underlying dc_context and callbacks. """
if hasattr(self, "_dc_context"): if hasattr(self, "_dc_context"):
self.stop_threads(wait=False) # to interrupt idle and tell python threads to stop
lib.dc_close(self._dc_context) lib.dc_close(self._dc_context)
self.stop_threads(wait=wait) self.stop_threads(wait=wait) # to wait for threads
deltachat.clear_context_callback(self._dc_context) deltachat.clear_context_callback(self._dc_context)
del self._dc_context del self._dc_context
@@ -392,12 +393,18 @@ class IOThreads:
def imap_thread_run(self): def imap_thread_run(self):
while not self._thread_quitflag: while not self._thread_quitflag:
lib.dc_perform_imap_jobs(self._dc_context) lib.dc_perform_imap_jobs(self._dc_context)
if self._thread_quitflag:
break
lib.dc_perform_imap_fetch(self._dc_context) lib.dc_perform_imap_fetch(self._dc_context)
if self._thread_quitflag:
break
lib.dc_perform_imap_idle(self._dc_context) lib.dc_perform_imap_idle(self._dc_context)
def smtp_thread_run(self): def smtp_thread_run(self):
while not self._thread_quitflag: while not self._thread_quitflag:
lib.dc_perform_smtp_jobs(self._dc_context) lib.dc_perform_smtp_jobs(self._dc_context)
if self._thread_quitflag:
break
lib.dc_perform_smtp_idle(self._dc_context) lib.dc_perform_smtp_idle(self._dc_context)

2
src/imap.rs
View File

@@ -468,7 +468,7 @@ impl Imap {
fn unsetup_handle(&self, context: &Context) { fn unsetup_handle(&self, context: &Context) {
info!(context, 0, "IMAP unsetup_handle starts"); info!(context, 0, "IMAP unsetup_handle starts");
self.interrupt_idle(); // self.interrupt_idle();
let session = self.session.lock().unwrap().0.take(); let session = self.session.lock().unwrap().0.take();
if session.is_some() { if session.is_some() {
match session.unwrap().close() { match session.unwrap().close() {