[dovecot-cvs] dovecot/src/plugins/fts fts-storage.c,1.15,1.16

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/plugins/fts
In directory talvi:/tmp/cvs-serv27949/fts

Modified Files:
	fts-storage.c 
Log Message:
If indexing takes over 10 seconds, start giving estimates about when it's
finished.



Index: fts-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/fts/fts-storage.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fts-storage.c	21 Dec 2006 14:21:24 -0000	1.15
+++ fts-storage.c	21 Dec 2006 15:20:59 -0000	1.16
@@ -1,6 +1,7 @@
 /* Copyright (C) 2006 Timo Sirainen */
 
 #include "lib.h"
+#include "ioloop.h"
 #include "array.h"
 #include "str.h"
 #include "istream.h"
@@ -18,6 +19,7 @@
 					fts_storage_module_id))
 
 #define FTS_SEARCH_NONBLOCK_COUNT 10
+#define FTS_BUILD_NOTIFY_INTERVAL_SECS 10
 
 struct fts_mailbox {
 	struct mailbox_vfuncs super;
@@ -46,6 +48,8 @@
 	struct mail *mail;
 	struct fts_backend_build_context *build;
 
+	struct timeval search_start_time, last_notify;
+
 	uint32_t uid;
 	string_t *headers;
 	bool save_part;
@@ -279,6 +283,7 @@
 
 static int fts_build_deinit(struct fts_storage_build_context *ctx)
 {
+	struct mailbox *box = ctx->mail->transaction->box;
 	int ret = 0;
 
 	if (mailbox_search_deinit(&ctx->search_ctx) < 0)
@@ -287,16 +292,60 @@
 
 	if (fts_backend_build_deinit(ctx->build) < 0)
 		ret = -1;
+
+	if (ioloop_time - ctx->search_start_time.tv_sec >=
+	    FTS_BUILD_NOTIFY_INTERVAL_SECS) {
+		/* we notified at least once */
+		box->storage->callbacks->
+			notify_ok(box, "Mailbox indexing finished",
+				  box->storage->callback_context);
+	}
+
 	str_free(&ctx->headers);
 	i_free(ctx);
 	return ret;
 }
 
+static void fts_build_notify(struct fts_storage_build_context *ctx)
+{
+	struct mailbox *box = ctx->mail->transaction->box;
+	const char *text;
+	float percentage;
+	unsigned int msecs, secs;
+
+	if (ctx->last_notify.tv_sec == 0) {
+		/* set the search time in here, in case a plugin
+		   already spent some time indexing the mailbox */
+		ctx->search_start_time = ioloop_timeval;
+	} else if (box->storage->callbacks->notify_ok != NULL) {
+		percentage = (ctx->mail->seq - ctx->seqset.seq1) * 100.0 /
+			(ctx->seqset.seq2 - ctx->seqset.seq1);
+		msecs = (ioloop_timeval.tv_sec -
+			 ctx->search_start_time.tv_sec) * 1000 +
+			(ioloop_timeval.tv_usec -
+			 ctx->search_start_time.tv_usec) / 1000;
+		secs = (msecs / (percentage / 100.0) - msecs) / 1000;
+
+		t_push();
+		text = t_strdup_printf("Indexed %d%% of the mailbox, "
+				       "ETA %d:%02d", (int)percentage,
+				       secs/60, secs%60);
+		box->storage->callbacks->
+			notify_ok(box, text, box->storage->callback_context);
+		t_pop();
+	}
+	ctx->last_notify = ioloop_timeval;
+}
+
 static int fts_build_more(struct fts_storage_build_context *ctx)
 {
 	unsigned int count = 0;
 	int ret;
 
+	if (ioloop_time - ctx->last_notify.tv_sec >=
+	    FTS_BUILD_NOTIFY_INTERVAL_SECS)
+		fts_build_notify(ctx);
+
 	while (mailbox_search_next(ctx->search_ctx, ctx->mail) > 0) {
 		t_push();
 		ret = fts_build_mail(ctx);
@@ -308,6 +357,7 @@
 		if (++count == FTS_SEARCH_NONBLOCK_COUNT)
 			return 0;
 	}
+
 	return 1;
 }
 
@@ -531,7 +581,7 @@
 		fts_build_deinit(fctx->build_ctx);
 		fctx->build_ctx = NULL;
 
-		if (ret == 0)
+		if (ret > 0)
 			fts_search_init(ctx->transaction->box, fctx);
 	}
 	return fbox->super.search_next_nonblock(ctx, mail, tryagain_r);