picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal: move mmap() ENOMEM loop to function

Browse source 
Introduces mmap_try_harder()
This commit is contained in:
Vito Caputo 2016-02-05 03:44:05 -08:00
parent 90d222c190
commit db87967e5b
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/journal/mmap-cache.c
View file

@ -469,6 +469,33 @@ static int find_mmap(
return 1; return 1;
} }
static int mmap_try_harder(MMapCache *m, void *addr, int fd, int prot, int flags, uint64_t offset, size_t size, void **res) {
void *ptr;
assert(m);
assert(fd >= 0);
assert(res);
for (;;) {
int r;
ptr = mmap(addr, size, prot, flags, fd, offset);
if (ptr != MAP_FAILED)
break;
if (errno != ENOMEM)
return -errno;
r = make_room(m);
if (r < 0)
return r;
if (r == 0)
return -ENOMEM;
}
*res = ptr;
return 0;
}
static int add_mmap( static int add_mmap(
MMapCache *m, MMapCache *m,
int fd, int fd,
@ -522,19 +549,9 @@ static int add_mmap(
wsize = PAGE_ALIGN(st->st_size - woffset); wsize = PAGE_ALIGN(st->st_size - woffset);
} }
for (;;) { r = mmap_try_harder(m, NULL, fd, prot, MAP_SHARED, woffset, wsize, &d);
d = mmap(NULL, wsize, prot, MAP_SHARED, fd, woffset); if (r < 0)
if (d != MAP_FAILED) return r;
break;
if (errno != ENOMEM)
return -errno;
r = make_room(m);
if (r < 0)
return r;
if (r == 0)
return -ENOMEM;
}
c = context_add(m, context); c = context_add(m, context);
if (!c) if (!c)