chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: properly handle if new objects are installed in the node tree while we are dispa...
[elogind.git]
/
src
/
journal
/
mmap-cache.c
diff --git
a/src/journal/mmap-cache.c
b/src/journal/mmap-cache.c
index 4be3f7e96608bcb947d27e13e7a7bc6a184d9f2f..6c9194a1a5faa9ca24161f1a8d34d747e176f1e7 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;
};
@@
-111,13
+110,13
@@
static void window_unlink(Window *w) {
munmap(w->ptr, w->size);
if (w->fd)
munmap(w->ptr, w->size);
if (w->fd)
- LIST_REMOVE(
Window,
by_fd, w->fd->windows, w);
+ LIST_REMOVE(by_fd, w->fd->windows, w);
if (w->in_unused) {
if (w->cache->last_unused == w)
w->cache->last_unused = w->unused_prev;
if (w->in_unused) {
if (w->cache->last_unused == w)
w->cache->last_unused = w->unused_prev;
- LIST_REMOVE(
Window,
unused, w->cache->unused, w);
+ LIST_REMOVE(unused, w->cache->unused, w);
}
LIST_FOREACH(by_window, c, w->contexts) {
}
LIST_FOREACH(by_window, c, w->contexts) {
@@
-130,10
+129,11
@@
static void window_free(Window *w) {
assert(w);
window_unlink(w);
assert(w);
window_unlink(w);
+ w->cache->n_windows--;
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);
@@
-157,6
+157,7
@@
static Window *window_add(MMapCache *m) {
w = new0(Window, 1);
if (!w)
return NULL;
w = new0(Window, 1);
if (!w)
return NULL;
+ m->n_windows++;
} else {
/* Reuse an existing one */
} else {
/* Reuse an existing one */
@@
-179,11
+180,11
@@
static void context_detach_window(Context *c) {
w = c->window;
c->window = NULL;
w = c->window;
c->window = NULL;
- LIST_REMOVE(
Context,
by_window, w->contexts, c);
+ LIST_REMOVE(by_window, w->contexts, c);
- if (!w->contexts) {
+ if (!w->contexts
&& !w->keep_always
) {
/* Not used anymore? */
/* Not used anymore? */
- LIST_PREPEND(
Window,
unused, c->cache->unused, w);
+ LIST_PREPEND(unused, c->cache->unused, w);
if (!c->cache->last_unused)
c->cache->last_unused = w;
if (!c->cache->last_unused)
c->cache->last_unused = w;
@@
-200,17
+201,17
@@
static void context_attach_window(Context *c, Window *w) {
context_detach_window(c);
context_detach_window(c);
- if (
!w->contexts
) {
+ if (
w->in_unused
) {
/* Used again? */
/* Used again? */
- LIST_REMOVE(
Window,
unused, c->cache->unused, w);
- if (
!c->cache->last_unused
)
- c->cache->last_unused = w;
+ LIST_REMOVE(unused, c->cache->unused, w);
+ if (
c->cache->last_unused == w
)
+ c->cache->last_unused = w
->unused_prev
;
w->in_unused = false;
}
c->window = w;
w->in_unused = false;
}
c->window = w;
- LIST_PREPEND(
Context,
by_window, w->contexts, c);
+ LIST_PREPEND(by_window, w->contexts, c);
}
static Context *context_add(MMapCache *m, unsigned id) {
}
static Context *context_add(MMapCache *m, unsigned id) {
@@
-306,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);
@@
-506,11
+511,11
@@
static int add_mmap(
w->size = wsize;
w->fd = f;
w->size = wsize;
w->fd = f;
- LIST_PREPEND(
Window,
by_fd, f->windows, w);
+ LIST_PREPEND(by_fd, f->windows, w);
context_detach_window(c);
c->window = w;
context_detach_window(c);
c->window = w;
- LIST_PREPEND(
Context,
by_window, w->contexts, c);
+ LIST_PREPEND(by_window, w->contexts, c);
*ret = (uint8_t*) w->ptr + (offset - w->offset);
return 1;
*ret = (uint8_t*) w->ptr + (offset - w->offset);
return 1;