dovecot-2.0: lib-index: Cache offsets were sometimes written poi...
dovecot at dovecot.org
dovecot at dovecot.org
Wed Oct 6 20:20:32 EEST 2010
details: http://hg.dovecot.org/dovecot-2.0/rev/d0ddc30f0eef
changeset: 12250:d0ddc30f0eef
user: Timo Sirainen <tss at iki.fi>
date: Wed Oct 06 18:18:30 2010 +0100
description:
lib-index: Cache offsets were sometimes written pointing to an older cache file.
diffstat:
src/lib-index/mail-cache-transaction.c | 3 +++
src/lib-index/mail-index-transaction-private.h | 3 +++
src/lib-index/mail-index-transaction-update.c | 30 ++++++++++++++++++++++++++----
3 files changed, 32 insertions(+), 4 deletions(-)
diffs (74 lines):
diff -r 41e99ee5c1dd -r d0ddc30f0eef src/lib-index/mail-cache-transaction.c
--- a/src/lib-index/mail-cache-transaction.c Wed Oct 06 17:15:51 2010 +0100
+++ b/src/lib-index/mail-cache-transaction.c Wed Oct 06 18:18:30 2010 +0100
@@ -619,6 +619,9 @@
struct mail_cache *cache = ctx->cache;
uint32_t i, old_offset, orig_write_offset;
+ mail_index_ext_using_reset_id(ctx->trans, ctx->cache->ext_id,
+ ctx->cache_file_seq);
+
/* write the cache_offsets to index file. records' prev_offset
is updated to point to old cache record when index is being
synced. */
diff -r 41e99ee5c1dd -r d0ddc30f0eef src/lib-index/mail-index-transaction-private.h
--- a/src/lib-index/mail-index-transaction-private.h Wed Oct 06 17:15:51 2010 +0100
+++ b/src/lib-index/mail-index-transaction-private.h Wed Oct 06 18:18:30 2010 +0100
@@ -137,4 +137,7 @@
unsigned int right_idx,
uint32_t seq);
+bool mail_index_ext_using_reset_id(struct mail_index_transaction *t,
+ uint32_t ext_id, uint32_t reset_id);
+
#endif
diff -r 41e99ee5c1dd -r d0ddc30f0eef src/lib-index/mail-index-transaction-update.c
--- a/src/lib-index/mail-index-transaction-update.c Wed Oct 06 17:15:51 2010 +0100
+++ b/src/lib-index/mail-index-transaction-update.c Wed Oct 06 18:18:30 2010 +0100
@@ -807,8 +807,8 @@
}
}
-void mail_index_ext_set_reset_id(struct mail_index_transaction *t,
- uint32_t ext_id, uint32_t reset_id)
+static void
+mail_index_ext_reset_changes(struct mail_index_transaction *t, uint32_t ext_id)
{
mail_index_ext_update_reset(&t->ext_rec_updates, ext_id);
mail_index_ext_update_reset(&t->ext_rec_atomics, ext_id);
@@ -835,11 +835,33 @@
array_idx_clear(&t->ext_resizes, ext_id);
}
+ t->log_ext_updates = mail_index_transaction_has_ext_changes(t);
+}
+
+bool mail_index_ext_using_reset_id(struct mail_index_transaction *t,
+ uint32_t ext_id, uint32_t reset_id)
+{
+ uint32_t *reset_id_p;
+ bool changed;
+
if (!array_is_created(&t->ext_reset_ids))
i_array_init(&t->ext_reset_ids, ext_id + 2);
- array_idx_set(&t->ext_reset_ids, ext_id, &reset_id);
+ reset_id_p = array_idx_modifiable(&t->ext_reset_ids, ext_id);
+ changed = *reset_id_p != reset_id && *reset_id_p != 0;
+ *reset_id_p = reset_id;
+ if (changed) {
+ /* reset_id changed, clear existing changes */
+ mail_index_ext_reset_changes(t, ext_id);
+ }
+ return changed;
+}
- t->log_ext_updates = mail_index_transaction_has_ext_changes(t);
+void mail_index_ext_set_reset_id(struct mail_index_transaction *t,
+ uint32_t ext_id, uint32_t reset_id)
+{
+ mail_index_ext_using_reset_id(t, ext_id, reset_id);
+ /* make sure the changes get reset, even if reset_id doesn't change */
+ mail_index_ext_reset_changes(t, ext_id);
}
void mail_index_update_header_ext(struct mail_index_transaction *t,
More information about the dovecot-cvs
mailing list