SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmap-cache: merge mmap_try_harder() with make_room()

Browse Source 
The function make_room() is short and only used by mmap_try_harder().
Let's merge them with short comments.

No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2023-10-04 19:53:27 +09:00
parent 714cb48a4f
commit 1ed867d309
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/mmap-cache.c
+14 -25
View File
@@ -254,16 +254,6 @@ static MMapCache* mmap_cache_free(MMapCache *m) {
DEFINE_TRIVIAL_REF_UNREF_FUNC(MMapCache, mmap_cache, mmap_cache_free);
static int make_room(MMapCache *m) {
assert(m);
if (!m->last_unused)
return 0;
window_free(m->last_unused);
return 1;
}
static int try_context(
MMapFileDescriptor *f,
Context *c,
@@ -337,30 +327,29 @@ static int find_mmap(
return 1;
}
static int mmap_try_harder(MMapFileDescriptor *f, void *addr, int flags, uint64_t offset, size_t size, void **res) {
void *ptr;
static int mmap_try_harder(MMapFileDescriptor *f, void *addr, int flags, uint64_t offset, size_t size, void **ret) {
MMapCache *m = mmap_cache_fd_cache(f);
assert(f);
assert(res);
assert(ret);
for (;;) {
int r;
void *ptr;
ptr = mmap(addr, size, f->prot, flags, f->fd, offset);
if (ptr != MAP_FAILED)
break;
if (ptr != MAP_FAILED) {
*ret = ptr;
return 0;
}
if (errno != ENOMEM)
return negative_errno();
r = make_room(f->cache);
if (r < 0)
return r;
if (r == 0)
return -ENOMEM;
}
/* When failed with ENOMEM, try again after making a room by freeing an unused window. */
*res = ptr;
return 0;
if (!m->last_unused)
return -ENOMEM; /* no free window, propagate the original error. */
window_free(m->last_unused);
}
}
static int add_mmap(