annotate src/lib-index/mail-cache-fields.c @ 6443:53313d1e7e4f HEAD

Code cleanups and some minor fixes.
author Timo Sirainen <tss@iki.fi>
date Sat, 22 Sep 2007 11:42:58 +0300
parents 65c69a53a7be
children c7742d109a67
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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"
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
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
14 #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
15 ((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
16 (cache)->fields[field_idx].used)
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
17
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
18 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
19 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
20 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
21 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
22 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
23 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
24 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
25 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
26 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
27 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
28
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
29 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
30 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
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
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
33 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
34 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
35 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
36
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
37 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
38 {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
39 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
40 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
41 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
42 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
43 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
44 default:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
45 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
46 }
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
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
49 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
50 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
51 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
52 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
53
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
54 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
55 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
56 "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
57 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
58 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
59 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
60 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
61 "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
62 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
63 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
64 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
65 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
66
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
67 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
68 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
69 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
70 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
71 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
72 char *name;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
73 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
74 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
75
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
76 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
77 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
78 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
79 &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
80 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
81
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
82 fields[i].idx =
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
83 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
84 (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
85 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
86 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
87 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
88 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
89
3999
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
90 /* 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
91 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
92 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
93 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
94 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
95 break;
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
96 }
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 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
100 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
101 }
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 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
104 return;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
105
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
106 /* @UNSAFE */
2362
f2acbe281ac1 Allocate cache->fields and cache->fields_file_map with malloc rather than
Timo Sirainen <tss@iki.fi>
parents: 2342
diff changeset
107 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
108 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
109 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
110 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
111 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
112 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
113 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
114
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
115 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
116 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
117
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
118 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
119 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
120
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
121 /* 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
122 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
123 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
124 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
125 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
126
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
127 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
128 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
129
4020
fcfd44f56b04 While casting const pointers to something else, the const was often
Timo Sirainen <tss@iki.fi>
parents: 3999
diff changeset
130 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
131 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
132 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
133 }
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 unsigned int
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
136 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
137 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
138 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
139
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
140 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
141 &orig_key, &orig_value))
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
142 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
143 else
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
144 return (unsigned int)-1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
145 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
146
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
147 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
148 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
149 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
150 {
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 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
152 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
153
6003
6f66ce9491ad When getting cache fields list, make sure cache file is opened.
Timo Sirainen <tss@iki.fi>
parents: 5952
diff changeset
154 if (!cache->opened)
6f66ce9491ad When getting cache fields list, make sure cache file is opened.
Timo Sirainen <tss@iki.fi>
parents: 5952
diff changeset
155 (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
156
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
157 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
158 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
159 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
160 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
161 }
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
162
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 *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
164 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
165 }
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
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
167 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
168 uint32_t *offset_r)
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 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
171 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
172
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
173 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
174 *offset_r = 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
175 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
176 }
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 /* find the latest header */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
179 offset = 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
180 next_offset =
2407
fed6d07bd8ee Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents: 2362
diff changeset
181 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
182 while (next_offset != 0) {
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
183 if (next_offset == offset) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
184 mail_cache_set_corrupted(cache,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
185 "next_offset in field header loops");
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
186 return -1;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
187 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
188 offset = next_offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
189
2867
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
190 if (cache->file_cache != NULL) {
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
191 /* 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
192 file_cache_invalidate(cache->file_cache, offset,
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
193 sizeof(*field_hdr) +
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
194 CACHE_HDR_PREFETCH);
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
195 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
196 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
197 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
198 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
199
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
200 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
201 next_offset =
2407
fed6d07bd8ee Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents: 2362
diff changeset
202 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
203 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
204
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
205 *offset_r = offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
206 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
207 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
208
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
209 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
210 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
211 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
212 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
213 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
214 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
215 const char *p, *names, *end;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
216 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
217 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
218 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
219 uint32_t offset, i;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
220
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
221 if (mail_cache_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
222 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
223
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
224 if (offset == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
225 /* 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
226 return 0;
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
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
229 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
230 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
231 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
232 "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
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 /* 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
237 separately */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
238 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
239 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
240 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
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
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
244 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
245 if (cache->file_cache != NULL) {
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
246 /* 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
247 file_cache_invalidate(cache->file_cache, offset,
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
248 sizeof(*field_hdr) +
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
249 CACHE_HDR_PREFETCH);
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
250 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
251 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
252 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
253 }
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
254 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
255 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
256
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
257 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
258 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
259 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
260 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
261 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
262 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
263 } 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
264 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
265 }
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
266 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
267
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
268 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
269 sizes = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
270 MAIL_CACHE_FIELD_SIZE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
271 types = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
272 MAIL_CACHE_FIELD_TYPE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
273 decisions = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
274 MAIL_CACHE_FIELD_DECISION(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
275 names = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
276 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
277 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
278
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
279 /* clear the old mapping */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
280 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
281 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
282
6296
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
283 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
284 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
285
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
286 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
287 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
288 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
289 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
290 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
291 "field header names corrupted");
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
292 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
293 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
294
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
295 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
296 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
297 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
298 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
299 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
300 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
301 "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
302 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
303 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
304
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
305 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
306 &orig_key, &orig_value)) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
307 /* already exists, see if decision can be updated */
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
308 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
309 if (!cache->fields[field.idx].decision_dirty) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
310 cache->fields[field.idx].field.decision =
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
311 decisions[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
312 }
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
313 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
314 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
315 return -1;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
316 } else {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
317 field.name = names;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
318 field.type = types[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
319 field.field_size = sizes[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
320 field.decision = decisions[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
321 mail_cache_register_fields(cache, &field, 1);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
322 }
2968
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
323 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
324 mail_cache_set_corrupted(cache,
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
325 "Duplicated field in header: %s", names);
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
326 return -1;
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
327 }
6296
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
328 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
329
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
330 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
331 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
332
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
333 /* 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
334 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
335 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
336
6296
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
337 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
338 /* 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
339 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
340 }
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
341
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
342 names = p + 1;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
343 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
344 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
345 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
346
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
347 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
348 size_t offset, size_t size)
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
349 {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
350 const void *data;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
351 unsigned int i, field;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
352
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
353 /* copy the existing fields */
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
354 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
355 field = cache->file_field_map[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
356 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
357 buffer_append(dest, data, size);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
358 }
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
359 if (!add_new)
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
360 return;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
361
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
362 /* copy newly wanted fields */
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
363 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
364 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
365 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
366 buffer_append(dest, data, size);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
367 }
2339
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 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
370
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
371 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
372 bool add_new, size_t offset)
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
373 {
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
374 const int *data;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
375 unsigned int i, field;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
376 uint8_t byte;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
377
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
378 /* copy the existing fields */
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
379 for (i = 0; i < cache->file_fields_count; i++) {
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
380 field = cache->file_field_map[i];
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
381 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
382 byte = (uint8_t)*data;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
383 buffer_append(dest, &byte, 1);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
384 }
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
385 if (!add_new)
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
386 return;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
387
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
388 /* copy newly wanted fields */
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
389 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
390 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
391 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
392 byte = (uint8_t)*data;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
393 buffer_append(dest, &byte, 1);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
394 }
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
395 }
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
396 }
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
397
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
398 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
399 {
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
400 buffer_t *buffer;
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
401 uint32_t i, offset, dec_offset;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
402 int ret = 0;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
403
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
404 if (mail_cache_header_fields_read(cache) < 0 ||
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
405 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
406 return -1;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
407
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
408 t_push();
2708
f1e9f3ec8135 Buffer API change: we no longer support limited sized buffers where
Timo Sirainen <tss@iki.fi>
parents: 2604
diff changeset
409 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
410
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
411 copy_to_buf(cache, buffer, FALSE,
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
412 offsetof(struct mail_cache_field_private, last_used),
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
413 sizeof(uint32_t));
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
414 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
415 offset + MAIL_CACHE_FIELD_LAST_USED());
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
416 if (ret == 0) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
417 buffer_set_used_size(buffer, 0);
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
418 copy_to_buf_byte(cache, buffer, FALSE,
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
419 offsetof(struct mail_cache_field, decision));
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
420
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
421 dec_offset = offset +
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
422 MAIL_CACHE_FIELD_DECISION(cache->file_fields_count);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
423 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
424 dec_offset);
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
425 if (ret == 0) {
2592
5edda9783458 minor fix
Timo Sirainen <tss@iki.fi>
parents: 2407
diff changeset
426 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
427 cache->fields[i].decision_dirty = FALSE;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
428 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
429 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
430 t_pop();
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
431
2867
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
432 if (ret == 0)
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
433 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
434
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
435 return ret;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
436 }
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
437
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
438 int mail_cache_header_fields_update(struct mail_cache *cache)
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
439 {
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
440 int ret;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
441
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
442 if (cache->locked)
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
443 return mail_cache_header_fields_update_locked(cache);
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
444
5947
7ebe0593f488 Don't create cache file until something is actually being added to it.
Timo Sirainen <tss@iki.fi>
parents: 4722
diff changeset
445 if (mail_cache_lock(cache, NULL) <= 0)
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
446 return -1;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
447
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
448 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
449 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
450 ret = -1;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
451 return ret;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
452 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
453
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
454 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
455 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
456 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
457 unsigned int field;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
458 const char *name;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
459 uint32_t i;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
460
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
461 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
462 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
463 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
464 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
465 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
466 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
467 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
468
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
469 /* 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
470 copy_to_buf(cache, dest, TRUE,
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
471 offsetof(struct mail_cache_field_private, last_used),
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
472 sizeof(uint32_t));
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
473 copy_to_buf(cache, dest, TRUE,
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
474 offsetof(struct mail_cache_field, field_size),
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
475 sizeof(uint32_t));
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
476 copy_to_buf_byte(cache, dest, TRUE,
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
477 offsetof(struct mail_cache_field, type));
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
478 copy_to_buf_byte(cache, dest, TRUE,
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
479 offsetof(struct mail_cache_field, decision));
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
480
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
481 i_assert(dest->used == sizeof(hdr) +
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
482 (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
483
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
484 /* 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
485 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
486 field = cache->file_field_map[i];
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
487 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
488 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
489 }
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
490 /* 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
491 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
492 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
493 name = cache->fields[i].field.name;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
494 buffer_append(dest, name, strlen(name)+1);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
495 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
496 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
497
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
498 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
499 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
500
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
501 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
502 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
503 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
504
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
505 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
506 uint32_t *offset_r)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
507 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
508 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
509 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
510
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
511 if (*offset_r == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
512 *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
513 field_header_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
514 } else {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
515 *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
516 next_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
517 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
518 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
519 }