qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* locale/programs/locarchive.c (enlarge_archive): Conserve address 

space when temporarily mapping the whole content of the old file.
This commit is contained in:
Ulrich Drepper 2009-04-24 18:47:19 +00:00
parent c2d5bd5b00
commit c9edc8891d
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2009-04-24 Ulrich Drepper <drepper@redhat.com> 2009-04-24 Ulrich Drepper <drepper@redhat.com>
* locale/programs/locarchive.c (enlarge_archive): Conserve address
space when temporarily mapping the whole content of the old file.
[BZ #10100] [BZ #10100]
* misc/hsearch_r.c (hsearch_r): Add back ensurance that hval is * misc/hsearch_r.c (hsearch_r): Add back ensurance that hval is
not zero. not zero.

29
locale/programs/locarchive.c
View File

@ -133,14 +133,14 @@ create_archive (const char *archivefname, struct locarhandle *ah)
address space. */ address space. */
size_t reserved = RESERVE_MMAP_SIZE; size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0; int xflags = 0;
if (total < RESERVE_MMAP_SIZE if (total < reserved
&& ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_ANON, -1, 0)) && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_ANON, -1, 0))
!= MAP_FAILED)) != MAP_FAILED))
xflags = MAP_FIXED; xflags = MAP_FIXED;
else else
{ {
p = NULL; p = NULL;
reserved = 0; reserved = total;
} }
/* Map the header and all the administration data structures. */ /* Map the header and all the administration data structures. */
@ -307,11 +307,22 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
/* Not all of the old file has to be mapped. Change this now this /* Not all of the old file has to be mapped. Change this now this
we will have to access the whole content. */ we will have to access the whole content. */
if (fstat64 (ah->fd, &st) != 0 if (fstat64 (ah->fd, &st) != 0)
|| (st.st_size > ah->mmaped enomap:
&& (ah->addr = mmap64 (NULL, st.st_size, PROT_READ | PROT_WRITE,
MAP_SHARED, ah->fd, 0)) == MAP_FAILED))
error (EXIT_FAILURE, errno, _("cannot map locale archive file")); error (EXIT_FAILURE, errno, _("cannot map locale archive file"));
if (st.st_size < ah->reserved)
ah->addr = mremap (ah->addr, ah->mmaped, st.st_size,
MREMAP_MAYMOVE | MREMAP_FIXED, ah->addr);
else
{
munmap (ah->addr, ah->reserved);
ah->addr = mmap64 (NULL, st.st_size, PROT_READ | PROT_WRITE,
MAP_SHARED, ah->fd, 0);
ah->reserved = st.st_size;
}
if (ah->addr == MAP_FAILED)
goto enomap;
ah->mmaped = st.st_size; ah->mmaped = st.st_size;
/* Create a temporary file in the correct directory. */ /* Create a temporary file in the correct directory. */
@ -581,14 +592,14 @@ open_archive (struct locarhandle *ah, bool readonly)
size_t reserved = RESERVE_MMAP_SIZE; size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0; int xflags = 0;
void *p; void *p;
if (st.st_size < RESERVE_MMAP_SIZE if (st.st_size < reserved
&& ((p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_ANON, -1, 0)) && ((p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_ANON, -1, 0))
!= MAP_FAILED)) != MAP_FAILED))
xflags = MAP_FIXED; xflags = MAP_FIXED;
else else
{ {
p = NULL; p = NULL;
reserved = 0; reserved = st.st_size;
} }
/* Map the entire file. We might need to compare the category data /* Map the entire file. We might need to compare the category data
@ -609,7 +620,7 @@ close_archive (struct locarhandle *ah)
{ {
if (ah->fd != -1) if (ah->fd != -1)
{ {
munmap (ah->addr, MAX (ah->reserved, ah->mmaped)); munmap (ah->addr, ah->reserved);
close (ah->fd); close (ah->fd);
} }
} }