[dovecot-cvs] dovecot/src/lib-storage/index index-status.c, 1.30, 1.31 index-storage.h, 1.61, 1.62 index-sync.c, 1.35, 1.36

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv15205/lib-storage/index

Modified Files:
	index-status.c index-storage.h index-sync.c 
Log Message:
Send recent counter changes when it actually changes.



Index: index-status.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-status.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- a/index-status.c	2 May 2004 20:32:16 -0000	1.30
+++ b/index-status.c	25 May 2004 17:50:36 -0000	1.31
@@ -55,8 +55,10 @@
 		}
 	}
 
-	if ((items & STATUS_RECENT) != 0)
-		status->recent = ibox->get_recent_count(ibox);
+	if ((items & STATUS_RECENT) != 0) {
+		i_assert(ibox->last_recent_count_initialized);
+		status->recent = ibox->last_recent_count;
+	}
 
 	/*FIXME:if (items & STATUS_KEYWORDS)
 		get_keywords(ibox, status);*/

Index: index-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-storage.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- a/index-storage.h	22 May 2004 22:36:46 -0000	1.61
+++ b/index-storage.h	25 May 2004 17:50:36 -0000	1.62
@@ -62,6 +62,7 @@
 	struct mail *mail_interface;
 
 	uint32_t (*get_recent_count)(struct index_mailbox *ibox);
+	unsigned int last_recent_count;
 
 	struct timeout *autosync_to;
 	struct index_autosync_file *autosync_files;
@@ -104,6 +105,7 @@
 	unsigned int sent_readonly_flags_warning:1;
 	unsigned int autosync_pending:1;
 	unsigned int mail_read_mmaped:1;
+	unsigned int last_recent_count_initialized:1;
 };
 
 struct index_transaction_context {

Index: index-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-sync.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- a/index-sync.c	24 May 2004 01:50:16 -0000	1.35
+++ b/index-sync.c	25 May 2004 17:50:36 -0000	1.36
@@ -16,7 +16,7 @@
 	void *sc_context;
 	enum mail_index_sync_type sync_mask;
 	uint32_t seq, seq1, seq2;
-	uint32_t messages_count, new_messages_count, recent_count;
+	uint32_t messages_count, last_messages_count, recent_count;
 	int ret;
 
 	sync_mask = MAIL_INDEX_SYNC_MASK_ALL;
@@ -28,6 +28,12 @@
 		return -1;
 	}
 
+	if (!ibox->last_recent_count_initialized) {
+                ibox->last_recent_count_initialized = TRUE;
+		ibox->last_recent_count = ibox->get_recent_count(ibox);
+	}
+	last_messages_count = mail_index_view_get_message_count(ibox->view);
+
 	if ((flags & MAILBOX_SYNC_FLAG_NO_EXPUNGES) != 0) {
 		expunges_count = 0;
 		expunges = NULL;
@@ -80,17 +86,17 @@
 	if (ret < 0)
 		mail_storage_set_index_error(ibox);
 
-	messages_count = new_messages_count =
-		mail_index_view_get_message_count(ibox->view);
-
 	if (sc->expunge != NULL) {
+		/* expunges[] is a sorted array of sequences. it's easiest for
+		   us to print them from end to beginning. */
+		messages_count = mail_index_view_get_message_count(ibox->view);
 		for (i = expunges_count*2; i > 0; i -= 2) {
 			seq = expunges[i-1];
 			if (seq > messages_count)
 				seq = messages_count;
 			for (; seq >= expunges[i-2]; seq--) {
 				sc->expunge(&ibox->box, seq, sc_context);
-				new_messages_count--;
+				last_messages_count--;
 			}
 		}
 	}
@@ -98,10 +104,18 @@
 	mail_index_view_sync_end(ctx);
 
 	messages_count = mail_index_view_get_message_count(ibox->view);
-	if (messages_count != new_messages_count) {
+	if (messages_count != last_messages_count) {
+		sc->message_count_changed(&ibox->box, messages_count,
+					  sc_context);
 		recent_count = ibox->get_recent_count(ibox);
-		sc->new_messages(&ibox->box, messages_count, recent_count,
-				 sc_context);
+	} else if (expunges_count != 0)
+		recent_count = ibox->get_recent_count(ibox);
+	else
+		recent_count = ibox->last_recent_count;
+
+	if (recent_count != ibox->last_recent_count) {
+		ibox->last_recent_count = recent_count;
+		sc->recent_count_changed(&ibox->box, recent_count, sc_context);
 	}
 
 	mail_index_view_unlock(ibox->view);