Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-index/mail-cache-fields.c @ 5952:ba118a9eeb50 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some paranoia fixes for memory allocation. Don't access a mmaped variable directly in case it happens to change.
author Timo Sirainen <tss@iki.fi>
date Thu, 12 Jul 2007 03:17:38 +0300
parents 7ebe0593f488
children 6f66ce9491ad
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1 /* Copyright (C) 2004 Timo Sirainen */
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"
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
4 #include "buffer.h"
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
5 #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
6 #include "file-cache.h"
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
7 #include "write-full.h"
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
8 #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
9
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
10 #include <stddef.h>
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
11
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12 #define CACHE_HDR_PREFETCH 1024
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
13
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
14 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
15 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
16 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
17 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
18 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
19 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
20 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
21 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
22 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
23 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
24
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
25 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
26 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
27 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
28
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
29 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
30 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
31 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
32
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
33 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
34 {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
35 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
36 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
37 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
38 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
39 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
40 default:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
41 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
42 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
43 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
44
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
45 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
46 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
47 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
48 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
49
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
50 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
51 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
52 "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
53 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
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->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
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 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
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 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
61 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
62
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
63 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
64 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
65 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
66 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
67 void *orig_key, *orig_value;
4020
fcfd44f56b04 While casting const pointers to something else, the const was often
Timo Sirainen <tss@iki.fi>
parents: 3999
diff changeset
68 char *name;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
69 unsigned int new_idx;
3999
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
70 unsigned int i, j;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
71
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
72 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
73 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
74 if (hash_lookup_full(cache->field_name_hash, fields[i].name,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
75 &orig_key, &orig_value)) {
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
76 i_assert(fields[i].type < 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
77
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
78 fields[i].idx =
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
79 POINTER_CAST_TO(orig_value, unsigned int);
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
80 (void)field_type_verify(cache, fields[i].idx,
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
81 fields[i].type,
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
82 fields[i].field_size);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
83 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
84 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
85
3999
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
86 /* 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
87 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
88 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
89 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
90 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
91 break;
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
92 }
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
93 }
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
94
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
95 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
96 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
97 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
98
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
99 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
100 return;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
101
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
102 /* @UNSAFE */
2362
f2acbe281ac1 Allocate cache->fields and cache->fields_file_map with malloc rather than
Timo Sirainen <tss@iki.fi>
parents: 2342
diff changeset
103 cache->fields = i_realloc(cache->fields,
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
104 cache->fields_count * sizeof(*cache->fields),
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
105 new_idx * sizeof(*cache->fields));
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
106 cache->field_file_map =
2362
f2acbe281ac1 Allocate cache->fields and cache->fields_file_map with malloc rather than
Timo Sirainen <tss@iki.fi>
parents: 2342
diff changeset
107 i_realloc(cache->field_file_map,
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
108 cache->fields_count * sizeof(*cache->field_file_map),
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
109 new_idx * sizeof(*cache->field_file_map));
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
110
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++) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
112 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
113
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
114 if (idx < cache->fields_count)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
115 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
116
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
117 /* 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
118 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
119 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
120 cache->fields[idx].field.name = name;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
121 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
122
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
123 if (!field_has_fixed_size(cache->fields[idx].field.type))
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
124 cache->fields[idx].field.field_size = (unsigned int)-1;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
125
4020
fcfd44f56b04 While casting const pointers to something else, the const was often
Timo Sirainen <tss@iki.fi>
parents: 3999
diff changeset
126 hash_insert(cache->field_name_hash, name, POINTER_CAST(idx));
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
127 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
128 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
129 }
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 unsigned int
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
132 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
133 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
134 void *orig_key, *orig_value;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
135
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
136 if (hash_lookup_full(cache->field_name_hash, name,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
137 &orig_key, &orig_value))
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
138 return POINTER_CAST_TO(orig_value, unsigned int);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
139 else
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
140 return (unsigned int)-1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
141 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
142
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
143 const struct mail_cache_field *
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents: 3375
diff changeset
144 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
145 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
146 {
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents: 3375
diff changeset
147 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
148 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
149
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents: 3375
diff changeset
150 list = 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
151 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
152 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
153 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
154 }
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
155
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents: 3375
diff changeset
156 *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
157 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
158 }
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents: 3375
diff changeset
159
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
160 static int mail_cache_header_fields_get_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
161 uint32_t *offset_r)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
162 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
163 const struct mail_cache_header_fields *field_hdr;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
164 uint32_t offset, next_offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
165
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
166 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
167 *offset_r = 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
168 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
169 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
170
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
171 /* find the latest header */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
172 offset = 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
173 next_offset =
2407
fed6d07bd8ee Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents: 2362
diff changeset
174 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
175 while (next_offset != 0) {
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
176 if (next_offset == offset) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
177 mail_cache_set_corrupted(cache,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
178 "next_offset in field header loops");
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
179 return -1;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
180 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
181 offset = next_offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
182
2867
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
183 if (cache->file_cache != NULL) {
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
184 /* we can't trust that the cached data is valid */
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
185 file_cache_invalidate(cache->file_cache, offset,
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
186 sizeof(*field_hdr) +
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
187 CACHE_HDR_PREFETCH);
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
188 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
189 if (mail_cache_map(cache, offset,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
190 sizeof(*field_hdr) + CACHE_HDR_PREFETCH) < 0)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
191 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
192
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
193 field_hdr = CONST_PTR_OFFSET(cache->data, offset);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
194 next_offset =
2407
fed6d07bd8ee Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents: 2362
diff changeset
195 mail_index_offset_to_uint32(field_hdr->next_offset);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
196 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
197
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
198 *offset_r = offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
199 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
200 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
201
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
202 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
203 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
204 const struct mail_cache_header_fields *field_hdr = NULL;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
205 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
206 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
207 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
208 const char *p, *names, *end;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
209 void *orig_key, *orig_value;
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
210 unsigned int new_fields_count;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
211 uint32_t offset, i;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
212
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
213 if (mail_cache_header_fields_get_offset(cache, &offset) < 0)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
214 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
215
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
216 if (offset == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
217 /* 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
218 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
219 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
220
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
221 field_hdr = CONST_PTR_OFFSET(cache->data, offset);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
222 if (offset + field_hdr->size > cache->mmap_length) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
223 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
224 "field header points outside file");
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
225 return -1;
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 /* 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
229 separately */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
230 if (field_hdr->size < sizeof(*field_hdr) +
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231 field_hdr->fields_count * (sizeof(uint32_t)*2 + 1 + 2)) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
232 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
233 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
234 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
235
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
236 if (field_hdr->size > sizeof(*field_hdr) + CACHE_HDR_PREFETCH) {
2867
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
237 if (cache->file_cache != NULL) {
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
238 /* we can't trust that the cached data is valid */
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
239 file_cache_invalidate(cache->file_cache, offset,
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
240 sizeof(*field_hdr) +
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
241 CACHE_HDR_PREFETCH);
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
242 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
243 if (mail_cache_map(cache, offset, field_hdr->size) < 0)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
244 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
245 }
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
246 field_hdr = CONST_PTR_OFFSET(cache->data, offset);
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
247 new_fields_count = 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
248
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
249 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
250 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
251 i_realloc(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
252 cache->file_fields_count *
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
253 sizeof(unsigned int),
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
254 new_fields_count * sizeof(unsigned int));
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
255 } 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
256 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
257 }
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
258 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
259
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
260 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
261 sizes = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
262 MAIL_CACHE_FIELD_SIZE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
263 types = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
264 MAIL_CACHE_FIELD_TYPE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
265 decisions = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
266 MAIL_CACHE_FIELD_DECISION(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
267 names = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
268 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
269 end = CONST_PTR_OFFSET(field_hdr, field_hdr->size);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
270
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
271 /* clear the old mapping */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
272 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
273 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
274
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
275 memset(&field, 0, sizeof(field));
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
276 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
277 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
278 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
279 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
280 "field header names corrupted");
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
281 return -1;
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
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
284 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
285 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
286 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
287 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
288 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
289 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
290 "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
291 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
292 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
293
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
294 if (hash_lookup_full(cache->field_name_hash, names,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
295 &orig_key, &orig_value)) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
296 /* already exists, see if decision can be updated */
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
297 field.idx = POINTER_CAST_TO(orig_value, unsigned int);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
298 if (!cache->fields[field.idx].decision_dirty) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
299 cache->fields[field.idx].field.decision =
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
300 decisions[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
301 }
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
302 if (field_type_verify(cache, field.idx,
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
303 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
304 return -1;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
305 } else {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
306 field.name = names;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
307 field.type = types[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
308 field.field_size = sizes[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
309 field.decision = decisions[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
310 mail_cache_register_fields(cache, &field, 1);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
311 }
2968
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
312 if (cache->field_file_map[field.idx] != (uint32_t)-1) {
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
313 mail_cache_set_corrupted(cache,
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
314 "Duplicated field in header: %s", names);
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
315 return -1;
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
316 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
317 cache->field_file_map[field.idx] = i;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
318 cache->file_field_map[i] = field.idx;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
319
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
320 /* update last_used if it's newer than ours */
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
321 if (last_used[i] > cache->fields[field.idx].last_used)
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
322 cache->fields[field.idx].last_used = last_used[i];
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
323
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
324 names = p + 1;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
325 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
326 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
327 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
328
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
329 static void copy_to_buf(struct mail_cache *cache, buffer_t *dest,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
330 size_t offset, size_t size)
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
331 {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
332 const void *data;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
333 unsigned int i, field;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
334
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
335 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
336 field = cache->file_field_map[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
337 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
338 buffer_append(dest, data, size);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
339 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
340 for (i = 0; i < cache->fields_count; i++) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
341 if (cache->field_file_map[i] != (uint32_t)-1)
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
342 continue;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
343 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
344 buffer_append(dest, data, size);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
345 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
346 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
347
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
348 static void copy_to_buf_byte(struct mail_cache *cache, buffer_t *dest,
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
349 size_t offset)
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
350 {
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
351 const int *data;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
352 unsigned int i, field;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
353 uint8_t byte;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
354
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
355 for (i = 0; i < cache->file_fields_count; i++) {
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
356 field = cache->file_field_map[i];
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
357 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
358 byte = (uint8_t)*data;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
359 buffer_append(dest, &byte, 1);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
360 }
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
361 for (i = 0; i < cache->fields_count; i++) {
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
362 if (cache->field_file_map[i] != (uint32_t)-1)
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
363 continue;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
364 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
365 byte = (uint8_t)*data;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
366 buffer_append(dest, &byte, 1);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
367 }
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
368 }
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
369
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
370 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
371 {
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
372 buffer_t *buffer;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
373 uint32_t i, offset;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
374 int ret = 0;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
375
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
376 if (mail_cache_header_fields_read(cache) < 0 ||
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
377 mail_cache_header_fields_get_offset(cache, &offset) < 0)
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
378 return -1;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
379
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
380 t_push();
2708
f1e9f3ec8135 Buffer API change: we no longer support limited sized buffers where
Timo Sirainen <tss@iki.fi>
parents: 2604
diff changeset
381 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
382
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
383 copy_to_buf(cache, buffer,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
384 offsetof(struct mail_cache_field_private, last_used),
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
385 sizeof(uint32_t));
3375
9e2abc4c341c Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents: 3278
diff changeset
386 ret = mail_cache_write(cache, buffer->data,
9e2abc4c341c Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents: 3278
diff changeset
387 sizeof(uint32_t) * cache->file_fields_count,
9e2abc4c341c Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents: 3278
diff changeset
388 offset + MAIL_CACHE_FIELD_LAST_USED());
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
389 if (ret == 0) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
390 buffer_set_used_size(buffer, 0);
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
391 copy_to_buf_byte(cache, buffer,
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
392 offsetof(struct mail_cache_field, decision));
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
393
3375
9e2abc4c341c Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents: 3278
diff changeset
394 ret = mail_cache_write(cache, buffer->data,
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
395 sizeof(uint8_t) * cache->file_fields_count, offset +
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
396 MAIL_CACHE_FIELD_DECISION(cache->file_fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
397
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
398 if (ret == 0) {
2592
5edda9783458 minor fix
Timo Sirainen <tss@iki.fi>
parents: 2407
diff changeset
399 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
400 cache->fields[i].decision_dirty = FALSE;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
401 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
402 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
403 t_pop();
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
404
2867
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
405 if (ret == 0)
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
406 cache->field_header_write_pending = FALSE;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
407
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
408 return ret;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
409 }
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
410
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
411 int mail_cache_header_fields_update(struct mail_cache *cache)
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
412 {
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
413 int ret;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
414
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
415 if (cache->locked)
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
416 return mail_cache_header_fields_update_locked(cache);
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
417
5947
7ebe0593f488 Don't create cache file until something is actually being added to it.
Timo Sirainen <tss@iki.fi>
parents: 4722
diff changeset
418 if (mail_cache_lock(cache, NULL) <= 0)
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
419 return -1;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
420
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
421 ret = mail_cache_header_fields_update_locked(cache);
3627
c0e35566dd14 Unlocking cache file can also corrupt it since it modifies it. Added a
Timo Sirainen <tss@iki.fi>
parents: 3617
diff changeset
422 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
423 ret = -1;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
424 return ret;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
425 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
426
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
427 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
428 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
429 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
430 unsigned int field;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
431 const char *name;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
432 uint32_t i;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
433
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
434 memset(&hdr, 0, sizeof(hdr));
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
435 hdr.fields_count = cache->fields_count;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
436 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
437
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
438 /* we have to keep the field order for the existing fields. */
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
439 copy_to_buf(cache, dest,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
440 offsetof(struct mail_cache_field_private, last_used),
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
441 sizeof(uint32_t));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
442 copy_to_buf(cache, dest, offsetof(struct mail_cache_field, field_size),
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
443 sizeof(uint32_t));
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
444 copy_to_buf_byte(cache, dest, offsetof(struct mail_cache_field, type));
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
445 copy_to_buf_byte(cache, dest,
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
446 offsetof(struct mail_cache_field, decision));
2339
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 i_assert(buffer_get_used_size(dest) == sizeof(hdr) +
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
449 (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
450
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
451 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
452 field = cache->file_field_map[i];
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
453 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
454 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
455 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
456 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
457 if (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
458 continue;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
459 name = cache->fields[i].field.name;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
460 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
461 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
462
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
463 hdr.size = buffer_get_used_size(dest);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
464 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
465
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
466 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
467 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
468 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
469
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
470 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
471 uint32_t *offset_r)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
472 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
473 if (mail_cache_header_fields_get_offset(cache, offset_r) < 0)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
474 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
475
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
476 if (*offset_r == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
477 *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
478 field_header_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
479 } else {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
480 *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
481 next_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
482 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
483 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
484 }