refactor(jobthread): safe and rusty

examples/repl/main.rs

@@ -186,9 +186,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_mvbox = std::thread::spawn(move || loop {
         while_running!({
-            unsafe { dc_perform_mvbox_fetch(&ctx.read().unwrap()) };
+            dc_perform_mvbox_fetch(&ctx.read().unwrap());
             while_running!({
-                unsafe { dc_perform_mvbox_idle(&ctx.read().unwrap()) };
+                dc_perform_mvbox_idle(&ctx.read().unwrap());
             });
         });
     });
@@ -196,9 +196,9 @@ fn start_threads(c: Arc<RwLock<Context>>) {
     let ctx = c.clone();
     let handle_sentbox = std::thread::spawn(move || loop {
         while_running!({
-            unsafe { dc_perform_sentbox_fetch(&ctx.read().unwrap()) };
+            dc_perform_sentbox_fetch(&ctx.read().unwrap());
             while_running!({
-                unsafe { dc_perform_sentbox_idle(&ctx.read().unwrap()) };
+                dc_perform_sentbox_idle(&ctx.read().unwrap());
             });
         });
     });

src/config.rs

@@ -107,12 +107,12 @@ impl Context {
             }
             Config::SentboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                unsafe { dc_interrupt_sentbox_idle(self) };
+                dc_interrupt_sentbox_idle(self);
                 ret
             }
             Config::MvboxWatch => {
                 let ret = self.sql.set_config(self, key, value);
-                unsafe { dc_interrupt_mvbox_idle(self) };
+                dc_interrupt_mvbox_idle(self);
                 ret
             }
             Config::Selfstatus => {

src/context.rs

@@ -4,13 +4,13 @@ use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::dc_job::*;
-use crate::dc_jobthread::*;
 use crate::dc_loginparam::*;
 use crate::dc_move::*;
 use crate::dc_msg::*;
 use crate::dc_receive_imf::*;
 use crate::dc_tools::*;
 use crate::imap::*;
+use crate::job_thread::JobThread;
 use crate::key::*;
 use crate::lot::Lot;
 use crate::param::Params;
@@ -30,8 +30,8 @@ pub struct Context {
     pub inbox: Arc<RwLock<Imap>>,
     pub perform_inbox_jobs_needed: Arc<RwLock<bool>>,
     pub probe_imap_network: Arc<RwLock<bool>>,
-    pub sentbox_thread: Arc<RwLock<dc_jobthread_t>>,
+    pub sentbox_thread: Arc<RwLock<JobThread>>,
-    pub mvbox_thread: Arc<RwLock<dc_jobthread_t>>,
+    pub mvbox_thread: Arc<RwLock<JobThread>>,
     pub smtp: Arc<Mutex<Smtp>>,
     pub smtp_state: Arc<(Mutex<SmtpState>, Condvar)>,
     pub oauth2_critical: Arc<Mutex<()>>,
@@ -143,7 +143,7 @@ pub fn dc_context_new(
         bob: Arc::new(RwLock::new(Default::default())),
         last_smeared_timestamp: Arc::new(RwLock::new(0)),
         cmdline_sel_chat_id: Arc::new(RwLock::new(0)),
-        sentbox_thread: Arc::new(RwLock::new(dc_jobthread_init(
+        sentbox_thread: Arc::new(RwLock::new(JobThread::new(
             "SENTBOX",
             "configured_sentbox_folder",
             Imap::new(
@@ -153,7 +153,7 @@ pub fn dc_context_new(
                 cb_receive_imf,
             ),
         ))),
-        mvbox_thread: Arc::new(RwLock::new(dc_jobthread_init(
+        mvbox_thread: Arc::new(RwLock::new(JobThread::new(
             "MVBOX",
             "configured_mvbox_folder",
             Imap::new(

src/dc_job.rs

@@ -11,7 +11,6 @@ use crate::constants::*;
 use crate::context::Context;
 use crate::dc_configure::*;
 use crate::dc_imex::*;
-use crate::dc_jobthread::*;
 use crate::dc_location::*;
 use crate::dc_loginparam::*;
 use crate::dc_mimefactory::*;
@@ -132,8 +131,18 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
         // - they can be re-executed one time AT_ONCE, but they are not save in the database for later execution
         if 900 == job.action || 910 == job.action {
             dc_job_kill_action(context, job.action);
-            dc_jobthread_suspend(context, &context.sentbox_thread.clone().read().unwrap(), 1);
+            &context
-            dc_jobthread_suspend(context, &context.mvbox_thread.clone().read().unwrap(), 1);
+                .sentbox_thread
+                .clone()
+                .read()
+                .unwrap()
+                .suspend(context);
+            &context
+                .mvbox_thread
+                .clone()
+                .read()
+                .unwrap()
+                .suspend(context);
             dc_suspend_smtp_thread(context, true);
         }
 
@@ -162,16 +171,18 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
             tries += 1
         }
         if 900 == job.action || 910 == job.action {
-            dc_jobthread_suspend(
+            context
-                context,
+                .sentbox_thread
-                &mut context.sentbox_thread.clone().read().unwrap(),
+                .clone()
-                0,
+                .read()
-            );
+                .unwrap()
-            dc_jobthread_suspend(
+                .unsuspend(context);
-                context,
+            context
-                &mut context.mvbox_thread.clone().read().unwrap(),
+                .mvbox_thread
-                0,
+                .clone()
-            );
+                .read()
+                .unwrap()
+                .unsuspend(context);
             dc_suspend_smtp_thread(context, false);
             break;
         } else if job.try_again == 2 {
@@ -795,9 +806,9 @@ pub fn dc_job_kill_action(context: &Context, action: libc::c_int) -> bool {
     .is_ok()
 }
 
-pub unsafe fn dc_perform_imap_fetch(context: &Context) {
+pub fn dc_perform_imap_fetch(context: &Context) {
     let inbox = context.inbox.read().unwrap();
-    let start = clock();
+    let start = std::time::Instant::now();
 
     if 0 == connect_to_inbox(context, &inbox) {
         return;
@@ -821,7 +832,7 @@ pub unsafe fn dc_perform_imap_fetch(context: &Context) {
         context,
         0,
         "INBOX-fetch done in {:.4} ms.",
-        clock().wrapping_sub(start) as libc::c_double * 1000.0f64 / 1000000 as libc::c_double,
+        start.elapsed().as_millis(),
     );
 }
 
@@ -842,61 +853,68 @@ pub fn dc_perform_imap_idle(context: &Context) {
     info!(context, 0, "INBOX-IDLE ended.");
 }
 
-pub unsafe fn dc_perform_mvbox_fetch(context: &Context) {
+pub fn dc_perform_mvbox_fetch(context: &Context) {
-    let use_network = context
-        .sql
-        .get_config_int(context, "mvbox_watch")
-        .unwrap_or_else(|| 1);
-    dc_jobthread_fetch(
-        context,
-        &mut context.mvbox_thread.clone().write().unwrap(),
-        use_network,
-    );
-}
-
-pub unsafe fn dc_perform_mvbox_idle(context: &Context) {
     let use_network = context
         .sql
         .get_config_int(context, "mvbox_watch")
         .unwrap_or_else(|| 1);
 
-    dc_jobthread_idle(
+    context
-        context,
+        .mvbox_thread
-        &context.mvbox_thread.clone().read().unwrap(),
+        .write()
-        use_network,
+        .unwrap()
-    );
+        .fetch(context, use_network == 1);
 }
 
-pub unsafe fn dc_interrupt_mvbox_idle(context: &Context) {
+pub fn dc_perform_mvbox_idle(context: &Context) {
-    dc_jobthread_interrupt_idle(context, &context.mvbox_thread.clone().read().unwrap());
+    let use_network = context
+        .sql
+        .get_config_int(context, "mvbox_watch")
+        .unwrap_or_else(|| 1);
+
+    context
+        .mvbox_thread
+        .read()
+        .unwrap()
+        .idle(context, use_network == 1);
 }
 
-pub unsafe fn dc_perform_sentbox_fetch(context: &Context) {
+pub fn dc_interrupt_mvbox_idle(context: &Context) {
+    context.mvbox_thread.read().unwrap().interrupt_idle(context);
+}
+
+pub fn dc_perform_sentbox_fetch(context: &Context) {
     let use_network = context
         .sql
         .get_config_int(context, "sentbox_watch")
         .unwrap_or_else(|| 1);
-    dc_jobthread_fetch(
+
-        context,
+    context
-        &mut context.sentbox_thread.clone().write().unwrap(),
+        .sentbox_thread
-        use_network,
+        .write()
-    );
+        .unwrap()
+        .fetch(context, use_network == 1);
 }
 
-pub unsafe fn dc_perform_sentbox_idle(context: &Context) {
+pub fn dc_perform_sentbox_idle(context: &Context) {
     let use_network = context
         .sql
         .get_config_int(context, "sentbox_watch")
         .unwrap_or_else(|| 1);
-    dc_jobthread_idle(
+
-        context,
+    context
-        &context.sentbox_thread.clone().read().unwrap(),
+        .sentbox_thread
-        use_network,
+        .read()
-    );
+        .unwrap()
+        .idle(context, use_network == 1);
 }
 
-pub unsafe fn dc_interrupt_sentbox_idle(context: &Context) {
+pub fn dc_interrupt_sentbox_idle(context: &Context) {
-    dc_jobthread_interrupt_idle(context, &context.sentbox_thread.clone().read().unwrap());
+    context
+        .sentbox_thread
+        .read()
+        .unwrap()
+        .interrupt_idle(context);
 }
 
 pub unsafe fn dc_perform_smtp_jobs(context: &Context) {

src/dc_jobthread.rs

@@ -1,209 +0,0 @@
-use std::sync::{Arc, Condvar, Mutex};
-
-use crate::context::Context;
-use crate::dc_configure::*;
-use crate::imap::Imap;
-use crate::x::*;
-
-#[repr(C)]
-pub struct dc_jobthread_t {
-    pub name: &'static str,
-    pub folder_config_name: &'static str,
-    pub imap: Imap,
-    pub state: Arc<(Mutex<JobState>, Condvar)>,
-}
-
-pub fn dc_jobthread_init(
-    name: &'static str,
-    folder_config_name: &'static str,
-    imap: Imap,
-) -> dc_jobthread_t {
-    dc_jobthread_t {
-        name,
-        folder_config_name,
-        imap,
-        state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct JobState {
-    idle: bool,
-    jobs_needed: i32,
-    suspended: i32,
-    using_handle: i32,
-}
-
-pub unsafe fn dc_jobthread_suspend(
-    context: &Context,
-    jobthread: &dc_jobthread_t,
-    suspend: libc::c_int,
-) {
-    if 0 != suspend {
-        info!(context, 0, "Suspending {}-thread.", jobthread.name,);
-        {
-            jobthread.state.0.lock().unwrap().suspended = 1;
-        }
-        dc_jobthread_interrupt_idle(context, jobthread);
-        loop {
-            let using_handle = jobthread.state.0.lock().unwrap().using_handle;
-            if using_handle == 0 {
-                return;
-            }
-            std::thread::sleep(std::time::Duration::from_micros(300 * 1000));
-        }
-    } else {
-        info!(context, 0, "Unsuspending {}-thread.", jobthread.name);
-
-        let &(ref lock, ref cvar) = &*jobthread.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        state.suspended = 0;
-        state.idle = true;
-        cvar.notify_one();
-    }
-}
-
-pub unsafe fn dc_jobthread_interrupt_idle(context: &Context, jobthread: &dc_jobthread_t) {
-    {
-        jobthread.state.0.lock().unwrap().jobs_needed = 1;
-    }
-
-    info!(context, 0, "Interrupting {}-IDLE...", jobthread.name);
-
-    jobthread.imap.interrupt_idle();
-
-    let &(ref lock, ref cvar) = &*jobthread.state.clone();
-    let mut state = lock.lock().unwrap();
-
-    state.idle = true;
-    cvar.notify_one();
-}
-
-pub unsafe fn dc_jobthread_fetch(
-    context: &Context,
-    jobthread: &mut dc_jobthread_t,
-    use_network: libc::c_int,
-) {
-    let start;
-
-    {
-        let &(ref lock, _) = &*jobthread.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        if 0 != state.suspended {
-            return;
-        }
-
-        state.using_handle = 1;
-    }
-
-    if 0 != use_network {
-        start = clock();
-        if !(0 == connect_to_imap(context, jobthread)) {
-            info!(context, 0, "{}-fetch started...", jobthread.name);
-            jobthread.imap.fetch(context);
-
-            if jobthread.imap.should_reconnect() {
-                info!(
-                    context,
-                    0, "{}-fetch aborted, starting over...", jobthread.name,
-                );
-                jobthread.imap.fetch(context);
-            }
-            info!(
-                context,
-                0,
-                "{}-fetch done in {:.3} ms.",
-                jobthread.name,
-                clock().wrapping_sub(start) as f64 / 1000.0,
-            );
-        }
-    }
-
-    jobthread.state.0.lock().unwrap().using_handle = 0;
-}
-
-/* ******************************************************************************
- * the typical fetch, idle, interrupt-idle
- ******************************************************************************/
-
-unsafe fn connect_to_imap(context: &Context, jobthread: &dc_jobthread_t) -> libc::c_int {
-    if jobthread.imap.is_connected() {
-        return 1;
-    }
-
-    let mut ret_connected = dc_connect_to_configured_imap(context, &jobthread.imap);
-
-    if !(0 == ret_connected) {
-        if context
-            .sql
-            .get_config_int(context, "folders_configured")
-            .unwrap_or_default()
-            < 3
-        {
-            jobthread.imap.configure_folders(context, 0x1);
-        }
-
-        if let Some(mvbox_name) = context
-            .sql
-            .get_config(context, jobthread.folder_config_name)
-        {
-            jobthread.imap.set_watch_folder(mvbox_name);
-        } else {
-            jobthread.imap.disconnect(context);
-            ret_connected = 0;
-        }
-    }
-
-    ret_connected
-}
-
-pub unsafe fn dc_jobthread_idle(
-    context: &Context,
-    jobthread: &dc_jobthread_t,
-    use_network: libc::c_int,
-) {
-    {
-        let &(ref lock, ref cvar) = &*jobthread.state.clone();
-        let mut state = lock.lock().unwrap();
-
-        if 0 != state.jobs_needed {
-            info!(
-                context,
-                0,
-                "{}-IDLE will not be started as it was interrupted while not ideling.",
-                jobthread.name,
-            );
-            state.jobs_needed = 0;
-            return;
-        }
-
-        if 0 != state.suspended {
-            while !state.idle {
-                state = cvar.wait(state).unwrap();
-            }
-            state.idle = false;
-            return;
-        }
-
-        state.using_handle = 1;
-
-        if 0 == use_network {
-            state.using_handle = 0;
-
-            while !state.idle {
-                state = cvar.wait(state).unwrap();
-            }
-            state.idle = false;
-            return;
-        }
-    }
-
-    connect_to_imap(context, jobthread);
-    info!(context, 0, "{}-IDLE started...", jobthread.name,);
-    jobthread.imap.idle(context);
-    info!(context, 0, "{}-IDLE ended.", jobthread.name);
-
-    jobthread.state.0.lock().unwrap().using_handle = 0;
-}

src/imap.rs

@@ -25,7 +25,6 @@ const PREFETCH_FLAGS: &str = "(UID ENVELOPE)";
 const BODY_FLAGS: &str = "(FLAGS BODY.PEEK[])";
 const FETCH_FLAGS: &str = "(FLAGS)";
 
-#[repr(C)]
 pub struct Imap {
     config: Arc<RwLock<ImapConfig>>,
     watch: Arc<(Mutex<bool>, Condvar)>,

src/job_thread.rs

@@ -0,0 +1,181 @@
+use std::sync::{Arc, Condvar, Mutex};
+
+use crate::context::Context;
+use crate::dc_configure::*;
+use crate::imap::Imap;
+
+pub struct JobThread {
+    pub name: &'static str,
+    pub folder_config_name: &'static str,
+    pub imap: Imap,
+    pub state: Arc<(Mutex<JobState>, Condvar)>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct JobState {
+    idle: bool,
+    jobs_needed: i32,
+    suspended: bool,
+    using_handle: bool,
+}
+
+impl JobThread {
+    pub fn new(name: &'static str, folder_config_name: &'static str, imap: Imap) -> Self {
+        JobThread {
+            name,
+            folder_config_name,
+            imap,
+            state: Arc::new((Mutex::new(Default::default()), Condvar::new())),
+        }
+    }
+
+    pub fn suspend(&self, context: &Context) {
+        info!(context, 0, "Suspending {}-thread.", self.name,);
+        {
+            self.state.0.lock().unwrap().suspended = true;
+        }
+        self.interrupt_idle(context);
+        loop {
+            let using_handle = self.state.0.lock().unwrap().using_handle;
+            if !using_handle {
+                return;
+            }
+            std::thread::sleep(std::time::Duration::from_micros(300 * 1000));
+        }
+    }
+
+    pub fn unsuspend(&self, context: &Context) {
+        info!(context, 0, "Unsuspending {}-thread.", self.name);
+
+        let &(ref lock, ref cvar) = &*self.state.clone();
+        let mut state = lock.lock().unwrap();
+
+        state.suspended = false;
+        state.idle = true;
+        cvar.notify_one();
+    }
+
+    pub fn interrupt_idle(&self, context: &Context) {
+        {
+            self.state.0.lock().unwrap().jobs_needed = 1;
+        }
+
+        info!(context, 0, "Interrupting {}-IDLE...", self.name);
+
+        self.imap.interrupt_idle();
+
+        let &(ref lock, ref cvar) = &*self.state.clone();
+        let mut state = lock.lock().unwrap();
+
+        state.idle = true;
+        cvar.notify_one();
+    }
+
+    pub fn fetch(&mut self, context: &Context, use_network: bool) {
+        {
+            let &(ref lock, _) = &*self.state.clone();
+            let mut state = lock.lock().unwrap();
+
+            if state.suspended {
+                return;
+            }
+
+            state.using_handle = true;
+        }
+
+        if use_network {
+            let start = std::time::Instant::now();
+            if self.connect_to_imap(context) {
+                info!(context, 0, "{}-fetch started...", self.name);
+                self.imap.fetch(context);
+
+                if self.imap.should_reconnect() {
+                    info!(context, 0, "{}-fetch aborted, starting over...", self.name,);
+                    self.imap.fetch(context);
+                }
+                info!(
+                    context,
+                    0,
+                    "{}-fetch done in {:.3} ms.",
+                    self.name,
+                    start.elapsed().as_millis(),
+                );
+            }
+        }
+
+        self.state.0.lock().unwrap().using_handle = false;
+    }
+
+    fn connect_to_imap(&self, context: &Context) -> bool {
+        if self.imap.is_connected() {
+            return true;
+        }
+
+        let mut ret_connected = dc_connect_to_configured_imap(context, &self.imap) != 0;
+
+        if ret_connected {
+            if context
+                .sql
+                .get_config_int(context, "folders_configured")
+                .unwrap_or_default()
+                < 3
+            {
+                self.imap.configure_folders(context, 0x1);
+            }
+
+            if let Some(mvbox_name) = context.sql.get_config(context, self.folder_config_name) {
+                self.imap.set_watch_folder(mvbox_name);
+            } else {
+                self.imap.disconnect(context);
+                ret_connected = false;
+            }
+        }
+
+        ret_connected
+    }
+
+    pub fn idle(&self, context: &Context, use_network: bool) {
+        {
+            let &(ref lock, ref cvar) = &*self.state.clone();
+            let mut state = lock.lock().unwrap();
+
+            if 0 != state.jobs_needed {
+                info!(
+                    context,
+                    0,
+                    "{}-IDLE will not be started as it was interrupted while not ideling.",
+                    self.name,
+                );
+                state.jobs_needed = 0;
+                return;
+            }
+
+            if state.suspended {
+                while !state.idle {
+                    state = cvar.wait(state).unwrap();
+                }
+                state.idle = false;
+                return;
+            }
+
+            state.using_handle = true;
+
+            if !use_network {
+                state.using_handle = false;
+
+                while !state.idle {
+                    state = cvar.wait(state).unwrap();
+                }
+                state.idle = false;
+                return;
+            }
+        }
+
+        self.connect_to_imap(context);
+        info!(context, 0, "{}-IDLE started...", self.name,);
+        self.imap.idle(context);
+        info!(context, 0, "{}-IDLE ended.", self.name);
+
+        self.state.0.lock().unwrap().using_handle = false;
+    }
+}

src/lib.rs

@@ -30,6 +30,7 @@ pub mod constants;
 pub mod contact;
 pub mod context;
 mod imap;
+mod job_thread;
 pub mod key;
 pub mod keyring;
 pub mod lot;
@@ -50,7 +51,6 @@ mod dc_dehtml;
 mod dc_e2ee;
 pub mod dc_imex;
 pub mod dc_job;
-mod dc_jobthread;
 pub mod dc_location;
 mod dc_loginparam;
 mod dc_mimefactory;