dovecot/core-2.2: src/lib-index/mail-cache-fields.c annotate

annotate src/lib-index/mail-cache-fields.c @ 22691:dca05b22217b

director: Fix crash when handling expired USER timestamps. The fix in 154f91726624265fce15097eb4bbbf6e55f8c477 wasn't complete.

author	Timo Sirainen <timo.sirainen@dovecot.fi>
date	Tue, 28 Nov 2017 13:10:35 +0200
parents	65ada9976a7f
children	cb108f786fb4

rev	line source
21390 2e2563132d5f Updated copyright notices to include the year 2017. Stephan Bosch <stephan.bosch@dovecot.fi> parents: 21389 diff changeset	1 /* Copyright (c) 2004-2017 Dovecot authors, see the included COPYING file */
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	2
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
6717 02014f5b0068 Don't write fields to cache file with last_used=0. If fields were just Timo Sirainen <tss@iki.fi> parents: 6707 diff changeset	4 #include "ioloop.h"
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #include "buffer.h"
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	6 #include "hash.h"
2866 bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations. Timo Sirainen <tss@iki.fi> parents: 2708 diff changeset	7 #include "file-cache.h"
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	8 #include "read-full.h"
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	9 #include "write-full.h"
6694 c7742d109a67 mmap_disable=yes: When following cache field headers, don't invalidate the Timo Sirainen <tss@iki.fi> parents: 6443 diff changeset	10 #include "mmap-util.h"
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	11 #include "mail-cache-private.h"
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	12
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	13 #include <stddef.h>
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	14
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	15 #define CACHE_FIELD_IS_NEWLY_WANTED(cache, field_idx) \
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	16 ((cache)->field_file_map[field_idx] == (uint32_t)-1 && \
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	17 (cache)->fields[field_idx].used)
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	18
4654 35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	19 static bool field_has_fixed_size(enum mail_cache_field_type type)
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	20 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	21 switch (type) {
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	22 case MAIL_CACHE_FIELD_FIXED_SIZE:
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	23 case MAIL_CACHE_FIELD_BITMASK:
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	24 return TRUE;
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	25 case MAIL_CACHE_FIELD_VARIABLE_SIZE:
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	26 case MAIL_CACHE_FIELD_STRING:
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	27 case MAIL_CACHE_FIELD_HEADER:
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	28 return FALSE;
4722 b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	29
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	30 case MAIL_CACHE_FIELD_COUNT:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	31 break;
4654 35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	32 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	33
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	34 i_unreached();
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	35 return FALSE;
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	36 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	37
4722 b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	38 static bool field_decision_is_valid(enum mail_cache_decision_type type)
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	39 {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	40 switch (type & ~MAIL_CACHE_DECISION_FORCED) {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	41 case MAIL_CACHE_DECISION_NO:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	42 case MAIL_CACHE_DECISION_TEMP:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	43 case MAIL_CACHE_DECISION_YES:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	44 return TRUE;
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	45 default:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	46 return FALSE;
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	47 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	48 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	49
4654 35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	50 static int field_type_verify(struct mail_cache *cache, unsigned int idx,
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	51 enum mail_cache_field_type type, unsigned int size)
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	52 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	53 const struct mail_cache_field *field = &cache->fields[idx].field;
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	54
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	55 if (field->type != type) {
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	56 mail_cache_set_corrupted(cache,
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	57 "registered field %s type changed", field->name);
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	58 return -1;
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	59 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	60 if (field->field_size != size && field_has_fixed_size(type)) {
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	61 mail_cache_set_corrupted(cache,
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	62 "registered field %s size changed", field->name);
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	63 return -1;
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	64 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	65 return 0;
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	66 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	67
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	68 static void
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	69 mail_cache_field_update(struct mail_cache *cache,
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	70 const struct mail_cache_field *newfield)
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	71 {
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	72 struct mail_cache_field_private *orig;
16358 ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	73 bool initial_registering;
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	74
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	75 i_assert(newfield->type < MAIL_CACHE_FIELD_COUNT);
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	76
16358 ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	77 /* are we still doing the initial cache field registering for
ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	78 internal fields and for mail_cache_fields settings? /
ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	79 initial_registering = cache->file_fields_count == 0;
ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	80
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	81 orig = &cache->fields[newfield->idx];
16357 f8b99f6d993c lib-index: Fixed mail_cache_register_fields() decision updates. Timo Sirainen <tss@iki.fi> parents: 15904 diff changeset	82 if ((newfield->decision & MAIL_CACHE_DECISION_FORCED) != 0 \|\|
16358 ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	83 ((orig->field.decision & MAIL_CACHE_DECISION_FORCED) == 0 &&
ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	84 newfield->decision > orig->field.decision)) {
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	85 orig->field.decision = newfield->decision;
16358 ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	86 if (!initial_registering)
ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	87 orig->decision_dirty = TRUE;
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	88 }
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	89 if (orig->field.last_used < newfield->last_used) {
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	90 orig->field.last_used = newfield->last_used;
16358 ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	91 if (!initial_registering)
ac0170b8db14 lib-index: Don't mark field decisions dirty when registering initial cache fields. Timo Sirainen <tss@iki.fi> parents: 16357 diff changeset	92 orig->decision_dirty = TRUE;
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	93 }
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	94 if (orig->decision_dirty)
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	95 cache->field_header_write_pending = TRUE;
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	96
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	97 (void)field_type_verify(cache, newfield->idx,
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	98 newfield->type, newfield->field_size);
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	99 }
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	100
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	101 void mail_cache_register_fields(struct mail_cache *cache,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	102 struct mail_cache_field *fields,
3278 df372eecc5d0 Several size_t -> unsigned int changes. Try to keep "unsigned int" for Timo Sirainen <tss@iki.fi> parents: 2968 diff changeset	103 unsigned int fields_count)
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	104 {
4020 fcfd44f56b04 While casting const pointers to something else, the const was often Timo Sirainen <tss@iki.fi> parents: 3999 diff changeset	105 char *name;
14923 96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	106 void *value;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	107 unsigned int new_idx;
20283 85a5d1e495ed lib-index: Fix duplicate fields in mail_cache_register_fields() Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	108 unsigned int i, j, registered_count;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	109
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	110 new_idx = cache->fields_count;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	111 for (i = 0; i < fields_count; i++) {
8573 f9166a09423a Renamed hash_() to hash_table_() to avoid conflicts with OSX's strhash.h Timo Sirainen <tss@iki.fi> parents: 8282 diff changeset	112 if (hash_table_lookup_full(cache->field_name_hash,
14923 96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	113 fields[i].name, &name, &value)) {
96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	114 fields[i].idx = POINTER_CAST_TO(value, unsigned int);
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	115 mail_cache_field_update(cache, &fields[i]);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	116 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	117 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	118
3999 f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	119 /* check if the same header is being registered in the
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	120 same field array */
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	121 for (j = 0; j < i; j++) {
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	122 if (strcasecmp(fields[i].name, fields[j].name) == 0) {
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	123 fields[i].idx = fields[j].idx;
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	124 break;
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	125 }
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	126 }
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	127
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	128 if (j == i)
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors. Timo Sirainen <tss@iki.fi> parents: 3627 diff changeset	129 fields[i].idx = new_idx++;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	130 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	131
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	132 if (new_idx == cache->fields_count)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	133 return;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	134
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	135 /* @UNSAFE */
22140 8089604afa5a global: Use i_realloc_type() wherever possible Timo Sirainen <timo.sirainen@dovecot.fi> parents: 21427 diff changeset	136 cache->fields = i_realloc_type(cache->fields,
8089604afa5a global: Use i_realloc_type() wherever possible Timo Sirainen <timo.sirainen@dovecot.fi> parents: 21427 diff changeset	137 struct mail_cache_field_private,
8089604afa5a global: Use i_realloc_type() wherever possible Timo Sirainen <timo.sirainen@dovecot.fi> parents: 21427 diff changeset	138 cache->fields_count, new_idx);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	139 cache->field_file_map =
22140 8089604afa5a global: Use i_realloc_type() wherever possible Timo Sirainen <timo.sirainen@dovecot.fi> parents: 21427 diff changeset	140 i_realloc_type(cache->field_file_map, uint32_t,
8089604afa5a global: Use i_realloc_type() wherever possible Timo Sirainen <timo.sirainen@dovecot.fi> parents: 21427 diff changeset	141 cache->fields_count, new_idx);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	142
20283 85a5d1e495ed lib-index: Fix duplicate fields in mail_cache_register_fields() Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	143 registered_count = cache->fields_count;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	144 for (i = 0; i < fields_count; i++) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	145 unsigned int idx = fields[i].idx;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	146
20283 85a5d1e495ed lib-index: Fix duplicate fields in mail_cache_register_fields() Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	147 if (idx < registered_count)
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	148 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	149
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	150 /* new index - save it */
4020 fcfd44f56b04 While casting const pointers to something else, the const was often Timo Sirainen <tss@iki.fi> parents: 3999 diff changeset	151 name = p_strdup(cache->field_pool, fields[i].name);
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	152 cache->fields[idx].field = fields[i];
4020 fcfd44f56b04 While casting const pointers to something else, the const was often Timo Sirainen <tss@iki.fi> parents: 3999 diff changeset	153 cache->fields[idx].field.name = name;
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	154 cache->fields[idx].field.last_used = fields[i].last_used;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	155 cache->field_file_map[idx] = (uint32_t)-1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	156
4654 35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	157 if (!field_has_fixed_size(cache->fields[idx].field.type))
15904 d3cf06639864 Replaced all -1U and (unsigned int)-1 with UINT_MAX. Timo Sirainen <tss@iki.fi> parents: 15814 diff changeset	158 cache->fields[idx].field.field_size = UINT_MAX;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	159
14923 96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	160 hash_table_insert(cache->field_name_hash, name,
96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	161 POINTER_CAST(idx));
20283 85a5d1e495ed lib-index: Fix duplicate fields in mail_cache_register_fields() Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	162 registered_count++;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	163 }
20283 85a5d1e495ed lib-index: Fix duplicate fields in mail_cache_register_fields() Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	164 i_assert(registered_count == new_idx);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	165 cache->fields_count = new_idx;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	166 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	167
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	168 unsigned int
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	169 mail_cache_register_lookup(struct mail_cache cache, const char name)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	170 {
14923 96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	171 char *key;
96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	172 void *value;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	173
14923 96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	174 if (hash_table_lookup_full(cache->field_name_hash, name, &key, &value))
96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	175 return POINTER_CAST_TO(value, unsigned int);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	176 else
15904 d3cf06639864 Replaced all -1U and (unsigned int)-1 with UINT_MAX. Timo Sirainen <tss@iki.fi> parents: 15814 diff changeset	177 return UINT_MAX;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	178 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	179
3461 b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	180 const struct mail_cache_field *
12316 f170b3e39a34 lib-index: Added mail_cache_register_get_field(). Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	181 mail_cache_register_get_field(struct mail_cache *cache, unsigned int field_idx)
f170b3e39a34 lib-index: Added mail_cache_register_get_field(). Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	182 {
f170b3e39a34 lib-index: Added mail_cache_register_get_field(). Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	183 i_assert(field_idx < cache->fields_count);
f170b3e39a34 lib-index: Added mail_cache_register_get_field(). Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	184
f170b3e39a34 lib-index: Added mail_cache_register_get_field(). Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	185 return &cache->fields[field_idx].field;
f170b3e39a34 lib-index: Added mail_cache_register_get_field(). Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	186 }
f170b3e39a34 lib-index: Added mail_cache_register_get_field(). Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	187
21427 658d7731b125 lib-index: Unconstify mail_cache_register_get_list Aki Tuomi <aki.tuomi@dovecot.fi> parents: 21390 diff changeset	188 struct mail_cache_field *
3461 b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	189 mail_cache_register_get_list(struct mail_cache *cache, pool_t pool,
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	190 unsigned int *count_r)
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	191 {
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	192 struct mail_cache_field *list;
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	193 unsigned int i;
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	194
6003 6f66ce9491ad When getting cache fields list, make sure cache file is opened. Timo Sirainen <tss@iki.fi> parents: 5952 diff changeset	195 if (!cache->opened)
6f66ce9491ad When getting cache fields list, make sure cache file is opened. Timo Sirainen <tss@iki.fi> parents: 5952 diff changeset	196 (void)mail_cache_open_and_verify(cache);
6f66ce9491ad When getting cache fields list, make sure cache file is opened. Timo Sirainen <tss@iki.fi> parents: 5952 diff changeset	197
8282 a0c05c33f838 cache file: Don't crash if file has no fields. Timo Sirainen <tss@iki.fi> parents: 8119 diff changeset	198 list = cache->fields_count == 0 ? NULL :
a0c05c33f838 cache file: Don't crash if file has no fields. Timo Sirainen <tss@iki.fi> parents: 8119 diff changeset	199 p_new(pool, struct mail_cache_field, cache->fields_count);
3494 7cab5dc6a0cd mail_cache_register_get_list(): Allocate the returned strings also from Timo Sirainen <tss@iki.fi> parents: 3461 diff changeset	200 for (i = 0; i < cache->fields_count; i++) {
3461 b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	201 list[i] = cache->fields[i].field;
3494 7cab5dc6a0cd mail_cache_register_get_list(): Allocate the returned strings also from Timo Sirainen <tss@iki.fi> parents: 3461 diff changeset	202 list[i].name = p_strdup(pool, list[i].name);
7cab5dc6a0cd mail_cache_register_get_list(): Allocate the returned strings also from Timo Sirainen <tss@iki.fi> parents: 3461 diff changeset	203 }
3461 b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	204
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	205 *count_r = cache->fields_count;
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	206 return list;
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	207 }
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields Timo Sirainen <tss@iki.fi> parents: 3375 diff changeset	208
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	209 static int
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	210 mail_cache_header_fields_get_offset(struct mail_cache *cache,
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	211 uint32_t *offset_r,
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	212 const struct mail_cache_header_fields **field_hdr_r)
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	213 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	214 const struct mail_cache_header_fields *field_hdr;
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	215 struct mail_cache_header_fields tmp_field_hdr;
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	216 const void *data;
15564 2f848393f78e lib-index: Make sure a corrupted mail_cache_header_fields.size doesn't cause crashes. Timo Sirainen <tss@iki.fi> parents: 15333 diff changeset	217 uint32_t offset = 0, next_offset, field_hdr_size;
6695 76c0e3a4df7a If we need to do more than 4 reads to get to the cached fields header, Timo Sirainen <tss@iki.fi> parents: 6694 diff changeset	218 unsigned int next_count = 0;
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	219 int ret;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	220
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	221 if (MAIL_CACHE_IS_UNUSABLE(cache)) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	222 *offset_r = 0;
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	223 if (field_hdr_r != NULL)
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	224 *field_hdr_r = NULL;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	225 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	226 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	227
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	228 /* find the latest header */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	229 offset = 0;
6705 68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	230 next_offset = cache->last_field_header_offset != 0 ?
68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	231 cache->last_field_header_offset :
2407 fed6d07bd8ee Transaction log file is now read-lockless. Timo Sirainen <tss@iki.fi> parents: 2362 diff changeset	232 mail_index_offset_to_uint32(cache->hdr->field_header_offset);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	233 while (next_offset != 0) {
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	234 if (next_offset == offset) {
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	235 mail_cache_set_corrupted(cache,
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	236 "next_offset in field header loops");
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	237 return -1;
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	238 }
18083 8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	239 /* In Dovecot v2.2+ we don't try to use any holes,
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	240 so next_offset must always be larger than current offset.
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	241 also makes it easier to guarantee there aren't any loops
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	242 (which we don't bother doing for old files) */
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	243 if (next_offset < offset && cache->hdr->minor_version != 0) {
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	244 mail_cache_set_corrupted(cache,
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	245 "next_offset in field header decreases");
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	246 return -1;
8565c72f73ec lib-index: Make sure dovecot.index.cache parsing doesn't go to infinite loop. Timo Sirainen <tss@iki.fi> parents: 17902 diff changeset	247 }
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	248 offset = next_offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	249
15333 0efb98659a1f lib-index: Optimize cache file reads with MAIL_INDEX_OPEN_FLAG_SAVEONLY Timo Sirainen <tss@iki.fi> parents: 15311 diff changeset	250 if (cache->mmap_base != NULL \|\| cache->map_with_read) {
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	251 ret = mail_cache_map(cache, offset, sizeof(*field_hdr),
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	252 &data);
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	253 if (ret <= 0) {
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	254 if (ret < 0)
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	255 return -1;
8119 c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data. Timo Sirainen <tss@iki.fi> parents: 8026 diff changeset	256 mail_cache_set_corrupted(cache,
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data. Timo Sirainen <tss@iki.fi> parents: 8026 diff changeset	257 "header field next_offset points outside file");
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data. Timo Sirainen <tss@iki.fi> parents: 8026 diff changeset	258 return -1;
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data. Timo Sirainen <tss@iki.fi> parents: 8026 diff changeset	259 }
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	260 field_hdr = data;
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	261 } else {
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	262 /* if we need to follow multiple offsets to get to
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	263 the last one, it's faster to just pread() the file
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	264 instead of going through cache */
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	265 ret = pread_full(cache->fd, &tmp_field_hdr,
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	266 sizeof(tmp_field_hdr), offset);
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	267 if (ret < 0) {
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	268 mail_cache_set_syscall_error(cache, "pread()");
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	269 return -1;
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	270 }
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	271 if (ret == 0) {
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	272 mail_cache_set_corrupted(cache,
8119 c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data. Timo Sirainen <tss@iki.fi> parents: 8026 diff changeset	273 "header field next_offset points outside file");
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	274 return -1;
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	275 }
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	276 field_hdr = &tmp_field_hdr;
6694 c7742d109a67 mmap_disable=yes: When following cache field headers, don't invalidate the Timo Sirainen <tss@iki.fi> parents: 6443 diff changeset	277 }
c7742d109a67 mmap_disable=yes: When following cache field headers, don't invalidate the Timo Sirainen <tss@iki.fi> parents: 6443 diff changeset	278
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	279 next_offset =
2407 fed6d07bd8ee Transaction log file is now read-lockless. Timo Sirainen <tss@iki.fi> parents: 2362 diff changeset	280 mail_index_offset_to_uint32(field_hdr->next_offset);
6695 76c0e3a4df7a If we need to do more than 4 reads to get to the cached fields header, Timo Sirainen <tss@iki.fi> parents: 6694 diff changeset	281 next_count++;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	282 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	283
6705 68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	284 if (offset == 0) {
68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	285 mail_cache_set_corrupted(cache, "missing header fields");
68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	286 return -1;
68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	287 }
68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	288 cache->last_field_header_offset = offset;
68bb5bec043e When reading the latest fields, begin finding the fields from the last known Timo Sirainen <tss@iki.fi> parents: 6704 diff changeset	289
22611 65ada9976a7f lib-index: Add mail_index_cache_optimization_settings Timo Sirainen <timo.sirainen@dovecot.fi> parents: 22140 diff changeset	290 if (next_count > cache->index->optimization_set.cache.compress_header_continue_count)
6695 76c0e3a4df7a If we need to do more than 4 reads to get to the cached fields header, Timo Sirainen <tss@iki.fi> parents: 6694 diff changeset	291 cache->need_compress_file_seq = cache->hdr->file_seq;
76c0e3a4df7a If we need to do more than 4 reads to get to the cached fields header, Timo Sirainen <tss@iki.fi> parents: 6694 diff changeset	292
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	293 if (field_hdr_r != NULL) {
15564 2f848393f78e lib-index: Make sure a corrupted mail_cache_header_fields.size doesn't cause crashes. Timo Sirainen <tss@iki.fi> parents: 15333 diff changeset	294 /* detect corrupted size later */
2f848393f78e lib-index: Make sure a corrupted mail_cache_header_fields.size doesn't cause crashes. Timo Sirainen <tss@iki.fi> parents: 15333 diff changeset	295 field_hdr_size = I_MAX(field_hdr->size, sizeof(*field_hdr));
15371 67afcb730109 lib-index: Cache record linking is now while writing new records, not later with pwrite(). Timo Sirainen <tss@iki.fi> parents: 15337 diff changeset	296 if (cache->file_cache != NULL) {
67afcb730109 lib-index: Cache record linking is now while writing new records, not later with pwrite(). Timo Sirainen <tss@iki.fi> parents: 15337 diff changeset	297 /* invalidate the cache fields area to make sure we
67afcb730109 lib-index: Cache record linking is now while writing new records, not later with pwrite(). Timo Sirainen <tss@iki.fi> parents: 15337 diff changeset	298 get the latest cache decisions/last_used fields */
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	299 file_cache_invalidate(cache->file_cache, offset,
15564 2f848393f78e lib-index: Make sure a corrupted mail_cache_header_fields.size doesn't cause crashes. Timo Sirainen <tss@iki.fi> parents: 15333 diff changeset	300 field_hdr_size);
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	301 }
15814 e63d1cf19ec7 Merged changes from v2.1 tree. Timo Sirainen <tss@iki.fi> parents: 15715 15793 diff changeset	302 if (cache->read_buf != NULL)
15793 0b0399f1b6aa lib-index: Fixed invalidating buffered cache file with map_with_read. Timo Sirainen <tss@iki.fi> parents: 15564 diff changeset	303 buffer_set_used_size(cache->read_buf, 0);
15564 2f848393f78e lib-index: Make sure a corrupted mail_cache_header_fields.size doesn't cause crashes. Timo Sirainen <tss@iki.fi> parents: 15333 diff changeset	304 ret = mail_cache_map(cache, offset, field_hdr_size, &data);
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	305 if (ret < 0)
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	306 return -1;
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	307 if (ret == 0) {
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	308 mail_cache_set_corrupted(cache,
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	309 "header field size outside file");
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	310 return -1;
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	311 }
022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	312 *field_hdr_r = data;
6704 b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file Timo Sirainen <tss@iki.fi> parents: 6695 diff changeset	313 }
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	314 *offset_r = offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	315 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	316 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	317
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	318 int mail_cache_header_fields_read(struct mail_cache *cache)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	319 {
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	320 const struct mail_cache_header_fields *field_hdr;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	321 struct mail_cache_field field;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	322 const uint32_t last_used, sizes;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	323 const uint8_t types, decisions;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	324 const char p, names, *end;
14923 96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	325 char *orig_key;
96fd2c3bf932 Reverted "support for non-pointers" part of the hash table API changes. Timo Sirainen <tss@iki.fi> parents: 14918 diff changeset	326 void *orig_value;
7043 7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	327 unsigned int fidx, new_fields_count;
7075 c8507f755f0b Don't trigger cache compression based on fields with a forced decision. Timo Sirainen <tss@iki.fi> parents: 7070 diff changeset	328 enum mail_cache_decision_type dec;
6296 205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	329 time_t max_drop_time;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	330 uint32_t offset, i;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	331
15311 022d0d21e56d lib-index: mail_cache_map() API cleanup Timo Sirainen <tss@iki.fi> parents: 14355 diff changeset	332 if (mail_cache_header_fields_get_offset(cache, &offset, &field_hdr) < 0)
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	333 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	334
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	335 if (offset == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	336 /* no fields - the file is empty */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	337 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	338 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	339
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	340 /* check the fixed size of the header. name[] has to be checked
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	341 separately */
17306 1f2c83d6dd2e lib-index: Fixed crash when header fields count was too high in cache file. Timo Sirainen <tss@iki.fi> parents: 17148 diff changeset	342 if (field_hdr->fields_count > INT_MAX / MAIL_CACHE_FIELD_NAMES(1) \|\|
1f2c83d6dd2e lib-index: Fixed crash when header fields count was too high in cache file. Timo Sirainen <tss@iki.fi> parents: 17148 diff changeset	343 field_hdr->size < MAIL_CACHE_FIELD_NAMES(field_hdr->fields_count)) {
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	344 mail_cache_set_corrupted(cache, "invalid field header size");
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	345 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	346 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	347
5952 ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable Timo Sirainen <tss@iki.fi> parents: 5947 diff changeset	348 new_fields_count = field_hdr->fields_count;
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable Timo Sirainen <tss@iki.fi> parents: 5947 diff changeset	349 if (new_fields_count != 0) {
4110 9662de8fc649 Don't crash with "can't allocate 0 bytes of memory" if there are zero Timo Sirainen <tss@iki.fi> parents: 4020 diff changeset	350 cache->file_field_map =
22140 8089604afa5a global: Use i_realloc_type() wherever possible Timo Sirainen <timo.sirainen@dovecot.fi> parents: 21427 diff changeset	351 i_realloc_type(cache->file_field_map, unsigned int,
8089604afa5a global: Use i_realloc_type() wherever possible Timo Sirainen <timo.sirainen@dovecot.fi> parents: 21427 diff changeset	352 cache->file_fields_count, new_fields_count);
4110 9662de8fc649 Don't crash with "can't allocate 0 bytes of memory" if there are zero Timo Sirainen <tss@iki.fi> parents: 4020 diff changeset	353 } else {
9662de8fc649 Don't crash with "can't allocate 0 bytes of memory" if there are zero Timo Sirainen <tss@iki.fi> parents: 4020 diff changeset	354 i_free_and_null(cache->file_field_map);
9662de8fc649 Don't crash with "can't allocate 0 bytes of memory" if there are zero Timo Sirainen <tss@iki.fi> parents: 4020 diff changeset	355 }
5952 ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable Timo Sirainen <tss@iki.fi> parents: 5947 diff changeset	356 cache->file_fields_count = new_fields_count;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	357
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	358 last_used = CONST_PTR_OFFSET(field_hdr, MAIL_CACHE_FIELD_LAST_USED());
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	359 sizes = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	360 MAIL_CACHE_FIELD_SIZE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	361 types = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	362 MAIL_CACHE_FIELD_TYPE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	363 decisions = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	364 MAIL_CACHE_FIELD_DECISION(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	365 names = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	366 MAIL_CACHE_FIELD_NAMES(field_hdr->fields_count));
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	367 end = CONST_PTR_OFFSET(field_hdr, field_hdr->size);
17148 0ecc40091784 lib-index: Minor code cleanup Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	368 i_assert(names <= end);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	369
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	370 /* clear the old mapping */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	371 for (i = 0; i < cache->fields_count; i++)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	372 cache->field_file_map[i] = (uint32_t)-1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	373
6922 284c22a7a92e Don't compress cache file unneededly when creating the first messages. Timo Sirainen <tss@iki.fi> parents: 6795 diff changeset	374 max_drop_time = cache->index->map->hdr.day_stamp == 0 ? 0 :
22611 65ada9976a7f lib-index: Add mail_index_cache_optimization_settings Timo Sirainen <timo.sirainen@dovecot.fi> parents: 22140 diff changeset	375 cache->index->map->hdr.day_stamp -
65ada9976a7f lib-index: Add mail_index_cache_optimization_settings Timo Sirainen <timo.sirainen@dovecot.fi> parents: 22140 diff changeset	376 cache->index->optimization_set.cache.unaccessed_field_drop_secs;
6296 205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	377
21389 59437f8764c6 global: Replaced all instances of memset(p, 0, sizeof(p)) with the new i_zero() macro. Stephan Bosch <stephan.bosch@dovecot.fi>* parents: 20283 diff changeset	378 i_zero(&field);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	379 for (i = 0; i < field_hdr->fields_count; i++) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	380 for (p = names; p != end && *p != '\0'; p++) ;
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	381 if (p == end \|\| *names == '\0') {
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	382 mail_cache_set_corrupted(cache,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	383 "field header names corrupted");
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	384 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	385 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	386
4722 b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	387 if (types[i] > MAIL_CACHE_FIELD_COUNT) {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	388 mail_cache_set_corrupted(cache, "field type corrupted");
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	389 return -1;
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	390 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	391 if (!field_decision_is_valid(decisions[i])) {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	392 mail_cache_set_corrupted(cache,
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	393 "field decision type corrupted");
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	394 return -1;
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	395 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache Timo Sirainen <tss@iki.fi> parents: 4654 diff changeset	396
8573 f9166a09423a Renamed hash_() to hash_table_() to avoid conflicts with OSX's strhash.h Timo Sirainen <tss@iki.fi> parents: 8282 diff changeset	397 if (hash_table_lookup_full(cache->field_name_hash, names,
f9166a09423a Renamed hash_() to hash_table_() to avoid conflicts with OSX's strhash.h Timo Sirainen <tss@iki.fi> parents: 8282 diff changeset	398 &orig_key, &orig_value)) {
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	399 /* already exists, see if decision can be updated */
7043 7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	400 fidx = POINTER_CAST_TO(orig_value, unsigned int);
7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	401 if (!cache->fields[fidx].decision_dirty) {
7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	402 cache->fields[fidx].field.decision =
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	403 decisions[i];
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	404 }
7043 7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	405 if (field_type_verify(cache, fidx,
4654 35d9433de1ca When registering fields, if they were already exited in the cache file mark Timo Sirainen <tss@iki.fi> parents: 4345 diff changeset	406 types[i], sizes[i]) < 0)
4345 f5d9c2b4d118 If cache field's size is wrong, rebuild the cache file instead of crashing Timo Sirainen <tss@iki.fi> parents: 4110 diff changeset	407 return -1;
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	408 } else {
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	409 field.name = names;
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	410 field.type = types[i];
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	411 field.field_size = sizes[i];
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	412 field.decision = decisions[i];
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	413 mail_cache_register_fields(cache, &field, 1);
7043 7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	414 fidx = field.idx;
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	415 }
7043 7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	416 if (cache->field_file_map[fidx] != (uint32_t)-1) {
2968 2ab037df6cf3 Check for duplicate fields in header. Timo Sirainen <tss@iki.fi> parents: 2929 diff changeset	417 mail_cache_set_corrupted(cache,
2ab037df6cf3 Check for duplicate fields in header. Timo Sirainen <tss@iki.fi> parents: 2929 diff changeset	418 "Duplicated field in header: %s", names);
2ab037df6cf3 Check for duplicate fields in header. Timo Sirainen <tss@iki.fi> parents: 2929 diff changeset	419 return -1;
2ab037df6cf3 Check for duplicate fields in header. Timo Sirainen <tss@iki.fi> parents: 2929 diff changeset	420 }
7043 7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	421 cache->fields[fidx].used = TRUE;
6296 205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	422
7043 7708a8c166d6 Compiler warning fixes on 32bit systems. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	423 cache->field_file_map[fidx] = i;
7058 cf4cee852a05 Previous compiler warning fix changes broke cache file reading. Timo Sirainen <tss@iki.fi> parents: 7043 diff changeset	424 cache->file_field_map[i] = fidx;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	425
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	426 /* update last_used if it's newer than ours */
14355 5b05411a81cf Compiler warning fixes. Timo Sirainen <tss@iki.fi> parents: 14133 diff changeset	427 if ((time_t)last_used[i] > cache->fields[fidx].field.last_used)
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	428 cache->fields[fidx].field.last_used = last_used[i];
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	429
7075 c8507f755f0b Don't trigger cache compression based on fields with a forced decision. Timo Sirainen <tss@iki.fi> parents: 7070 diff changeset	430 dec = cache->fields[fidx].field.decision;
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	431 if (cache->fields[fidx].field.last_used < max_drop_time &&
ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	432 cache->fields[fidx].field.last_used != 0 &&
7075 c8507f755f0b Don't trigger cache compression based on fields with a forced decision. Timo Sirainen <tss@iki.fi> parents: 7070 diff changeset	433 (dec & MAIL_CACHE_DECISION_FORCED) == 0 &&
c8507f755f0b Don't trigger cache compression based on fields with a forced decision. Timo Sirainen <tss@iki.fi> parents: 7070 diff changeset	434 dec != MAIL_CACHE_DECISION_NO) {
6707 4752637a6ad4 Don't bother compressing cache file just to drop fields from header that Timo Sirainen <tss@iki.fi> parents: 6705 diff changeset	435 /* time to drop this field. don't bother dropping
4752637a6ad4 Don't bother compressing cache file just to drop fields from header that Timo Sirainen <tss@iki.fi> parents: 6705 diff changeset	436 fields that have never been used. */
6296 205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	437 cache->need_compress_file_seq = cache->hdr->file_seq;
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	438 }
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	439
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	440 names = p + 1;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	441 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	442 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	443 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	444
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	445 static void copy_to_buf(struct mail_cache cache, buffer_t dest, bool add_new,
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	446 size_t offset, size_t size)
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	447 {
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	448 const void *data;
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	449 unsigned int i, field;
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	450
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	451 /* copy the existing fields */
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	452 for (i = 0; i < cache->file_fields_count; i++) {
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	453 field = cache->file_field_map[i];
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	454 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	455 buffer_append(dest, data, size);
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	456 }
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	457 if (!add_new)
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	458 return;
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	459
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	460 /* copy newly wanted fields */
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	461 for (i = 0; i < cache->fields_count; i++) {
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	462 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	463 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	464 buffer_append(dest, data, size);
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	465 }
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	466 }
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	467 }
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	468
2342 fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	469 static void copy_to_buf_byte(struct mail_cache cache, buffer_t dest,
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	470 bool add_new, size_t offset)
2342 fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	471 {
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	472 const int *data;
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	473 unsigned int i, field;
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	474 uint8_t byte;
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	475
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	476 /* copy the existing fields */
2342 fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	477 for (i = 0; i < cache->file_fields_count; i++) {
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	478 field = cache->file_field_map[i];
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	479 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	480 byte = (uint8_t)*data;
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	481 buffer_append(dest, &byte, 1);
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	482 }
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	483 if (!add_new)
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	484 return;
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	485
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	486 /* copy newly wanted fields */
2342 fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	487 for (i = 0; i < cache->fields_count; i++) {
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	488 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	489 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	490 byte = (uint8_t)*data;
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	491 buffer_append(dest, &byte, 1);
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	492 }
2342 fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	493 }
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	494 }
fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	495
2929 ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	496 static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	497 {
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	498 buffer_t *buffer;
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	499 uint32_t i, offset, dec_offset;
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	500 int ret = 0;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	501
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	502 if (mail_cache_header_fields_read(cache) < 0 \|\|
17362 36c2611e053e treewide - use of explicit NULL in pointer comparisons rather than 0-alikes Phil Carmody <phil@dovecot.fi> parents: 17306 diff changeset	503 mail_cache_header_fields_get_offset(cache, &offset, NULL) < 0)
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	504 return -1;
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	505
2708 f1e9f3ec8135 Buffer API change: we no longer support limited sized buffers where Timo Sirainen <tss@iki.fi> parents: 2604 diff changeset	506 buffer = buffer_create_dynamic(pool_datastack_create(), 256);
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	507
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	508 copy_to_buf(cache, buffer, FALSE,
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	509 offsetof(struct mail_cache_field, last_used),
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	510 sizeof(uint32_t));
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	511 ret = mail_cache_write(cache, buffer->data, buffer->used,
3375 9e2abc4c341c Whenever writing to cache file, also updated file_cache. Fixes problems with Timo Sirainen <tss@iki.fi> parents: 3278 diff changeset	512 offset + MAIL_CACHE_FIELD_LAST_USED());
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	513 if (ret == 0) {
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	514 buffer_set_used_size(buffer, 0);
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	515 copy_to_buf_byte(cache, buffer, FALSE,
2342 fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	516 offsetof(struct mail_cache_field, decision));
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	517
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	518 dec_offset = offset +
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	519 MAIL_CACHE_FIELD_DECISION(cache->file_fields_count);
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	520 ret = mail_cache_write(cache, buffer->data, buffer->used,
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	521 dec_offset);
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	522 if (ret == 0) {
2592 5edda9783458 minor fix Timo Sirainen <tss@iki.fi> parents: 2407 diff changeset	523 for (i = 0; i < cache->file_fields_count; i++)
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	524 cache->fields[i].decision_dirty = FALSE;
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	525 }
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	526 }
406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	527
2867 d416b6d0a7ee More correct file cache invalidating. Timo Sirainen <tss@iki.fi> parents: 2866 diff changeset	528 if (ret == 0)
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	529 cache->field_header_write_pending = FALSE;
2929 ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	530 return ret;
ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	531 }
ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	532
ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	533 int mail_cache_header_fields_update(struct mail_cache *cache)
ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	534 {
ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	535 int ret;
ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	536
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6922 diff changeset	537 if (cache->locked) {
7226 e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and Timo Sirainen <tss@iki.fi> parents: 7105 diff changeset	538 T_BEGIN {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6922 diff changeset	539 ret = mail_cache_header_fields_update_locked(cache);
7226 e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and Timo Sirainen <tss@iki.fi> parents: 7105 diff changeset	540 } T_END;
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6922 diff changeset	541 return ret;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6922 diff changeset	542 }
2929 ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	543
17902 8c84b69e7f69 lib-index: mail_cache_lock() partial rewrite. Timo Sirainen <tss@iki.fi> parents: 17362 diff changeset	544 if (mail_cache_lock(cache) <= 0)
2929 ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	545 return -1;
ba9062032877 Locking fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2867 diff changeset	546
7226 e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and Timo Sirainen <tss@iki.fi> parents: 7105 diff changeset	547 T_BEGIN {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6922 diff changeset	548 ret = mail_cache_header_fields_update_locked(cache);
7226 e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and Timo Sirainen <tss@iki.fi> parents: 7105 diff changeset	549 } T_END;
3627 c0e35566dd14 Unlocking cache file can also corrupt it since it modifies it. Added a Timo Sirainen <tss@iki.fi> parents: 3617 diff changeset	550 if (mail_cache_unlock(cache) < 0)
c0e35566dd14 Unlocking cache file can also corrupt it since it modifies it. Added a Timo Sirainen <tss@iki.fi> parents: 3617 diff changeset	551 ret = -1;
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	552 return ret;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	553 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	554
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	555 void mail_cache_header_fields_get(struct mail_cache cache, buffer_t dest)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	556 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	557 struct mail_cache_header_fields hdr;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	558 unsigned int field;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	559 const char *name;
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	560 uint32_t i;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	561
21389 59437f8764c6 global: Replaced all instances of memset(p, 0, sizeof(p)) with the new i_zero() macro. Stephan Bosch <stephan.bosch@dovecot.fi>* parents: 20283 diff changeset	562 i_zero(&hdr);
6296 205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	563 hdr.fields_count = cache->file_fields_count;
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	564 for (i = 0; i < cache->fields_count; i++) {
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	565 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i))
6296 205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	566 hdr.fields_count++;
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing. Timo Sirainen <tss@iki.fi> parents: 6003 diff changeset	567 }
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	568 buffer_append(dest, &hdr, sizeof(hdr));
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	569
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	570 /* we have to keep the field order for the existing fields. */
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	571 copy_to_buf(cache, dest, TRUE,
13842 ce29836e369e lib-index: Allow updating cache's last_used field with mail_cache_register_fields() Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	572 offsetof(struct mail_cache_field, last_used),
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	573 sizeof(uint32_t));
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	574 copy_to_buf(cache, dest, TRUE,
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	575 offsetof(struct mail_cache_field, field_size),
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	576 sizeof(uint32_t));
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	577 copy_to_buf_byte(cache, dest, TRUE,
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	578 offsetof(struct mail_cache_field, type));
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	579 copy_to_buf_byte(cache, dest, TRUE,
2342 fa529dd77176 Fixes for big endian systems. Timo Sirainen <tss@iki.fi> parents: 2339 diff changeset	580 offsetof(struct mail_cache_field, decision));
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	581
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	582 i_assert(dest->used == sizeof(hdr) +
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	583 (sizeof(uint32_t)2 + 2) hdr.fields_count);
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	584
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	585 /* add existing fields' names */
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	586 for (i = 0; i < cache->file_fields_count; i++) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	587 field = cache->file_field_map[i];
2339 406692edc12d Cache fixes. Decisions are saved again. Timo Sirainen <tss@iki.fi> parents: 2327 diff changeset	588 name = cache->fields[field].field.name;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	589 buffer_append(dest, name, strlen(name)+1);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	590 }
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	591 /* add newly wanted fields' names */
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	592 for (i = 0; i < cache->fields_count; i++) {
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	593 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	594 name = cache->fields[i].field.name;
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	595 buffer_append(dest, name, strlen(name)+1);
53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	596 }
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	597 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	598
6443 53313d1e7e4f Code cleanups and some minor fixes. Timo Sirainen <tss@iki.fi> parents: 6429 diff changeset	599 hdr.size = dest->used;
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	600 buffer_write(dest, 0, &hdr, sizeof(hdr));
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	601
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	602 if ((hdr.size & 3) != 0)
3617 904849549eac Removed null4 and replaced the few uses of it with buffer_append_zero(). Timo Sirainen <tss@iki.fi> parents: 3494 diff changeset	603 buffer_append_zero(dest, 4 - (hdr.size & 3));
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	604 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	605
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	606 int mail_cache_header_fields_get_next_offset(struct mail_cache *cache,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	607 uint32_t *offset_r)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	608 {
17362 36c2611e053e treewide - use of explicit NULL in pointer comparisons rather than 0-alikes Phil Carmody <phil@dovecot.fi> parents: 17306 diff changeset	609 if (mail_cache_header_fields_get_offset(cache, offset_r, NULL) < 0)
2327 7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	610 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	611
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	612 if (*offset_r == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	613 *offset_r = offsetof(struct mail_cache_header,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	614 field_header_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	615 } else {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	616 *offset_r += offsetof(struct mail_cache_header_fields,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	617 next_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	618 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	619 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so Timo Sirainen <tss@iki.fi> parents: diff changeset	620 }

Mercurial > dovecot > core-2.2

annotate src/lib-index/mail-cache-fields.c @ 22691:dca05b22217b