Mercurial > dovecot > original-hg > dovecot-1.2
annotate src/lib-index/mail-cache-fields.c @ 3617:904849549eac HEAD
Removed null4 and replaced the few uses of it with buffer_append_zero().
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sun, 25 Sep 2005 13:44:04 +0300 |
parents | 7cab5dc6a0cd |
children | c0e35566dd14 |
rev | line source |
---|---|
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1 /* Copyright (C) 2004 Timo Sirainen */ |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
2 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
3 #include "lib.h" |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
4 #include "buffer.h" |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
5 #include "hash.h" |
2866
bf1e718e7370
Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents:
2708
diff
changeset
|
6 #include "file-cache.h" |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
7 #include "write-full.h" |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
8 #include "mail-cache-private.h" |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
9 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
10 #include <stddef.h> |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
11 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
12 #define CACHE_HDR_PREFETCH 1024 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
13 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
14 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
|
15 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
|
16 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
|
17 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
18 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
|
19 unsigned int new_idx; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
20 size_t i; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
21 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
22 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
|
23 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
|
24 if (hash_lookup_full(cache->field_name_hash, fields[i].name, |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
25 &orig_key, &orig_value)) { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
26 fields[i].idx = |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
27 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
|
28 continue; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
29 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
30 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
31 fields[i].idx = new_idx++; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
32 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
33 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
34 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
|
35 return; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
36 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
37 /* @UNSAFE */ |
2362
f2acbe281ac1
Allocate cache->fields and cache->fields_file_map with malloc rather than
Timo Sirainen <tss@iki.fi>
parents:
2342
diff
changeset
|
38 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
|
39 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
|
40 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
|
41 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
|
42 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
|
43 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
|
44 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
|
45 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
46 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
|
47 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
|
48 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
49 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
|
50 continue; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
51 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
52 /* new index - save it */ |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
53 cache->fields[idx].field = fields[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
54 cache->fields[idx].field.name = |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
55 p_strdup(cache->field_pool, fields[i].name); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
56 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
|
57 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
58 switch (cache->fields[idx].field.type) { |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
59 case MAIL_CACHE_FIELD_FIXED_SIZE: |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
60 case MAIL_CACHE_FIELD_BITMASK: |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
61 break; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
62 case MAIL_CACHE_FIELD_VARIABLE_SIZE: |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
63 case MAIL_CACHE_FIELD_STRING: |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
64 case MAIL_CACHE_FIELD_HEADER: |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
65 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
|
66 break; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
67 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
68 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
69 hash_insert(cache->field_name_hash, |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
70 (char *)cache->fields[idx].field.name, |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
71 POINTER_CAST(idx)); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
72 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
73 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
|
74 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
75 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
76 unsigned int |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
77 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
|
78 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
79 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
|
80 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
81 if (hash_lookup_full(cache->field_name_hash, name, |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
82 &orig_key, &orig_value)) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
83 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
|
84 else |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
85 return (unsigned int)-1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
86 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
87 |
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
|
88 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
|
89 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
|
90 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
|
91 { |
b7ce2532250a
Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents:
3375
diff
changeset
|
92 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
|
93 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
|
94 |
b7ce2532250a
Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents:
3375
diff
changeset
|
95 list = p_new(pool, struct mail_cache_field, cache->fields_count); |
3494
7cab5dc6a0cd
mail_cache_register_get_list(): Allocate the returned strings also from
Timo Sirainen <tss@iki.fi>
parents:
3461
diff
changeset
|
96 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
|
97 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
|
98 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
|
99 } |
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
|
100 |
b7ce2532250a
Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents:
3375
diff
changeset
|
101 *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
|
102 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
|
103 } |
b7ce2532250a
Added mail_cache_register_get_list() to get a list of all registered fields
Timo Sirainen <tss@iki.fi>
parents:
3375
diff
changeset
|
104 |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
105 static int mail_cache_header_fields_get_offset(struct mail_cache *cache, |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
106 uint32_t *offset_r) |
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 const struct mail_cache_header_fields *field_hdr; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
109 uint32_t offset, next_offset; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
110 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
111 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
|
112 *offset_r = 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
113 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
114 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
115 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
116 /* find the latest header */ |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
117 offset = 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
118 next_offset = |
2407
fed6d07bd8ee
Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents:
2362
diff
changeset
|
119 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
|
120 while (next_offset != 0) { |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
121 if (next_offset == offset) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
122 mail_cache_set_corrupted(cache, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
123 "next_offset in field header loops"); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
124 return -1; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
125 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
126 offset = next_offset; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
127 |
2867
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
128 if (cache->file_cache != NULL) { |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
129 /* we can't trust that the cached data is valid */ |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
130 file_cache_invalidate(cache->file_cache, offset, |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
131 sizeof(*field_hdr) + |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
132 CACHE_HDR_PREFETCH); |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
133 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
134 if (mail_cache_map(cache, offset, |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
135 sizeof(*field_hdr) + CACHE_HDR_PREFETCH) < 0) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
136 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
137 |
2866
bf1e718e7370
Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents:
2708
diff
changeset
|
138 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
|
139 next_offset = |
2407
fed6d07bd8ee
Transaction log file is now read-lockless.
Timo Sirainen <tss@iki.fi>
parents:
2362
diff
changeset
|
140 mail_index_offset_to_uint32(field_hdr->next_offset); |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
141 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
142 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
143 *offset_r = offset; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
144 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
145 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
146 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
147 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
|
148 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
149 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
|
150 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
|
151 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
|
152 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
|
153 const char *p, *names, *end; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
154 void *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
|
155 uint32_t offset, i; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
156 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
157 if (mail_cache_header_fields_get_offset(cache, &offset) < 0) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
158 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
159 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
160 if (offset == 0) { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
161 /* 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
|
162 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
163 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
164 |
2866
bf1e718e7370
Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents:
2708
diff
changeset
|
165 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
|
166 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
|
167 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
|
168 "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
|
169 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
170 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
171 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
172 /* 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
|
173 separately */ |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
174 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
|
175 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
|
176 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
|
177 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
178 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
179 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
180 if (field_hdr->size > sizeof(*field_hdr) + CACHE_HDR_PREFETCH) { |
2867
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
181 if (cache->file_cache != NULL) { |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
182 /* we can't trust that the cached data is valid */ |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
183 file_cache_invalidate(cache->file_cache, offset, |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
184 sizeof(*field_hdr) + |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
185 CACHE_HDR_PREFETCH); |
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
186 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
187 if (mail_cache_map(cache, offset, field_hdr->size) < 0) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
188 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
189 } |
2866
bf1e718e7370
Cache file works now with mmap_disable=yes. Still needs a few optimizations.
Timo Sirainen <tss@iki.fi>
parents:
2708
diff
changeset
|
190 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
|
191 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
192 cache->file_field_map = |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
193 i_realloc(cache->file_field_map, |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
194 cache->file_fields_count * sizeof(unsigned int), |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
195 field_hdr->fields_count * sizeof(unsigned int)); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
196 cache->file_fields_count = field_hdr->fields_count; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
197 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
198 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
|
199 sizes = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
200 MAIL_CACHE_FIELD_SIZE(field_hdr->fields_count)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
201 types = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
202 MAIL_CACHE_FIELD_TYPE(field_hdr->fields_count)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
203 decisions = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
204 MAIL_CACHE_FIELD_DECISION(field_hdr->fields_count)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
205 names = CONST_PTR_OFFSET(field_hdr, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
206 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
|
207 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
|
208 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
209 /* clear the old mapping */ |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
210 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
|
211 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
|
212 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
213 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
|
214 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
|
215 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
|
216 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
|
217 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
|
218 "field header names corrupted"); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
219 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
220 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
221 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
222 if (hash_lookup_full(cache->field_name_hash, names, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
223 &orig_key, &orig_value)) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
224 /* already exists, see if decision can be updated */ |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
225 field.idx = POINTER_CAST_TO(orig_value, unsigned int); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
226 if (!cache->fields[field.idx].decision_dirty) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
227 cache->fields[field.idx].field.decision = |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
228 decisions[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
229 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
230 if (cache->fields[field.idx].field.type != types[i]) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
231 mail_cache_set_corrupted(cache, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
232 "registered field type changed"); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
233 return -1; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
234 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
235 } else { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
236 field.name = names; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
237 field.type = types[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
238 field.field_size = sizes[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
239 field.decision = decisions[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
240 mail_cache_register_fields(cache, &field, 1); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
241 } |
2968
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
242 if (cache->field_file_map[field.idx] != (uint32_t)-1) { |
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
243 mail_cache_set_corrupted(cache, |
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
244 "Duplicated field in header: %s", names); |
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
245 return -1; |
2ab037df6cf3
Check for duplicate fields in header.
Timo Sirainen <tss@iki.fi>
parents:
2929
diff
changeset
|
246 } |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
247 cache->field_file_map[field.idx] = i; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
248 cache->file_field_map[i] = field.idx; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
249 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
250 /* update last_used if it's newer than ours */ |
2342 | 251 if (last_used[i] > cache->fields[field.idx].last_used) |
252 cache->fields[field.idx].last_used = last_used[i]; | |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
253 |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
254 names = p + 1; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
255 } |
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 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
259 static void copy_to_buf(struct mail_cache *cache, buffer_t *dest, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
260 size_t offset, size_t size) |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
261 { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
262 const void *data; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
263 unsigned int i, field; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
264 |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
265 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
|
266 field = cache->file_field_map[i]; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
267 data = CONST_PTR_OFFSET(&cache->fields[field], offset); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
268 buffer_append(dest, data, size); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
269 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
270 for (i = 0; i < cache->fields_count; i++) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
271 if (cache->field_file_map[i] != (uint32_t)-1) |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
272 continue; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
273 data = CONST_PTR_OFFSET(&cache->fields[i], offset); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
274 buffer_append(dest, data, size); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
275 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
276 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
277 |
2342 | 278 static void copy_to_buf_byte(struct mail_cache *cache, buffer_t *dest, |
279 size_t offset) | |
280 { | |
281 const int *data; | |
282 unsigned int i, field; | |
283 uint8_t byte; | |
284 | |
285 for (i = 0; i < cache->file_fields_count; i++) { | |
286 field = cache->file_field_map[i]; | |
287 data = CONST_PTR_OFFSET(&cache->fields[field], offset); | |
288 byte = (uint8_t)*data; | |
289 buffer_append(dest, &byte, 1); | |
290 } | |
291 for (i = 0; i < cache->fields_count; i++) { | |
292 if (cache->field_file_map[i] != (uint32_t)-1) | |
293 continue; | |
294 data = CONST_PTR_OFFSET(&cache->fields[i], offset); | |
295 byte = (uint8_t)*data; | |
296 buffer_append(dest, &byte, 1); | |
297 } | |
298 } | |
299 | |
2929 | 300 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
|
301 { |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
302 buffer_t *buffer; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
303 uint32_t i, offset; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
304 int ret = 0; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
305 |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
306 if (mail_cache_header_fields_read(cache) < 0 || |
2929 | 307 mail_cache_header_fields_get_offset(cache, &offset) < 0) |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
308 return -1; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
309 |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
310 t_push(); |
2708
f1e9f3ec8135
Buffer API change: we no longer support limited sized buffers where
Timo Sirainen <tss@iki.fi>
parents:
2604
diff
changeset
|
311 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
|
312 |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
313 copy_to_buf(cache, buffer, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
314 offsetof(struct mail_cache_field_private, last_used), |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
315 sizeof(uint32_t)); |
3375
9e2abc4c341c
Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents:
3278
diff
changeset
|
316 ret = mail_cache_write(cache, buffer->data, |
9e2abc4c341c
Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents:
3278
diff
changeset
|
317 sizeof(uint32_t) * cache->file_fields_count, |
9e2abc4c341c
Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents:
3278
diff
changeset
|
318 offset + MAIL_CACHE_FIELD_LAST_USED()); |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
319 if (ret == 0) { |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
320 buffer_set_used_size(buffer, 0); |
2342 | 321 copy_to_buf_byte(cache, buffer, |
322 offsetof(struct mail_cache_field, decision)); | |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
323 |
3375
9e2abc4c341c
Whenever writing to cache file, also updated file_cache. Fixes problems with
Timo Sirainen <tss@iki.fi>
parents:
3278
diff
changeset
|
324 ret = mail_cache_write(cache, buffer->data, |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
325 sizeof(uint8_t) * cache->file_fields_count, offset + |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
326 MAIL_CACHE_FIELD_DECISION(cache->file_fields_count)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
327 |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
328 if (ret == 0) { |
2592 | 329 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
|
330 cache->fields[i].decision_dirty = FALSE; |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
331 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
332 } |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
333 t_pop(); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
334 |
2867
d416b6d0a7ee
More correct file cache invalidating.
Timo Sirainen <tss@iki.fi>
parents:
2866
diff
changeset
|
335 if (ret == 0) |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
336 cache->field_header_write_pending = FALSE; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
337 |
2929 | 338 return ret; |
339 } | |
340 | |
341 int mail_cache_header_fields_update(struct mail_cache *cache) | |
342 { | |
343 int ret; | |
344 | |
345 if (cache->locked) | |
346 return mail_cache_header_fields_update_locked(cache); | |
347 | |
348 if (mail_cache_lock(cache) <= 0) | |
349 return -1; | |
350 | |
351 ret = mail_cache_header_fields_update_locked(cache); | |
352 mail_cache_unlock(cache); | |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
353 return ret; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
354 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
355 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
356 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
|
357 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
358 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
|
359 unsigned int field; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
360 const char *name; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
361 uint32_t i; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
362 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
363 memset(&hdr, 0, sizeof(hdr)); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
364 hdr.fields_count = cache->fields_count; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
365 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
|
366 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
367 /* we have to keep the field order for the existing fields. */ |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
368 copy_to_buf(cache, dest, |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
369 offsetof(struct mail_cache_field_private, last_used), |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
370 sizeof(uint32_t)); |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
371 copy_to_buf(cache, dest, offsetof(struct mail_cache_field, field_size), |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
372 sizeof(uint32_t)); |
2342 | 373 copy_to_buf_byte(cache, dest, offsetof(struct mail_cache_field, type)); |
374 copy_to_buf_byte(cache, dest, | |
375 offsetof(struct mail_cache_field, decision)); | |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
376 |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
377 i_assert(buffer_get_used_size(dest) == sizeof(hdr) + |
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
378 (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
|
379 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
380 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
|
381 field = cache->file_field_map[i]; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
382 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
|
383 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
|
384 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
385 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
|
386 if (cache->field_file_map[i] != (uint32_t)-1) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
387 continue; |
2339
406692edc12d
Cache fixes. Decisions are saved again.
Timo Sirainen <tss@iki.fi>
parents:
2327
diff
changeset
|
388 name = cache->fields[i].field.name; |
2327
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
389 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
|
390 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
391 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
392 hdr.size = buffer_get_used_size(dest); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
393 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
|
394 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
395 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
|
396 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
|
397 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
398 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
399 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
|
400 uint32_t *offset_r) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
401 { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
402 if (mail_cache_header_fields_get_offset(cache, offset_r) < 0) |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
403 return -1; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
404 |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
405 if (*offset_r == 0) { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
406 *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
|
407 field_header_offset); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
408 } else { |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
409 *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
|
410 next_offset); |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
411 } |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
412 return 0; |
7d02e2a7672d
Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
413 } |