mirror of
https://github.com/chatmail/core.git
synced 2026-04-23 16:36:30 +03:00
fix segfaults and some queries
This commit is contained in:
dignifiedquire
276
src/dc_job.rs
276
src/dc_job.rs
@@ -49,23 +49,16 @@ pub struct dc_job_t {
|
||||
}
|
||||
|
||||
pub unsafe fn dc_perform_imap_jobs(context: &Context) {
|
||||
dc_log_info(
|
||||
context,
|
||||
0i32,
|
||||
b"INBOX-jobs started...\x00" as *const u8 as *const libc::c_char,
|
||||
);
|
||||
info!(context, 0, "INBOX-jobs started...",);
|
||||
|
||||
let probe_imap_network = *context.probe_imap_network.clone().read().unwrap();
|
||||
*context.probe_imap_network.write().unwrap() = 0;
|
||||
*context.perform_inbox_jobs_needed.write().unwrap() = 0;
|
||||
|
||||
dc_job_perform(context, 100, probe_imap_network);
|
||||
dc_log_info(
|
||||
context,
|
||||
0i32,
|
||||
b"INBOX-jobs ended.\x00" as *const u8 as *const libc::c_char,
|
||||
);
|
||||
info!(context, 0, "INBOX-jobs ended.",);
|
||||
}
|
||||
|
||||
unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network: libc::c_int) {
|
||||
let process_row = |row: &rusqlite::Row| {
|
||||
let job = dc_job_t {
|
||||
@@ -101,103 +94,97 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
|
||||
params_probe
|
||||
};
|
||||
|
||||
context
|
||||
.sql
|
||||
.query_map(query, params, process_row, |jobs| {
|
||||
for job in jobs {
|
||||
let mut job: dc_job_t = job?;
|
||||
context.sql.query_map(query, params, process_row, |jobs| {
|
||||
for job in jobs {
|
||||
let mut job: dc_job_t = job?;
|
||||
info!(
|
||||
context,
|
||||
0,
|
||||
"{}-job #{}, action {} started...",
|
||||
if thread == 100 { "INBOX" } else { "SMTP" },
|
||||
job.job_id,
|
||||
job.action,
|
||||
);
|
||||
|
||||
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);
|
||||
dc_jobthread_suspend(context, &context.mvbox_thread.clone().read().unwrap(), 1);
|
||||
dc_suspend_smtp_thread(context, 1);
|
||||
}
|
||||
let mut tries = 0;
|
||||
while tries <= 1 {
|
||||
job.try_again = 0;
|
||||
match job.action {
|
||||
5901 => {
|
||||
dc_job_do_DC_JOB_SEND(context, &mut job);
|
||||
}
|
||||
110 => {
|
||||
dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context, &mut job);
|
||||
}
|
||||
130 => {
|
||||
dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context, &mut job);
|
||||
}
|
||||
120 => {
|
||||
dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context, &mut job);
|
||||
}
|
||||
200 => {
|
||||
dc_job_do_DC_JOB_MOVE_MSG(context, &mut job);
|
||||
}
|
||||
5011 => {
|
||||
dc_job_do_DC_JOB_SEND(context, &mut job);
|
||||
}
|
||||
900 => {
|
||||
dc_job_do_DC_JOB_CONFIGURE_IMAP(context, &mut job);
|
||||
}
|
||||
910 => {
|
||||
dc_job_do_DC_JOB_IMEX_IMAP(context, &mut job);
|
||||
}
|
||||
5005 => {
|
||||
dc_job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context, &mut job);
|
||||
}
|
||||
5007 => {
|
||||
dc_job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context, &mut job);
|
||||
}
|
||||
105 => {
|
||||
dc_housekeeping(context);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
if job.try_again != -1 {
|
||||
break;
|
||||
}
|
||||
tries += 1
|
||||
}
|
||||
if 900 == job.action || 910 == job.action {
|
||||
dc_jobthread_suspend(
|
||||
context,
|
||||
&mut context.sentbox_thread.clone().read().unwrap(),
|
||||
0,
|
||||
);
|
||||
dc_jobthread_suspend(
|
||||
context,
|
||||
&mut context.mvbox_thread.clone().read().unwrap(),
|
||||
0,
|
||||
);
|
||||
dc_suspend_smtp_thread(context, 0);
|
||||
break;
|
||||
} else if job.try_again == 2 {
|
||||
info!(
|
||||
context,
|
||||
0,
|
||||
"{}-job #{}, action {} started...",
|
||||
"{}-job #{} not yet ready and will be delayed.",
|
||||
if thread == 100 { "INBOX" } else { "SMTP" },
|
||||
job.job_id,
|
||||
job.action,
|
||||
job.job_id
|
||||
);
|
||||
|
||||
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,
|
||||
);
|
||||
dc_jobthread_suspend(context, &context.mvbox_thread.clone().read().unwrap(), 1);
|
||||
dc_suspend_smtp_thread(context, 1);
|
||||
}
|
||||
let mut tries = 0;
|
||||
while tries <= 1 {
|
||||
job.try_again = 0;
|
||||
match job.action {
|
||||
5901 => {
|
||||
dc_job_do_DC_JOB_SEND(context, &mut job);
|
||||
}
|
||||
110 => {
|
||||
dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context, &mut job);
|
||||
}
|
||||
130 => {
|
||||
dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context, &mut job);
|
||||
}
|
||||
120 => {
|
||||
dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context, &mut job);
|
||||
}
|
||||
200 => {
|
||||
dc_job_do_DC_JOB_MOVE_MSG(context, &mut job);
|
||||
}
|
||||
5011 => {
|
||||
dc_job_do_DC_JOB_SEND(context, &mut job);
|
||||
}
|
||||
900 => {
|
||||
dc_job_do_DC_JOB_CONFIGURE_IMAP(context, &mut job);
|
||||
}
|
||||
910 => {
|
||||
dc_job_do_DC_JOB_IMEX_IMAP(context, &mut job);
|
||||
}
|
||||
5005 => {
|
||||
dc_job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context, &mut job);
|
||||
}
|
||||
5007 => {
|
||||
dc_job_do_DC_JOB_MAYBE_SEND_LOC_ENDED(context, &mut job);
|
||||
}
|
||||
105 => {
|
||||
dc_housekeeping(context);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
if job.try_again != -1 {
|
||||
break;
|
||||
}
|
||||
tries += 1
|
||||
}
|
||||
if 900 == job.action || 910 == job.action {
|
||||
dc_jobthread_suspend(
|
||||
context,
|
||||
&mut context.sentbox_thread.clone().read().unwrap(),
|
||||
0,
|
||||
);
|
||||
dc_jobthread_suspend(
|
||||
context,
|
||||
&mut context.mvbox_thread.clone().read().unwrap(),
|
||||
0,
|
||||
);
|
||||
dc_suspend_smtp_thread(context, 0);
|
||||
break;
|
||||
} else if job.try_again == 2 {
|
||||
} else if job.try_again == -1 || job.try_again == 3 {
|
||||
let tries = job.tries + 1;
|
||||
if tries < 17 {
|
||||
job.tries = tries;
|
||||
let time_offset = get_backoff_time_offset(tries);
|
||||
job.desired_timestamp = job.added_timestamp + time_offset;
|
||||
dc_job_update(context, &mut job);
|
||||
info!(
|
||||
context,
|
||||
0,
|
||||
"{}-job #{} not yet ready and will be delayed.",
|
||||
if thread == 100 { "INBOX" } else { "SMTP" },
|
||||
job.job_id
|
||||
);
|
||||
} else if job.try_again == -1 || job.try_again == 3 {
|
||||
let tries = job.tries + 1;
|
||||
if tries < 17 {
|
||||
job.tries = tries;
|
||||
let time_offset = get_backoff_time_offset(tries);
|
||||
job.desired_timestamp = job.added_timestamp + time_offset;
|
||||
dc_job_update(context, &mut job);
|
||||
info!(
|
||||
context,
|
||||
0,
|
||||
"{}-job #{} not succeeded on try #{}, retry in ADD_TIME+{} (in {} seconds).",
|
||||
@@ -207,48 +194,45 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
|
||||
time_offset,
|
||||
job.added_timestamp + time_offset - time()
|
||||
);
|
||||
if thread == 5000 && tries < 17 - 1 {
|
||||
context
|
||||
.smtp_state
|
||||
.clone()
|
||||
.0
|
||||
.lock()
|
||||
.unwrap()
|
||||
.perform_jobs_needed = 2;
|
||||
}
|
||||
} else {
|
||||
if job.action == 5901 {
|
||||
dc_set_msg_failed(context, job.foreign_id, job.pending_error);
|
||||
}
|
||||
dc_job_delete(context, &mut job);
|
||||
if thread == 5000 && tries < 17 - 1 {
|
||||
context
|
||||
.smtp_state
|
||||
.clone()
|
||||
.0
|
||||
.lock()
|
||||
.unwrap()
|
||||
.perform_jobs_needed = 2;
|
||||
}
|
||||
if 0 == probe_network {
|
||||
continue;
|
||||
}
|
||||
// on dc_maybe_network() we stop trying here;
|
||||
// these jobs are already tried once.
|
||||
// otherwise, we just continue with the next job
|
||||
// to give other jobs a chance being tried at least once.
|
||||
break;
|
||||
} else {
|
||||
if job.action == 5901 {
|
||||
dc_set_msg_failed(context, job.foreign_id, job.pending_error);
|
||||
}
|
||||
dc_job_delete(context, &mut job);
|
||||
}
|
||||
dc_param_unref(job.param);
|
||||
free(job.pending_error as *mut libc::c_void);
|
||||
if 0 == probe_network {
|
||||
continue;
|
||||
}
|
||||
// on dc_maybe_network() we stop trying here;
|
||||
// these jobs are already tried once.
|
||||
// otherwise, we just continue with the next job
|
||||
// to give other jobs a chance being tried at least once.
|
||||
break;
|
||||
} else {
|
||||
dc_job_delete(context, &mut job);
|
||||
}
|
||||
dc_param_unref(job.param);
|
||||
free(job.pending_error as *mut libc::c_void);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.unwrap(); // TODO: better error handling
|
||||
Ok(())
|
||||
}); // TODO: better error handling
|
||||
}
|
||||
|
||||
fn dc_job_delete(context: &Context, job: &dc_job_t) -> bool {
|
||||
dc_sqlite3_execute(
|
||||
context,
|
||||
&context.sql,
|
||||
"DELETE FROM jobs WHERE id=?;",
|
||||
params![job.job_id as i32],
|
||||
)
|
||||
context
|
||||
.sql
|
||||
.execute("DELETE FROM jobs WHERE id=?;", params![job.job_id as i32])
|
||||
.is_ok()
|
||||
}
|
||||
|
||||
/* ******************************************************************************
|
||||
@@ -1053,28 +1037,16 @@ pub unsafe fn dc_perform_smtp_jobs(context: &Context) {
|
||||
state.perform_jobs_needed = 0;
|
||||
|
||||
if 0 != state.suspended {
|
||||
dc_log_info(
|
||||
context,
|
||||
0,
|
||||
b"SMTP-jobs suspended.\x00" as *const u8 as *const libc::c_char,
|
||||
);
|
||||
info!(context, 0, "SMTP-jobs suspended.",);
|
||||
return;
|
||||
}
|
||||
state.doing_jobs = 1;
|
||||
probe_smtp_network
|
||||
};
|
||||
|
||||
dc_log_info(
|
||||
context,
|
||||
0,
|
||||
b"SMTP-jobs started...\x00" as *const u8 as *const libc::c_char,
|
||||
);
|
||||
info!(context, 0, "SMTP-jobs started...",);
|
||||
dc_job_perform(context, 5000, probe_smtp_network);
|
||||
dc_log_info(
|
||||
context,
|
||||
0,
|
||||
b"SMTP-jobs ended.\x00" as *const u8 as *const libc::c_char,
|
||||
);
|
||||
info!(context, 0, "SMTP-jobs ended.");
|
||||
|
||||
{
|
||||
let &(ref lock, _) = &*context.smtp_state.clone();
|
||||
@@ -1085,11 +1057,7 @@ pub unsafe fn dc_perform_smtp_jobs(context: &Context) {
|
||||
}
|
||||
|
||||
pub unsafe fn dc_perform_smtp_idle(context: &Context) {
|
||||
dc_log_info(
|
||||
context,
|
||||
0,
|
||||
b"SMTP-idle started...\x00" as *const u8 as *const libc::c_char,
|
||||
);
|
||||
info!(context, 0, "SMTP-idle started...",);
|
||||
{
|
||||
let &(ref lock, ref cvar) = &*context.smtp_state.clone();
|
||||
let mut state = lock.lock().unwrap();
|
||||
|
||||
Reference in New Issue
Block a user