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.18-311-g0bfcf2c
- From: neleai at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Oct 2013 07:35:31 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-311-g0bfcf2c
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 0bfcf2c73cf6a68be978e66248cec5c4c03f07fa (commit)
from 264aad1e6aca30efddfcfae05c44ad38bb5e137d (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0bfcf2c73cf6a68be978e66248cec5c4c03f07fa
commit 0bfcf2c73cf6a68be978e66248cec5c4c03f07fa
Author: OndÅ?ej BÃlka <neleai@seznam.cz>
Date: Fri Oct 18 09:32:35 2013 +0200
Remove assert in malloc statistic. Fixes bug 12486.
diff --git a/ChangeLog b/ChangeLog
index dc8745a..1c59515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-18 OndÅ?ej BÃlka <neleai@seznam.cz>
+
+ [BZ #12486]
+ * malloc/malloc.c: remove checks for statistics.
+
2013-10-17 OndÅ?ej BÃlka <neleai@seznam.cz>
[BZ #15277]
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 2938234..1a18c3f 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2216,15 +2216,6 @@ static void do_check_malloc_state(mstate av)
/* top chunk is OK */
check_chunk(av, av->top);
- /* sanity checks for statistics */
-
- assert(mp_.n_mmaps <= mp_.max_n_mmaps);
-
- assert((unsigned long)(av->system_mem) <=
- (unsigned long)(av->max_system_mem));
-
- assert((unsigned long)(mp_.mmapped_mem) <=
- (unsigned long)(mp_.max_mmapped_mem));
}
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
malloc/malloc.c | 9 ---------
2 files changed, 5 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources