chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce _cleanup_endmntent_
[elogind.git]
/
src
/
journal
/
mmap-cache.c
diff --git
a/src/journal/mmap-cache.c
b/src/journal/mmap-cache.c
index 7813f037544546fe8bf8e33c85c6768acce001a0..03b57beb046fc72019116ea368dc72ccc6cf0872 100644
(file)
--- a/
src/journal/mmap-cache.c
+++ b/
src/journal/mmap-cache.c
@@
-41,9
+41,9
@@
struct Window {
bool keep_always;
bool in_unused;
bool keep_always;
bool in_unused;
+ int prot;
void *ptr;
uint64_t offset;
void *ptr;
uint64_t offset;
- int prot;
size_t size;
FileDescriptor *fd;
size_t size;
FileDescriptor *fd;
@@
-70,12
+70,11
@@
struct FileDescriptor {
struct MMapCache {
int n_ref;
struct MMapCache {
int n_ref;
+ unsigned n_windows;
Hashmap *fds;
Hashmap *contexts;
Hashmap *fds;
Hashmap *contexts;
- unsigned n_windows;
-
LIST_HEAD(Window, unused);
Window *last_unused;
};
LIST_HEAD(Window, unused);
Window *last_unused;
};
@@
-134,7
+133,7
@@
static void window_free(Window *w) {
free(w);
}
free(w);
}
-static bool window_matches(Window *w, int fd, int prot, uint64_t offset, size_t size) {
+
_pure_
static bool window_matches(Window *w, int fd, int prot, uint64_t offset, size_t size) {
assert(w);
assert(fd >= 0);
assert(size > 0);
assert(w);
assert(fd >= 0);
assert(size > 0);
@@
-205,8
+204,8
@@
static void context_attach_window(Context *c, Window *w) {
if (w->in_unused) {
/* Used again? */
LIST_REMOVE(Window, unused, c->cache->unused, w);
if (w->in_unused) {
/* Used again? */
LIST_REMOVE(Window, unused, c->cache->unused, w);
- if (
!c->cache->last_unused
)
- c->cache->last_unused = w;
+ if (
c->cache->last_unused == w
)
+ c->cache->last_unused = w
->unused_prev
;
w->in_unused = false;
}
w->in_unused = false;
}
@@
-308,9
+307,13
@@
static void mmap_cache_free(MMapCache *m) {
while ((c = hashmap_first(m->contexts)))
context_free(c);
while ((c = hashmap_first(m->contexts)))
context_free(c);
+ hashmap_free(m->contexts);
+
while ((f = hashmap_first(m->fds)))
fd_free(f);
while ((f = hashmap_first(m->fds)))
fd_free(f);
+ hashmap_free(m->fds);
+
while (m->unused)
window_free(m->unused);
while (m->unused)
window_free(m->unused);