Mercurial > dovecot > original-hg > dovecot-1.2
annotate src/lib-index/mail-cache-fields.c @ 6695:76c0e3a4df7a HEAD
If we need to do more than 4 reads to get to the cached fields header,
compress the cache file.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Mon, 05 Nov 2007 21:37:27 +0200 |
parents | c7742d109a67 |
children | b0e8403b4bb1 |
rev | line source |
---|---|
6429
65c69a53a7be
Replaced my Copyright notices. The year range always ends with 2007 now.
Timo Sirainen <tss@iki.fi>
parents:
6296
diff
changeset
|
1 /* Copyright (c) 2004-2007 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" |
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" |
6694
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
8 #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
|
9 #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
|
10 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
11 #include <stddef.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 #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
|
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 |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
68 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
|
69 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
|
70 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
|
71 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
72 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
|
73 char *name; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
74 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
|
75 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
|
76 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
77 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
|
78 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
|
79 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
|
80 &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
|
81 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
|
82 |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
83 fields[i].idx = |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
84 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
|
85 (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
|
86 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
|
87 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
|
88 continue; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
89 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
90 |
3999
f1e29736e60d
Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents:
3627
diff
changeset
|
91 /* 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
|
92 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
|
93 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
|
94 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
|
95 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
|
96 break; |
f1e29736e60d
Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents:
3627
diff
changeset
|
97 } |
f1e29736e60d
Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents:
3627
diff
changeset
|
98 } |
f1e29736e60d
Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents:
3627
diff
changeset
|
99 |
f1e29736e60d
Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents:
3627
diff
changeset
|
100 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
|
101 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
|
102 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
103 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
104 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
|
105 return; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
106 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
107 /* @UNSAFE */ |
2362
f2acbe281ac1
Allocate cache->fields and cache->fields_file_map with malloc rather than
Timo Sirainen <tss@iki.fi>
parents:
2342
diff
changeset
|
108 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
|
109 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
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
116 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
|
117 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
|
118 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
119 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
|
120 continue; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
121 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
122 /* 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
|
123 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
|
124 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
|
125 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
|
126 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
|
127 |
4654
35d9433de1ca
When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents:
4345
diff
changeset
|
128 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
|
129 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
|
130 |
4020
fcfd44f56b04
While casting const pointers to something else, the const was often
Timo Sirainen <tss@iki.fi>
parents:
3999
diff
changeset
|
131 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
|
132 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
133 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
|
134 } |
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 unsigned int |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
137 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
|
138 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
139 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
|
140 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
141 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
|
142 &orig_key, &orig_value)) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
143 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
|
144 else |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
145 return (unsigned int)-1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
146 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
147 |
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
|
148 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
|
149 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
|
150 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
|
151 { |
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 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
|
153 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
|
154 |
6003
6f66ce9491ad
When getting cache fields list, make sure cache file is opened.
Timo Sirainen <tss@iki.fi>
parents:
5952
diff
changeset
|
155 if (!cache->opened) |
6f66ce9491ad
When getting cache fields list, make sure cache file is opened.
Timo Sirainen <tss@iki.fi>
parents:
5952
diff
changeset
|
156 (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
|
157 |
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
|
158 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
|
159 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
|
160 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
|
161 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
|
162 } |
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
|
163 |
b7ce2532250a
Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents:
3375
diff
changeset
|
164 *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
|
165 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
|
166 } |
b7ce2532250a
Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents:
3375
diff
changeset
|
167 |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
168 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
|
169 uint32_t *offset_r) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
170 { |
6694
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
171 const size_t page_size = mmap_get_page_size(); |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
172 const struct mail_cache_header_fields *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
|
173 const unsigned int size = sizeof(*field_hdr) + CACHE_HDR_PREFETCH; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
174 uint32_t offset, next_offset; |
6694
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
175 uoff_t invalid_start = 0, invalid_end = 0; |
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
|
176 unsigned int next_count = 0; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
177 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
178 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
|
179 *offset_r = 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
180 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
181 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
182 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
183 /* find the latest header */ |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
184 offset = 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
185 next_offset = |
2407
fed6d07bd8ee
Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents:
2362
diff
changeset
|
186 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
|
187 while (next_offset != 0) { |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
188 if (next_offset == offset) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
189 mail_cache_set_corrupted(cache, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
190 "next_offset in field header loops"); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
191 return -1; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
192 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
193 offset = next_offset; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
194 |
6694
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
195 if (offset < invalid_start && cache->file_cache != NULL) { |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
196 uoff_t new_start = offset; |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
197 |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
198 new_start &= ~(page_size-1); |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
199 file_cache_invalidate(cache->file_cache, |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
200 new_start, invalid_start); |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
201 invalid_start = new_start; |
2867
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
202 } |
6694
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
203 if (offset + size > invalid_end && cache->file_cache != NULL) { |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
204 uoff_t new_size = invalid_end - invalid_start + size; |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
205 |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
206 new_size = (new_size + page_size-1) & ~(page_size - 1); |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
207 file_cache_invalidate(cache->file_cache, |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
208 invalid_end, new_size); |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
209 invalid_end = offset + new_size; |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
210 } |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
211 |
c7742d109a67
mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents:
6443
diff
changeset
|
212 if (mail_cache_map(cache, offset, size) < 0) |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
213 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
214 |
2866
bf1e718e7370
Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents:
2708
diff
changeset
|
215 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
|
216 next_offset = |
2407
fed6d07bd8ee
Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents:
2362
diff
changeset
|
217 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
|
218 next_count++; |
2327
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 |
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
|
221 if (next_count > MAIL_CACHE_HEADER_FIELD_CONTINUE_COUNT) |
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
|
222 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
|
223 |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
224 *offset_r = offset; |
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 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
|
229 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
230 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
|
231 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
|
232 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
|
233 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
|
234 const char *p, *names, *end; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
235 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
|
236 unsigned int new_fields_count; |
6296
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
237 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
|
238 uint32_t offset, i; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
239 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
240 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
|
241 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
242 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
243 if (offset == 0) { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
244 /* 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
|
245 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
246 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
247 |
2866
bf1e718e7370
Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents:
2708
diff
changeset
|
248 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
|
249 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
|
250 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
|
251 "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
|
252 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
253 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
254 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
255 /* 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
|
256 separately */ |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
257 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
|
258 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
|
259 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
|
260 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
261 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
262 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
263 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
|
264 if (cache->file_cache != NULL) { |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
265 /* 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
|
266 file_cache_invalidate(cache->file_cache, offset, |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
267 sizeof(*field_hdr) + |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
268 CACHE_HDR_PREFETCH); |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
269 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
270 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
|
271 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
272 } |
2866
bf1e718e7370
Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents:
2708
diff
changeset
|
273 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
|
274 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
|
275 |
5952
ba118a9eeb50
Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents:
5947
diff
changeset
|
276 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
|
277 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
|
278 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
|
279 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
|
280 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
|
281 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
|
282 } 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
|
283 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
|
284 } |
5952
ba118a9eeb50
Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents:
5947
diff
changeset
|
285 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
|
286 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
287 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
|
288 sizes = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
289 MAIL_CACHE_FIELD_SIZE(field_hdr->fields_count)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
290 types = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
291 MAIL_CACHE_FIELD_TYPE(field_hdr->fields_count)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
292 decisions = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
293 MAIL_CACHE_FIELD_DECISION(field_hdr->fields_count)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
294 names = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
295 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
|
296 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
|
297 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
298 /* clear the old mapping */ |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
299 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
|
300 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
|
301 |
6296
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
302 max_drop_time = cache->index->map->hdr.day_stamp - |
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
303 MAIL_CACHE_FIELD_DROP_SECS; |
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
304 |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
305 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
|
306 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
|
307 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
|
308 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
|
309 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
|
310 "field header names corrupted"); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
311 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
312 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
313 |
4722
b0cf3e4d6c96
If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents:
4654
diff
changeset
|
314 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
|
315 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
|
316 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
|
317 } |
b0cf3e4d6c96
If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents:
4654
diff
changeset
|
318 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
|
319 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
|
320 "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
|
321 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
|
322 } |
b0cf3e4d6c96
If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents:
4654
diff
changeset
|
323 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
324 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
|
325 &orig_key, &orig_value)) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
326 /* already exists, see if decision can be updated */ |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
327 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
|
328 if (!cache->fields[field.idx].decision_dirty) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
329 cache->fields[field.idx].field.decision = |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
330 decisions[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
331 } |
4654
35d9433de1ca
When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents:
4345
diff
changeset
|
332 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
|
333 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
|
334 return -1; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
335 } else { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
336 field.name = names; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
337 field.type = types[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
338 field.field_size = sizes[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
339 field.decision = decisions[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
340 mail_cache_register_fields(cache, &field, 1); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
341 } |
2968
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
342 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
|
343 mail_cache_set_corrupted(cache, |
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
344 "Duplicated field in header: %s", names); |
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
345 return -1; |
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
346 } |
6296
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
347 cache->fields[field.idx].used = TRUE; |
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
348 |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
349 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
|
350 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
|
351 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
352 /* update last_used if it's newer than ours */ |
2342 | 353 if (last_used[i] > cache->fields[field.idx].last_used) |
354 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
|
355 |
6296
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
356 if (cache->fields[field.idx].last_used < max_drop_time) { |
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
357 /* time to drop this field */ |
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
358 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
|
359 } |
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
360 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
361 names = p + 1; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
362 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
363 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
364 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
365 |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
366 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
|
367 size_t offset, size_t size) |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
368 { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
369 const void *data; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
370 unsigned int i, field; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
371 |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
372 /* copy the existing fields */ |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
373 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
|
374 field = cache->file_field_map[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
375 data = CONST_PTR_OFFSET(&cache->fields[field], offset); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
376 buffer_append(dest, data, size); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
377 } |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
378 if (!add_new) |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
379 return; |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
380 |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
381 /* copy newly wanted fields */ |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
382 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
|
383 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) { |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
384 data = CONST_PTR_OFFSET(&cache->fields[i], offset); |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
385 buffer_append(dest, data, size); |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
386 } |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
387 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
388 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
389 |
2342 | 390 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
|
391 bool add_new, size_t offset) |
2342 | 392 { |
393 const int *data; | |
394 unsigned int i, field; | |
395 uint8_t byte; | |
396 | |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
397 /* copy the existing fields */ |
2342 | 398 for (i = 0; i < cache->file_fields_count; i++) { |
399 field = cache->file_field_map[i]; | |
400 data = CONST_PTR_OFFSET(&cache->fields[field], offset); | |
401 byte = (uint8_t)*data; | |
402 buffer_append(dest, &byte, 1); | |
403 } | |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
404 if (!add_new) |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
405 return; |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
406 |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
407 /* copy newly wanted fields */ |
2342 | 408 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
|
409 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) { |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
410 data = CONST_PTR_OFFSET(&cache->fields[i], offset); |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
411 byte = (uint8_t)*data; |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
412 buffer_append(dest, &byte, 1); |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
413 } |
2342 | 414 } |
415 } | |
416 | |
2929 | 417 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
|
418 { |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
419 buffer_t *buffer; |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
420 uint32_t i, offset, dec_offset; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
421 int ret = 0; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
422 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
423 if (mail_cache_header_fields_read(cache) < 0 || |
2929 | 424 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
|
425 return -1; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
426 |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
427 t_push(); |
2708
f1e9f3ec8135
Buffer API change: we no longer support limited sized buffers where
Timo Sirainen <tss@iki.fi>
parents:
2604
diff
changeset
|
428 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
|
429 |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
430 copy_to_buf(cache, buffer, FALSE, |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
431 offsetof(struct mail_cache_field_private, last_used), |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
432 sizeof(uint32_t)); |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
433 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
|
434 offset + MAIL_CACHE_FIELD_LAST_USED()); |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
435 if (ret == 0) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
436 buffer_set_used_size(buffer, 0); |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
437 copy_to_buf_byte(cache, buffer, FALSE, |
2342 | 438 offsetof(struct mail_cache_field, decision)); |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
439 |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
440 dec_offset = offset + |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
441 MAIL_CACHE_FIELD_DECISION(cache->file_fields_count); |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
442 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
|
443 dec_offset); |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
444 if (ret == 0) { |
2592 | 445 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
|
446 cache->fields[i].decision_dirty = FALSE; |
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 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
449 t_pop(); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
450 |
2867
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
451 if (ret == 0) |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
452 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
|
453 |
2929 | 454 return ret; |
455 } | |
456 | |
457 int mail_cache_header_fields_update(struct mail_cache *cache) | |
458 { | |
459 int ret; | |
460 | |
461 if (cache->locked) | |
462 return mail_cache_header_fields_update_locked(cache); | |
463 | |
5947
7ebe0593f488
Don't create cache file until something is actually being added to it.
Timo Sirainen <tss@iki.fi>
parents:
4722
diff
changeset
|
464 if (mail_cache_lock(cache, NULL) <= 0) |
2929 | 465 return -1; |
466 | |
467 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
|
468 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
|
469 ret = -1; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
470 return ret; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
471 } |
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 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
|
474 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
475 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
|
476 unsigned int field; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
477 const char *name; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
478 uint32_t i; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
479 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
480 memset(&hdr, 0, sizeof(hdr)); |
6296
205ee38f10d1
Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents:
6003
diff
changeset
|
481 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
|
482 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
|
483 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
|
484 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
|
485 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
486 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
|
487 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
488 /* 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
|
489 copy_to_buf(cache, dest, TRUE, |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
490 offsetof(struct mail_cache_field_private, last_used), |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
491 sizeof(uint32_t)); |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
492 copy_to_buf(cache, dest, TRUE, |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
493 offsetof(struct mail_cache_field, field_size), |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
494 sizeof(uint32_t)); |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
495 copy_to_buf_byte(cache, dest, TRUE, |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
496 offsetof(struct mail_cache_field, type)); |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
497 copy_to_buf_byte(cache, dest, TRUE, |
2342 | 498 offsetof(struct mail_cache_field, decision)); |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
499 |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
500 i_assert(dest->used == sizeof(hdr) + |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
501 (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
|
502 |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
503 /* 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
|
504 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
|
505 field = cache->file_field_map[i]; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
506 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
|
507 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
|
508 } |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
509 /* 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
|
510 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
|
511 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) { |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
512 name = cache->fields[i].field.name; |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
513 buffer_append(dest, name, strlen(name)+1); |
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
514 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
515 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
516 |
6443
53313d1e7e4f
Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents:
6429
diff
changeset
|
517 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
|
518 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
|
519 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
520 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
|
521 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
|
522 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
523 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
524 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
|
525 uint32_t *offset_r) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
526 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
527 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
|
528 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
529 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
530 if (*offset_r == 0) { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
531 *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
|
532 field_header_offset); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
533 } else { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
534 *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
|
535 next_offset); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
536 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
537 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
538 } |