Mercurial > dovecot > original-hg > dovecot-1.2
changeset 9095:9a0aa39a3a14 HEAD
imap: Cleaned up "command pending" handling code. Should fix hangs caused by recent changes.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 26 May 2009 14:21:59 -0400 |
parents | 60204e3f7c4d |
children | eead0542095f |
files | src/imap/client.c src/imap/client.h src/imap/cmd-append.c src/imap/cmd-idle.c src/imap/imap-search.c |
diffstat | 5 files changed, 49 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/client.c Tue May 26 14:20:23 2009 -0400 +++ b/src/imap/client.c Tue May 26 14:21:59 2009 -0400 @@ -509,20 +509,12 @@ } } -void client_continue_pending_input(struct client **_client) +void client_continue_pending_input(struct client *client) { - struct client *client = *_client; size_t size; i_assert(!client->handling_input); - if (client->disconnected) { - if (!client->destroyed) - client_destroy(client, NULL); - *_client = NULL; - return; - } - if (client->input_lock != NULL) { /* there's a command that has locked the input */ struct client_command_context *cmd = client->input_lock; @@ -534,8 +526,10 @@ commands to finish. */ if (client_command_check_ambiguity(cmd)) { /* we could be waiting for existing sync to finish */ - cmd_sync_delayed(client); - return; + if (!cmd_sync_delayed(client)) + return; + if (client_command_check_ambiguity(cmd)) + return; } cmd->state = CLIENT_COMMAND_STATE_WAIT_INPUT; } @@ -544,8 +538,10 @@ /* if there's unread data in buffer, handle it. */ (void)i_stream_get_data(client->input, &size); - if (size > 0) - (void)client_handle_input(client); + if (size > 0 && !client->disconnected) { + if (client_handle_input(client)) + client_continue_pending_input(client); + } } /* Skip incoming data until newline is found, @@ -705,6 +701,8 @@ { bool ret, remove_io, handled_commands = FALSE; + i_assert(!client->disconnected); + client->handling_input = TRUE; do { T_BEGIN { @@ -715,23 +713,16 @@ } while (ret && !client->disconnected && client->io != NULL); client->handling_input = FALSE; - if (client->output->closed) { - client_destroy(client, NULL); - return TRUE; - } else { - if (remove_io) - io_remove(&client->io); - else - client_add_missing_io(client); - if (!handled_commands) - return FALSE; + if (remove_io) + io_remove(&client->io); + else + client_add_missing_io(client); + if (!handled_commands) + return FALSE; - ret = client->input_lock != NULL ? TRUE : - cmd_sync_delayed(client); - if (ret) - client_continue_pending_input(&client); - return TRUE; - } + if (client->input_lock == NULL) + cmd_sync_delayed(client); + return TRUE; } void client_input(struct client *client) @@ -768,6 +759,11 @@ } o_stream_uncork(output); o_stream_unref(&output); + + if (client->disconnected) + client_destroy(client, NULL); + else + client_continue_pending_input(client); } static void client_output_cmd(struct client_command_context *cmd) @@ -830,15 +826,13 @@ } } - if (client->output->closed) { + (void)cmd_sync_delayed(client); + o_stream_uncork(client->output); + if (client->disconnected) client_destroy(client, NULL); - return 1; - } else { - (void)cmd_sync_delayed(client); - o_stream_uncork(client->output); - client_continue_pending_input(&client); - return ret; - } + else + client_continue_pending_input(client); + return ret; } bool client_handle_search_save_ambiguity(struct client_command_context *cmd)
--- a/src/imap/client.h Tue May 26 14:20:23 2009 -0400 +++ b/src/imap/client.h Tue May 26 14:21:59 2009 -0400 @@ -186,7 +186,7 @@ void client_command_free(struct client_command_context **cmd); bool client_handle_unfinished_cmd(struct client_command_context *cmd); -void client_continue_pending_input(struct client **_client); +void client_continue_pending_input(struct client *client); void client_input(struct client *client); bool client_handle_input(struct client *client);
--- a/src/imap/cmd-append.c Tue May 26 14:20:23 2009 -0400 +++ b/src/imap/cmd-append.c Tue May 26 14:21:59 2009 -0400 @@ -44,7 +44,6 @@ { struct cmd_append_context *ctx = cmd->context; struct client *client = cmd->client; - struct ostream *output = client->output; bool finished; i_assert(!client->destroyed); @@ -80,17 +79,19 @@ return; } - o_stream_ref(output); - o_stream_cork(output); + o_stream_cork(client->output); finished = cmd->func(cmd); if (!finished && cmd->state != CLIENT_COMMAND_STATE_DONE) (void)client_handle_unfinished_cmd(cmd); else client_command_free(&cmd); (void)cmd_sync_delayed(client); - client_continue_pending_input(&client); - o_stream_uncork(output); - o_stream_unref(&output); + o_stream_uncork(client->output); + + if (client->disconnected) + client_destroy(client, NULL); + else + client_continue_pending_input(client); } /* Returns -1 = error, 0 = need more data, 1 = successful. flags and
--- a/src/imap/cmd-idle.c Tue May 26 14:20:23 2009 -0400 +++ b/src/imap/cmd-idle.c Tue May 26 14:21:59 2009 -0400 @@ -73,7 +73,7 @@ case -2: client->input_skip_line = TRUE; idle_finish(ctx, FALSE, TRUE); - client_continue_pending_input(&client); + client_continue_pending_input(client); return; } @@ -89,10 +89,13 @@ client->input_skip_line = FALSE; else { idle_finish(ctx, strcasecmp(line, "DONE") == 0, TRUE); - client_continue_pending_input(&client); break; } } + if (client->disconnected) + client_destroy(client, NULL); + else + client_continue_pending_input(client); } static void keepalive_timeout(struct cmd_idle_context *ctx)
--- a/src/imap/imap-search.c Tue May 26 14:20:23 2009 -0400 +++ b/src/imap/imap-search.c Tue May 26 14:21:59 2009 -0400 @@ -439,7 +439,11 @@ else client_command_free(&cmd); (void)cmd_sync_delayed(client); - client_continue_pending_input(&client); + + if (client->disconnected) + client_destroy(client, NULL); + else + client_continue_pending_input(client); } int cmd_search_parse_return_if_found(struct imap_search_context *ctx,