yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 19:42:04 +02:00
Code Issues Releases Wiki Activity

when maybe_network() is called, a probe-flag is forwarded to the next all of dc_job_perform()

Browse source
This commit is contained in:
B. Petersen 2018-11-09 00:54:48 +01:00
parent a9ac2dcbce
commit 4c32e4e7a5
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dc_context.h
View file

@ -50,6 +50,7 @@ struct _dc_context
dc_imap_t* imap; /**< Internal IMAP object, never NULL */
pthread_mutex_t imapidle_condmutex;
int perform_imap_jobs_needed;
int probe_imap_network; /**< if this flag is set, the imap-job timeouts are bypassed and messages are sent until they fail */
dc_smtp_t* smtp; /**< Internal SMTP object, never NULL */
pthread_cond_t smtpidle_cond;
@ -60,6 +61,7 @@ struct _dc_context
#define DC_JOBS_NEEDED_AT_ONCE 1
#define DC_JOBS_NEEDED_AVOID_DOS 2
int perform_smtp_jobs_needed;
int probe_smtp_network; /**< if this flag is set, the smtp-job timeouts are bypassed and messages are sent until they fail */
dc_callback_t cb; /**< Internal */

19
src/dc_job.c
View file

@ -541,7 +541,7 @@ void dc_job_kill_actions(dc_context_t* context, int action1, int action2)
}
static void dc_job_perform(dc_context_t* context, int thread)
static void dc_job_perform(dc_context_t* context, int thread, int probe_network)
{
sqlite3_stmt* select_stmt = NULL;
dc_job_t job;
@ -555,6 +555,9 @@ static void dc_job_perform(dc_context_t* context, int thread)
goto cleanup;
}
// TODO: if probe_network ist set,
// send out _all_ pending messages in the order of their backoff-times.
select_stmt = dc_sqlite3_prepare(context->sql,
"SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries"
" FROM jobs"
@ -677,7 +680,9 @@ void dc_perform_imap_jobs(dc_context_t* context)
context->perform_imap_jobs_needed = 0;
pthread_mutex_unlock(&context->imapidle_condmutex);
dc_job_perform(context, DC_IMAP_THREAD);
dc_job_perform(context, DC_IMAP_THREAD, context->probe_imap_network);
context->probe_imap_network = 0;
dc_log_info(context, 0, "IMAP-jobs ended.");
}
@ -841,7 +846,8 @@ void dc_perform_smtp_jobs(dc_context_t* context)
pthread_mutex_unlock(&context->smtpidle_condmutex);
dc_log_info(context, 0, "SMTP-jobs started...");
dc_job_perform(context, DC_SMTP_THREAD);
dc_job_perform(context, DC_SMTP_THREAD, context->probe_smtp_network);
context->probe_smtp_network = 0;
dc_log_info(context, 0, "SMTP-jobs ended.");
pthread_mutex_lock(&context->smtpidle_condmutex);
@ -965,8 +971,11 @@ void dc_interrupt_smtp_idle(dc_context_t* context)
*/
void dc_maybe_network(dc_context_t* context)
{
// TODO: make sure, sending is tried independingly of retry-count or timeouts.
// if the first messages comes through, the others should be retried as well.
// the following flags are forwarded to dc_job_perform() and make sure,
// sending is tried independingly of retry-count or timeouts.
// if the first messages comes through, the others are be retried as well.
context->probe_smtp_network = 1;
context->probe_imap_network = 1;
dc_interrupt_smtp_idle(context);
dc_interrupt_imap_idle(context);