lib-storage: mailbox_search_notify() - Ensure that ioloop_time stays sufficiently...

This caters for the cases where the ioloop times is not actively refreshed
inside the processing loops (sort command, index search_next())

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index fcbc36fa0b0fbd9590bf3961eb88a484431689e0..9604b57bb0ebcc92998ffd72046ab5e3c62071ec 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -691,6 +691,7 @@ struct mail_search_context {
        normalizer_func_t *normalizer;
 
        struct timeval search_start_time, last_notify;
+       unsigned int search_notify_passes;
 
        /* if non-NULL, specifies that a search resulting is being updated.
           this can be used as a search optimization: if searched message

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 58778807e3d05f0127a0416e4bd3a91e5a47d97c..0e22438ba2f93b9218fe29a1a7050e5a792c96d5 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -2554,8 +2554,13 @@ void mailbox_search_notify(struct mailbox *box, struct mail_search_context *ctx)
                ctx->last_notify = ctx->search_start_time;
 
        if (box->storage->callbacks.notify_progress == NULL ||
-           ctx->progress_hidden ||
-           ioloop_time - ctx->last_notify.tv_sec < MAIL_STORAGE_NOTIFY_INTERVAL_SECS)
+           ctx->progress_hidden)
+               return;
+
+       if (++ctx->search_notify_passes % 1024 == 0)
+               io_loop_time_refresh();
+
+       if (ioloop_time - ctx->last_notify.tv_sec < MAIL_STORAGE_NOTIFY_INTERVAL_SECS)
                return;
 
        struct mail_storage_progress_details dtl = {