This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-288-g5c44738
- From: aoliva at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 5 Sep 2012 18:44:11 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-288-g5c44738
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5c44738353ecaa1c81efca063ee8b55e092d7a43 (commit)
from fad64255f4b49e3acb506b2a09972c2ff1255f8a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5c44738353ecaa1c81efca063ee8b55e092d7a43
commit 5c44738353ecaa1c81efca063ee8b55e092d7a43
Author: Alexandre Oliva <aoliva@redhat.com>
Date: Wed Sep 5 15:43:04 2012 -0300
Don't change no_dyn_threshold on mallopt failure
* malloc/malloc.c (__libc_mallopt) <M_MMAP_THRESHOLD>: Do not
change internal state upon failure.
diff --git a/ChangeLog b/ChangeLog
index db63a81..6529e08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-09-05 Alexandre Oliva <aoliva@redhat.com>
+ * malloc/malloc.c (__libc_mallopt) <M_MMAP_THRESHOLD>: Do not
+ change internal state upon failure.
+
+2012-09-05 Alexandre Oliva <aoliva@redhat.com>
+
* malloc/mcheck.c (mcheck_check_all): Fix typo.
* malloc/memusage.c (mmap): Likewise.
(mmap64, mremap): Likewise. Adjust name in comment.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index bd562df..c69e281 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4769,8 +4769,10 @@ int __libc_mallopt(int param_number, int value)
if((unsigned long)value > HEAP_MAX_SIZE/2)
res = 0;
else
- mp_.mmap_threshold = value;
- mp_.no_dyn_threshold = 1;
+ {
+ mp_.mmap_threshold = value;
+ mp_.no_dyn_threshold = 1;
+ }
break;
case M_MMAP_MAX:
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
malloc/malloc.c | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources