From: Timo Sirainen <tss@iki.fi>
Date: Tue, 21 Apr 2015 11:06:41 +0000 (+0300)
Subject: imap: Removed separate time counting from SELECT and SEARCH commands.
X-Git-Tag: 2.2.17.rc1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=115cf0320f679e4e63db25e7f44f47977b8338de;p=thirdparty%2Fdovecot%2Fcore.git

imap: Removed separate time counting from SELECT and SEARCH commands.
---

diff --git a/src/imap/cmd-select.c b/src/imap/cmd-select.c
index 3e59be98f6..241f140ae1 100644
--- a/src/imap/cmd-select.c
+++ b/src/imap/cmd-select.c
@@ -201,8 +201,6 @@ static void select_context_free(struct imap_select_context *ctx)
 static void cmd_select_finish(struct imap_select_context *ctx, int ret)
 {
 	const char *resp_code;
-	struct timeval end_time;
-	int time_msecs;
 
 	if (ret < 0) {
 		if (ctx->box != NULL)
@@ -211,13 +209,9 @@ static void cmd_select_finish(struct imap_select_context *ctx, int ret)
 	} else {
 		resp_code = mailbox_is_readonly(ctx->box) ?
 			"READ-ONLY" : "READ-WRITE";
-		if (gettimeofday(&end_time, NULL) < 0)
-			memset(&end_time, 0, sizeof(end_time));
-		time_msecs = timeval_diff_msecs(&end_time, &ctx->start_time);
 		client_send_tagline(ctx->cmd, t_strdup_printf(
-			"OK [%s] %s completed (%d.%03d secs).", resp_code,
-			ctx->cmd->client->mailbox_examined ? "Examine" : "Select",
-			time_msecs/1000, time_msecs%1000));
+			"OK [%s] %s completed", resp_code,
+			ctx->cmd->client->mailbox_examined ? "Examine" : "Select"));
 	}
 	select_context_free(ctx);
 }
diff --git a/src/imap/imap-search.c b/src/imap/imap-search.c
index c06569435e..be91519ff2 100644
--- a/src/imap/imap-search.c
+++ b/src/imap/imap-search.c
@@ -415,12 +415,10 @@ static bool cmd_search_more(struct client_command_context *cmd)
 	enum search_return_options opts = ctx->return_options;
 	struct mail *mail;
 	enum mailbox_sync_flags sync_flags;
-	struct timeval end_time;
 	const struct seq_range *range;
 	unsigned int count;
 	uint32_t id, id_min, id_max;
 	const char *ok_reply;
-	int time_msecs;
 	bool tryagain, minmax, lost_data;
 
 	if (cmd->cancel) {
@@ -503,18 +501,12 @@ static bool cmd_search_more(struct client_command_context *cmd)
 		return TRUE;
 	}
 
-	if (gettimeofday(&end_time, NULL) < 0)
-		memset(&end_time, 0, sizeof(end_time));
-
-	time_msecs = timeval_diff_msecs(&end_time, &ctx->start_time);
-
 	sync_flags = MAILBOX_SYNC_FLAG_FAST;
 	if (!cmd->uid || ctx->have_seqsets)
 		sync_flags |= MAILBOX_SYNC_FLAG_NO_EXPUNGES;
-	ok_reply = t_strdup_printf("OK %s%s completed (%d.%03d secs).",
+	ok_reply = t_strdup_printf("OK %s%s completed",
 		lost_data ? "["IMAP_RESP_CODE_EXPUNGEISSUED"] " : "",
-		!ctx->sorting ? "Search"  : "Sort",
-		time_msecs/1000, time_msecs%1000);
+		!ctx->sorting ? "Search"  : "Sort");
 	return cmd_sync(cmd, sync_flags, 0, ok_reply);
 }
 
@@ -594,7 +586,6 @@ bool imap_search_start(struct imap_search_context *ctx,
 	ctx->search_ctx =
 		mailbox_search_init(ctx->trans, sargs, sort_program, 0, NULL);
 	ctx->sorting = sort_program != NULL;
-	(void)gettimeofday(&ctx->start_time, NULL);
 	i_array_init(&ctx->result, 128);
 	if ((ctx->return_options & SEARCH_RETURN_UPDATE) != 0)
 		imap_search_result_save(ctx);
diff --git a/src/imap/imap-search.h b/src/imap/imap-search.h
index 42943dd8d5..64ddc97072 100644
--- a/src/imap/imap-search.h
+++ b/src/imap/imap-search.h
@@ -41,7 +41,6 @@ struct imap_search_context {
 	float min_relevancy, max_relevancy;
 
 	uint64_t highest_seen_modseq;
-	struct timeval start_time;
 
 	unsigned int have_seqsets:1;
 	unsigned int have_modseqs:1;