From: Aurelien Jarno Date: Mon, 8 Feb 2010 13:58:31 +0000 (+0100) Subject: Use shared mapping to reserve memory when creating locale archive X-Git-Tag: fedora/glibc-2.11.1-4~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4889edbf47c0448479e03fb2d27c390d4cc825b;p=thirdparty%2Fglibc.git Use shared mapping to reserve memory when creating locale archive --- diff --git a/ChangeLog b/ChangeLog index 68bf791817f..b46b4417af4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-10-27 Aurelien Jarno + + [BZ #10855] + * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory + used later with MMAP_FIXED | MMAP_SHARED to cope with different + alignment restrictions. + 2009-11-24 Ulrich Drepper * sysdeps/unix/grantpt.c (grantpt): Use CLOSE_ALL_FDS is available diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index a58505852d8..4335369d61e 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; if (total < reserved - && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON, + && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON, -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else @@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; if (total < reserved - && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON, + && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON, -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else @@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bool readonly) int xflags = 0; void *p; if (st.st_size < reserved - && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON, + && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON, -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else