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

Refine type of Context.probe_network to bool

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-08-01 06:23:37 +00:00
parent e7456248a0
commit 1f9807ccfe
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/context.rs
View File

@@ -28,7 +28,7 @@ pub struct Context {
pub sql: Sql, pub sql: Sql,
pub inbox: Arc<RwLock<Imap>>, pub inbox: Arc<RwLock<Imap>>,
pub perform_inbox_jobs_needed: Arc<RwLock<i32>>, pub perform_inbox_jobs_needed: Arc<RwLock<i32>>,
pub probe_imap_network: Arc<RwLock<i32>>, pub probe_imap_network: Arc<RwLock<bool>>,
pub sentbox_thread: Arc<RwLock<dc_jobthread_t>>, pub sentbox_thread: Arc<RwLock<dc_jobthread_t>>,
pub mvbox_thread: Arc<RwLock<dc_jobthread_t>>, pub mvbox_thread: Arc<RwLock<dc_jobthread_t>>,
pub smtp: Arc<Mutex<Smtp>>, pub smtp: Arc<Mutex<Smtp>>,
@@ -160,7 +160,7 @@ pub fn dc_context_new(
cb_receive_imf, cb_receive_imf,
), ),
))), ))),
probe_imap_network: Arc::new(RwLock::new(0)), probe_imap_network: Arc::new(RwLock::new(false)),
perform_inbox_jobs_needed: Arc::new(RwLock::new(0)), perform_inbox_jobs_needed: Arc::new(RwLock::new(0)),
} }
} }

14
src/dc_job.rs
View File

@@ -54,15 +54,15 @@ pub unsafe fn dc_perform_imap_jobs(context: &Context) {
info!(context, 0, "dc_perform_imap_jobs starting.",); info!(context, 0, "dc_perform_imap_jobs starting.",);
let probe_imap_network = *context.probe_imap_network.clone().read().unwrap(); let probe_imap_network = *context.probe_imap_network.clone().read().unwrap();
*context.probe_imap_network.write().unwrap() = 0; *context.probe_imap_network.write().unwrap() = false;
*context.perform_inbox_jobs_needed.write().unwrap() = 0; *context.perform_inbox_jobs_needed.write().unwrap() = 0;
dc_job_perform(context, DC_IMAP_THREAD, probe_imap_network); dc_job_perform(context, DC_IMAP_THREAD, probe_imap_network);
info!(context, 0, "dc_perform_imap_jobs ended.",); info!(context, 0, "dc_perform_imap_jobs ended.",);
} }
unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network: libc::c_int) { unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network: bool) {
let query = if probe_network == 0 { let query = if !probe_network {
// processing for first-try and after backoff-timeouts: // processing for first-try and after backoff-timeouts:
// process jobs in the order they were added. // process jobs in the order they were added.
"SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries \ "SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries \
@@ -77,7 +77,7 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
let params_no_probe = params![thread as i64, time()]; let params_no_probe = params![thread as i64, time()];
let params_probe = params![thread as i64]; let params_probe = params![thread as i64];
let params: &[&dyn rusqlite::ToSql] = if probe_network == 0 { let params: &[&dyn rusqlite::ToSql] = if !probe_network {
params_no_probe params_no_probe
} else { } else {
params_probe params_probe
@@ -225,7 +225,7 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
} }
dc_job_delete(context, &mut job); dc_job_delete(context, &mut job);
} }
if 0 == probe_network { if !probe_network {
continue; continue;
} }
// on dc_maybe_network() we stop trying here; // on dc_maybe_network() we stop trying here;
@@ -1050,7 +1050,7 @@ pub unsafe fn dc_perform_smtp_jobs(context: &Context) {
return; return;
} }
state.doing_jobs = 1; state.doing_jobs = 1;
probe_smtp_network probe_smtp_network != 0
}; };
info!(context, 0, "SMTP-jobs started...",); info!(context, 0, "SMTP-jobs started...",);
@@ -1125,7 +1125,7 @@ pub unsafe fn dc_maybe_network(context: &Context) {
let mut state = lock.lock().unwrap(); let mut state = lock.lock().unwrap();
state.probe_network = 1; state.probe_network = 1;
*context.probe_imap_network.write().unwrap() = 1; *context.probe_imap_network.write().unwrap() = true;
} }
dc_interrupt_smtp_idle(context); dc_interrupt_smtp_idle(context);