annotate src/lib-index/mail-cache-fields.c @ 9191:b340ecb24469 HEAD

Fix VPATH build of RQUOTA support. Some rpcgen derive #include "..." paths from the infile argument. This will be off for VPATH builds, as the generated rquota_xdr.c code will look in $(srcdir), but we'll generate the rquota.h file in $(builddir). Play safe and copy rquota.x to $(builddir) first. This fixes the build on openSUSE 11.1.
author Matthias Andree <matthias.andree@gmx.de>
date Tue, 07 Jul 2009 21:01:36 +0200
parents b9faf4db2a9f
children 00cd9aacd03c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8590
b9faf4db2a9f Updated copyright notices to include year 2009.
Timo Sirainen <tss@iki.fi>
parents: 8573
diff changeset
1 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "lib.h"
6717
02014f5b0068 Don't write fields to cache file with last_used=0. If fields were just
Timo Sirainen <tss@iki.fi>
parents: 6707
diff changeset
4 #include "ioloop.h"
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
5 #include "buffer.h"
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
6 #include "hash.h"
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
7 #include "file-cache.h"
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
8 #include "read-full.h"
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
9 #include "write-full.h"
6694
c7742d109a67 mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents: 6443
diff changeset
10 #include "mmap-util.h"
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
11 #include "mail-cache-private.h"
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
13 #include <stddef.h>
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
14
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
15 #define CACHE_FIELD_IS_NEWLY_WANTED(cache, field_idx) \
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
16 ((cache)->field_file_map[field_idx] == (uint32_t)-1 && \
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
17 (cache)->fields[field_idx].used)
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
18
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
19 static bool field_has_fixed_size(enum mail_cache_field_type type)
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
20 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
21 switch (type) {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
22 case MAIL_CACHE_FIELD_FIXED_SIZE:
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
23 case MAIL_CACHE_FIELD_BITMASK:
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
24 return TRUE;
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
25 case MAIL_CACHE_FIELD_VARIABLE_SIZE:
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
26 case MAIL_CACHE_FIELD_STRING:
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
27 case MAIL_CACHE_FIELD_HEADER:
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
28 return FALSE;
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
29
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
30 case MAIL_CACHE_FIELD_COUNT:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
31 break;
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
32 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
33
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
34 i_unreached();
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
35 return FALSE;
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
36 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
37
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
38 static bool field_decision_is_valid(enum mail_cache_decision_type type)
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
39 {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
40 switch (type & ~MAIL_CACHE_DECISION_FORCED) {
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
41 case MAIL_CACHE_DECISION_NO:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
42 case MAIL_CACHE_DECISION_TEMP:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
43 case MAIL_CACHE_DECISION_YES:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
44 return TRUE;
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
45 default:
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
46 return FALSE;
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
47 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
48 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
49
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
50 static int field_type_verify(struct mail_cache *cache, unsigned int idx,
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
51 enum mail_cache_field_type type, unsigned int size)
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
52 {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
53 const struct mail_cache_field *field = &cache->fields[idx].field;
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
54
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
55 if (field->type != type) {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
56 mail_cache_set_corrupted(cache,
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
57 "registered field %s type changed", field->name);
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
58 return -1;
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
59 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
60 if (field->field_size != size && field_has_fixed_size(type)) {
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
61 mail_cache_set_corrupted(cache,
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
62 "registered field %s size changed", field->name);
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
63 return -1;
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
64 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
65 return 0;
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
66 }
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
67
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++) {
8573
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
79 if (hash_table_lookup_full(cache->field_name_hash,
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
80 fields[i].name,
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
81 &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
82 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
83
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
84 fields[i].idx =
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
85 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
86 (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
87 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
88 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
89 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
90 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
91
3999
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
92 /* 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
93 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
94 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
95 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
96 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
97 break;
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
f1e29736e60d Don't register cache fields twice. Fixes "duplicate field in header" errors.
Timo Sirainen <tss@iki.fi>
parents: 3627
diff changeset
101 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
102 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
103 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
104
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
105 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
106 return;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
107
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
108 /* @UNSAFE */
2362
f2acbe281ac1 Allocate cache->fields and cache->fields_file_map with malloc rather than
Timo Sirainen <tss@iki.fi>
parents: 2342
diff changeset
109 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
110 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
111 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
112 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
113 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
114 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
115 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
116
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
117 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
118 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
119
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
120 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
121 continue;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
122
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
123 /* 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
124 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
125 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
126 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
127 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
128
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
129 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
130 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
131
8573
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
132 hash_table_insert(cache->field_name_hash,
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
133 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
134 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
135 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
136 }
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 unsigned int
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
139 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
140 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
141 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
142
8573
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
143 if (hash_table_lookup_full(cache->field_name_hash, name,
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
144 &orig_key, &orig_value))
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
145 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
146 else
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
147 return (unsigned int)-1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
148 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
149
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
150 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
151 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
152 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
153 {
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 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
155 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
156
6003
6f66ce9491ad When getting cache fields list, make sure cache file is opened.
Timo Sirainen <tss@iki.fi>
parents: 5952
diff changeset
157 if (!cache->opened)
6f66ce9491ad When getting cache fields list, make sure cache file is opened.
Timo Sirainen <tss@iki.fi>
parents: 5952
diff changeset
158 (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
159
8282
a0c05c33f838 cache file: Don't crash if file has no fields.
Timo Sirainen <tss@iki.fi>
parents: 8119
diff changeset
160 list = cache->fields_count == 0 ? NULL :
a0c05c33f838 cache file: Don't crash if file has no fields.
Timo Sirainen <tss@iki.fi>
parents: 8119
diff changeset
161 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
162 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
163 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
164 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
165 }
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
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 *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
168 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
169 }
b7ce2532250a Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents: 3375
diff changeset
170
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
171 static int mail_cache_header_fields_get_offset(struct mail_cache *cache,
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
172 uint32_t *offset_r, bool map)
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
173 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
174 const struct mail_cache_header_fields *field_hdr;
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
175 struct mail_cache_header_fields tmp_field_hdr;
6705
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
176 uint32_t offset = 0, 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
177 unsigned int next_count = 0;
6795
407f75ee2598 mmap_disable=yes: Don't invalidate file cache unneededly when reading cache
Timo Sirainen <tss@iki.fi>
parents: 6717
diff changeset
178 bool invalidate = FALSE;
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
179 int ret;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
180
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
181 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
182 *offset_r = 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
183 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
184 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
185
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
186 /* find the latest header */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
187 offset = 0;
6705
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
188 next_offset = cache->last_field_header_offset != 0 ?
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
189 cache->last_field_header_offset :
2407
fed6d07bd8ee Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents: 2362
diff changeset
190 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
191 while (next_offset != 0) {
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
192 if (next_offset == offset) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
193 mail_cache_set_corrupted(cache,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
194 "next_offset in field header loops");
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
195 return -1;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
196 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
197 offset = next_offset;
6795
407f75ee2598 mmap_disable=yes: Don't invalidate file cache unneededly when reading cache
Timo Sirainen <tss@iki.fi>
parents: 6717
diff changeset
198 invalidate = TRUE;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
199
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
200 if (cache->mmap_base != NULL) {
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
201 if (mail_cache_map(cache, offset,
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
202 sizeof(*field_hdr)) < 0)
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
203 return -1;
8119
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data.
Timo Sirainen <tss@iki.fi>
parents: 8026
diff changeset
204 if (offset >= cache->mmap_length) {
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data.
Timo Sirainen <tss@iki.fi>
parents: 8026
diff changeset
205 mail_cache_set_corrupted(cache,
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data.
Timo Sirainen <tss@iki.fi>
parents: 8026
diff changeset
206 "header field next_offset points outside file");
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data.
Timo Sirainen <tss@iki.fi>
parents: 8026
diff changeset
207 return -1;
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data.
Timo Sirainen <tss@iki.fi>
parents: 8026
diff changeset
208 }
6694
c7742d109a67 mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents: 6443
diff changeset
209
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
210 field_hdr = CONST_PTR_OFFSET(cache->data, offset);
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
211 } else {
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
212 /* if we need to follow multiple offsets to get to
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
213 the last one, it's faster to just pread() the file
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
214 instead of going through cache */
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
215 ret = pread_full(cache->fd, &tmp_field_hdr,
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
216 sizeof(tmp_field_hdr), offset);
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
217 if (ret < 0) {
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
218 mail_cache_set_syscall_error(cache, "pread()");
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
219 return -1;
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
220 }
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
221 if (ret == 0) {
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
222 mail_cache_set_corrupted(cache,
8119
c96d9af856d1 cache file: Don't crash if fields header offset points outside mmapped data.
Timo Sirainen <tss@iki.fi>
parents: 8026
diff changeset
223 "header field next_offset points outside file");
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
224 return -1;
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
225 }
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
226 field_hdr = &tmp_field_hdr;
6694
c7742d109a67 mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents: 6443
diff changeset
227 }
c7742d109a67 mmap_disable=yes: When following cache field headers, don't invalidate the
Timo Sirainen <tss@iki.fi>
parents: 6443
diff changeset
228
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
229 next_offset =
2407
fed6d07bd8ee Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents: 2362
diff changeset
230 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
231 next_count++;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
232 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
233
6705
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
234 if (offset == 0) {
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
235 mail_cache_set_corrupted(cache, "missing header fields");
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
236 return -1;
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
237 }
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
238 cache->last_field_header_offset = offset;
68bb5bec043e When reading the latest fields, begin finding the fields from the last known
Timo Sirainen <tss@iki.fi>
parents: 6704
diff changeset
239
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
240 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
241 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
242
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
243 if (map) {
6795
407f75ee2598 mmap_disable=yes: Don't invalidate file cache unneededly when reading cache
Timo Sirainen <tss@iki.fi>
parents: 6717
diff changeset
244 if (cache->file_cache != NULL && invalidate) {
407f75ee2598 mmap_disable=yes: Don't invalidate file cache unneededly when reading cache
Timo Sirainen <tss@iki.fi>
parents: 6717
diff changeset
245 /* if this isn't the first header in file and we hadn't
407f75ee2598 mmap_disable=yes: Don't invalidate file cache unneededly when reading cache
Timo Sirainen <tss@iki.fi>
parents: 6717
diff changeset
246 read this before, we can't trust that the cached
407f75ee2598 mmap_disable=yes: Don't invalidate file cache unneededly when reading cache
Timo Sirainen <tss@iki.fi>
parents: 6717
diff changeset
247 data is valid */
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
248 file_cache_invalidate(cache->file_cache, offset,
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
249 field_hdr->size);
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
250 }
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
251 if (mail_cache_map(cache, offset, field_hdr->size) < 0)
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
252 return -1;
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
253 }
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
254
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
255 *offset_r = offset;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
256 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
257 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
258
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
259 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
260 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
261 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
262 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
263 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
264 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
265 const char *p, *names, *end;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
266 void *orig_key, *orig_value;
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
267 unsigned int fidx, new_fields_count;
7075
c8507f755f0b Don't trigger cache compression based on fields with a forced decision.
Timo Sirainen <tss@iki.fi>
parents: 7070
diff changeset
268 enum mail_cache_decision_type dec;
6296
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
269 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
270 uint32_t offset, i;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
271
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
272 if (mail_cache_header_fields_get_offset(cache, &offset, TRUE) < 0)
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
273 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
274
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
275 if (offset == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
276 /* 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
277 return 0;
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
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
280 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
281 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
282 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
283 "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
284 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
285 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
286
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
287 /* 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
288 separately */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
289 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
290 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
291 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
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
2866
bf1e718e7370 Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents: 2708
diff changeset
295 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
296 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
297
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
298 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
299 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
300 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
301 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
302 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
303 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
304 } 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
305 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
306 }
5952
ba118a9eeb50 Some paranoia fixes for memory allocation. Don't access a mmaped variable
Timo Sirainen <tss@iki.fi>
parents: 5947
diff changeset
307 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
308
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
309 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
310 sizes = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
311 MAIL_CACHE_FIELD_SIZE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
312 types = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
313 MAIL_CACHE_FIELD_TYPE(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
314 decisions = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
315 MAIL_CACHE_FIELD_DECISION(field_hdr->fields_count));
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
316 names = CONST_PTR_OFFSET(field_hdr,
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
317 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
318 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
319
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
320 /* clear the old mapping */
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
321 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
322 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
323
6922
284c22a7a92e Don't compress cache file unneededly when creating the first messages.
Timo Sirainen <tss@iki.fi>
parents: 6795
diff changeset
324 max_drop_time = cache->index->map->hdr.day_stamp == 0 ? 0 :
284c22a7a92e Don't compress cache file unneededly when creating the first messages.
Timo Sirainen <tss@iki.fi>
parents: 6795
diff changeset
325 cache->index->map->hdr.day_stamp - MAIL_CACHE_FIELD_DROP_SECS;
6296
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
326
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
327 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
328 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
329 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
330 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
331 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
332 "field header names corrupted");
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
333 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
334 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
335
4722
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
336 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
337 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
338 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
339 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
340 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
341 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
342 "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
343 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
344 }
b0cf3e4d6c96 If cache file contains broken field type or decision type mark the cache
Timo Sirainen <tss@iki.fi>
parents: 4654
diff changeset
345
8573
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
346 if (hash_table_lookup_full(cache->field_name_hash, names,
f9166a09423a Renamed hash_*() to hash_table_*() to avoid conflicts with OSX's strhash.h
Timo Sirainen <tss@iki.fi>
parents: 8282
diff changeset
347 &orig_key, &orig_value)) {
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
348 /* already exists, see if decision can be updated */
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
349 fidx = POINTER_CAST_TO(orig_value, unsigned int);
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
350 if (!cache->fields[fidx].decision_dirty) {
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
351 cache->fields[fidx].field.decision =
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
352 decisions[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
353 }
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
354 if (field_type_verify(cache, fidx,
4654
35d9433de1ca When registering fields, if they were already exited in the cache file mark
Timo Sirainen <tss@iki.fi>
parents: 4345
diff changeset
355 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
356 return -1;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
357 } else {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
358 field.name = names;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
359 field.type = types[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
360 field.field_size = sizes[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
361 field.decision = decisions[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
362 mail_cache_register_fields(cache, &field, 1);
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
363 fidx = field.idx;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
364 }
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
365 if (cache->field_file_map[fidx] != (uint32_t)-1) {
2968
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
366 mail_cache_set_corrupted(cache,
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
367 "Duplicated field in header: %s", names);
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
368 return -1;
2ab037df6cf3 Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents: 2929
diff changeset
369 }
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
370 cache->fields[fidx].used = TRUE;
6296
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
371
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
372 cache->field_file_map[fidx] = i;
7058
cf4cee852a05 Previous compiler warning fix changes broke cache file reading.
Timo Sirainen <tss@iki.fi>
parents: 7043
diff changeset
373 cache->file_field_map[i] = fidx;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
374
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
375 /* update last_used if it's newer than ours */
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
376 if (last_used[i] > cache->fields[fidx].last_used)
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
377 cache->fields[fidx].last_used = last_used[i];
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
378
7075
c8507f755f0b Don't trigger cache compression based on fields with a forced decision.
Timo Sirainen <tss@iki.fi>
parents: 7070
diff changeset
379 dec = cache->fields[fidx].field.decision;
7043
7708a8c166d6 Compiler warning fixes on 32bit systems.
Timo Sirainen <tss@iki.fi>
parents: 6940
diff changeset
380 if ((time_t)cache->fields[fidx].last_used < max_drop_time &&
7070
1bf9e7248e15 If cache field is cached with decision=no, don't try to compress cache file
Timo Sirainen <tss@iki.fi>
parents: 7058
diff changeset
381 cache->fields[fidx].last_used != 0 &&
7075
c8507f755f0b Don't trigger cache compression based on fields with a forced decision.
Timo Sirainen <tss@iki.fi>
parents: 7070
diff changeset
382 (dec & MAIL_CACHE_DECISION_FORCED) == 0 &&
c8507f755f0b Don't trigger cache compression based on fields with a forced decision.
Timo Sirainen <tss@iki.fi>
parents: 7070
diff changeset
383 dec != MAIL_CACHE_DECISION_NO) {
6707
4752637a6ad4 Don't bother compressing cache file just to drop fields from header that
Timo Sirainen <tss@iki.fi>
parents: 6705
diff changeset
384 /* time to drop this field. don't bother dropping
4752637a6ad4 Don't bother compressing cache file just to drop fields from header that
Timo Sirainen <tss@iki.fi>
parents: 6705
diff changeset
385 fields that have never been used. */
6296
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
386 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
387 }
205ee38f10d1 Drop fields that haven't been used for 30 days when compressing.
Timo Sirainen <tss@iki.fi>
parents: 6003
diff changeset
388
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
389 names = p + 1;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
390 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
391 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
392 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
393
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
394 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
395 size_t offset, size_t size)
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
396 {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
397 const void *data;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
398 unsigned int i, field;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
399
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
400 /* copy the existing fields */
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
401 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
402 field = cache->file_field_map[i];
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
403 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
404 buffer_append(dest, data, size);
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
405 }
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
406 if (!add_new)
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
407 return;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
408
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
409 /* copy newly wanted fields */
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
410 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
411 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
412 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
413 buffer_append(dest, data, size);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
414 }
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
415 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
416 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
417
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
418 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
419 bool add_new, size_t offset)
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
420 {
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
421 const int *data;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
422 unsigned int i, field;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
423 uint8_t byte;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
424
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
425 /* copy the existing fields */
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
426 for (i = 0; i < cache->file_fields_count; i++) {
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
427 field = cache->file_field_map[i];
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
428 data = CONST_PTR_OFFSET(&cache->fields[field], offset);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
429 byte = (uint8_t)*data;
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
430 buffer_append(dest, &byte, 1);
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
431 }
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
432 if (!add_new)
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
433 return;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
434
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
435 /* copy newly wanted fields */
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
436 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
437 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
438 data = CONST_PTR_OFFSET(&cache->fields[i], offset);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
439 byte = (uint8_t)*data;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
440 buffer_append(dest, &byte, 1);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
441 }
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
442 }
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
443 }
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
444
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
445 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
446 {
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
447 buffer_t *buffer;
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
448 uint32_t i, offset, dec_offset;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
449 int ret = 0;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
450
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
451 if (mail_cache_header_fields_read(cache) < 0 ||
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
452 mail_cache_header_fields_get_offset(cache, &offset, FALSE) < 0)
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
453 return -1;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
454
2708
f1e9f3ec8135 Buffer API change: we no longer support limited sized buffers where
Timo Sirainen <tss@iki.fi>
parents: 2604
diff changeset
455 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
456
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
457 copy_to_buf(cache, buffer, FALSE,
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
458 offsetof(struct mail_cache_field_private, last_used),
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
459 sizeof(uint32_t));
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
460 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
461 offset + MAIL_CACHE_FIELD_LAST_USED());
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
462 if (ret == 0) {
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
463 buffer_set_used_size(buffer, 0);
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
464 copy_to_buf_byte(cache, buffer, FALSE,
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
465 offsetof(struct mail_cache_field, decision));
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
466
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
467 dec_offset = offset +
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
468 MAIL_CACHE_FIELD_DECISION(cache->file_fields_count);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
469 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
470 dec_offset);
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
471 if (ret == 0) {
2592
5edda9783458 minor fix
Timo Sirainen <tss@iki.fi>
parents: 2407
diff changeset
472 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
473 cache->fields[i].decision_dirty = FALSE;
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
474 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
475 }
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
476
2867
d416b6d0a7ee More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents: 2866
diff changeset
477 if (ret == 0)
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
478 cache->field_header_write_pending = FALSE;
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
479 return ret;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
480 }
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
481
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
482 int mail_cache_header_fields_update(struct mail_cache *cache)
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
483 {
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
484 int ret;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
485
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6922
diff changeset
486 if (cache->locked) {
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7105
diff changeset
487 T_BEGIN {
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6922
diff changeset
488 ret = mail_cache_header_fields_update_locked(cache);
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7105
diff changeset
489 } T_END;
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6922
diff changeset
490 return ret;
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6922
diff changeset
491 }
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
492
8026
ff6ccf848cc1 Compiler warning fixes.
Timo Sirainen <tss@iki.fi>
parents: 7226
diff changeset
493 if (mail_cache_lock(cache, FALSE) <= 0)
2929
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
494 return -1;
ba9062032877 Locking fixes and cleanups
Timo Sirainen <tss@iki.fi>
parents: 2867
diff changeset
495
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7105
diff changeset
496 T_BEGIN {
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6922
diff changeset
497 ret = mail_cache_header_fields_update_locked(cache);
7226
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents: 7105
diff changeset
498 } T_END;
3627
c0e35566dd14 Unlocking cache file can also corrupt it since it modifies it. Added a
Timo Sirainen <tss@iki.fi>
parents: 3617
diff changeset
499 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
500 ret = -1;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
501 return ret;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
502 }
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 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
505 {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
506 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
507 unsigned int field;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
508 const char *name;
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
509 uint32_t i;
2327
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 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
512 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
513 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
514 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
515 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
516 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
517 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
518
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
519 /* 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
520 copy_to_buf(cache, dest, TRUE,
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
521 offsetof(struct mail_cache_field_private, last_used),
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
522 sizeof(uint32_t));
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
523 copy_to_buf(cache, dest, TRUE,
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
524 offsetof(struct mail_cache_field, field_size),
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
525 sizeof(uint32_t));
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
526 copy_to_buf_byte(cache, dest, TRUE,
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
527 offsetof(struct mail_cache_field, type));
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
528 copy_to_buf_byte(cache, dest, TRUE,
2342
fa529dd77176 Fixes for big endian systems.
Timo Sirainen <tss@iki.fi>
parents: 2339
diff changeset
529 offsetof(struct mail_cache_field, decision));
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
530
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
531 i_assert(dest->used == sizeof(hdr) +
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
532 (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
533
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
534 /* 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
535 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
536 field = cache->file_field_map[i];
2339
406692edc12d Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents: 2327
diff changeset
537 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
538 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
539 }
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
540 /* 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
541 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
542 if (CACHE_FIELD_IS_NEWLY_WANTED(cache, i)) {
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
543 name = cache->fields[i].field.name;
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
544 buffer_append(dest, name, strlen(name)+1);
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
545 }
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
546 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
547
6443
53313d1e7e4f Code cleanups and some minor fixes.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
548 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
549 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
550
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
551 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
552 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
553 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
554
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
555 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
556 uint32_t *offset_r)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
557 {
6704
b0e8403b4bb1 mmap_disable=yes: Find the latest cache field header by pread()ing the file
Timo Sirainen <tss@iki.fi>
parents: 6695
diff changeset
558 if (mail_cache_header_fields_get_offset(cache, offset_r, FALSE) < 0)
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
559 return -1;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
560
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
561 if (*offset_r == 0) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
562 *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
563 field_header_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
564 } else {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
565 *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
566 next_offset);
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
567 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
568 return 0;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
569 }