chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: convert log_unit_*() to log_unit_*_errno()
[elogind.git]
/
src
/
journal
/
journal-file.c
diff --git
a/src/journal/journal-file.c
b/src/journal/journal-file.c
index 7286e14ddba32a07421a15a7b2c451b74b379c53..8a2c0fcac52d7efd3ec666e9b89aa2ae2fec81c4 100644
(file)
--- a/
src/journal/journal-file.c
+++ b/
src/journal/journal-file.c
@@
-136,7
+136,7
@@
void journal_file_close(JournalFile *f) {
if (f->mmap)
mmap_cache_unref(f->mmap);
if (f->mmap)
mmap_cache_unref(f->mmap);
- hashmap_free_free(f->chain_cache);
+
ordered_
hashmap_free_free(f->chain_cache);
#if defined(HAVE_XZ) || defined(HAVE_LZ4)
free(f->compress_buffer);
#if defined(HAVE_XZ) || defined(HAVE_LZ4)
free(f->compress_buffer);
@@
-391,7
+391,7
@@
static int journal_file_move_to(JournalFile *f, int context, bool keep_always, u
return -EADDRNOTAVAIL;
}
return -EADDRNOTAVAIL;
}
- return mmap_cache_get(f->mmap, f->fd, f->prot, context, keep_always, offset, size, &f->last_stat, ret);
+ return mmap_cache_get(f->mmap, f->fd, f->prot, context, keep_always, offset, size, &f->last_stat, ret
, NULL
);
}
static uint64_t minimum_header_size(Object *o) {
}
static uint64_t minimum_header_size(Object *o) {
@@
-1366,7
+1366,7
@@
typedef struct ChainCacheItem {
} ChainCacheItem;
static void chain_cache_put(
} ChainCacheItem;
static void chain_cache_put(
- Hashmap *h,
+
Ordered
Hashmap *h,
ChainCacheItem *ci,
uint64_t first,
uint64_t array,
ChainCacheItem *ci,
uint64_t first,
uint64_t array,
@@
-1380,9
+1380,10
@@
static void chain_cache_put(
if (array == first)
return;
if (array == first)
return;
- if (hashmap_size(h) >= CHAIN_CACHE_MAX)
- ci = hashmap_steal_first(h);
- else {
+ if (ordered_hashmap_size(h) >= CHAIN_CACHE_MAX) {
+ ci = ordered_hashmap_steal_first(h);
+ assert(ci);
+ } else {
ci = new(ChainCacheItem, 1);
if (!ci)
return;
ci = new(ChainCacheItem, 1);
if (!ci)
return;
@@
-1390,7
+1391,7
@@
static void chain_cache_put(
ci->first = first;
ci->first = first;
- if (hashmap_put(h, &ci->first, ci) < 0) {
+ if (
ordered_
hashmap_put(h, &ci->first, ci) < 0) {
free(ci);
return;
}
free(ci);
return;
}
@@
-1419,7
+1420,7
@@
static int generic_array_get(
a = first;
/* Try the chain cache first */
a = first;
/* Try the chain cache first */
- ci = hashmap_get(f->chain_cache, &first);
+ ci =
ordered_
hashmap_get(f->chain_cache, &first);
if (ci && i > ci->total) {
a = ci->array;
i -= ci->total;
if (ci && i > ci->total) {
a = ci->array;
i -= ci->total;
@@
-1522,7
+1523,7
@@
static int generic_array_bisect(
/* Start with the first array in the chain */
a = first;
/* Start with the first array in the chain */
a = first;
- ci = hashmap_get(f->chain_cache, &first);
+ ci =
ordered_
hashmap_get(f->chain_cache, &first);
if (ci && n > ci->total) {
/* Ah, we have iterated this bisection array chain
* previously! Let's see if we can skip ahead in the
if (ci && n > ci->total) {
/* Ah, we have iterated this bisection array chain
* previously! Let's see if we can skip ahead in the
@@
-2498,7
+2499,7
@@
int journal_file_open(
goto fail;
}
goto fail;
}
- f->chain_cache =
hashmap_new(uint64_hash_func, uint64_compare_func
);
+ f->chain_cache =
ordered_hashmap_new(&uint64_hash_ops
);
if (!f->chain_cache) {
r = -ENOMEM;
goto fail;
if (!f->chain_cache) {
r = -ENOMEM;
goto fail;