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.19-508-g62a5881
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 May 2014 17:14:10 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-508-g62a5881
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 62a5881678b725cdabb27225ebae208a6e4b3f90 (commit)
via 4d653a59ffeae0f46f76a40230e2cfa9587b7e7e (commit)
from 5190c17f2280d3aa27cfb057816d09d9af03b167 (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=62a5881678b725cdabb27225ebae208a6e4b3f90
commit 62a5881678b725cdabb27225ebae208a6e4b3f90
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Fri May 30 22:44:45 2014 +0530
Fix formatting in malloc_info
diff --git a/ChangeLog b/ChangeLog
index d2a94b2..d8c416f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
2014-05-30 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * malloc/malloc (malloc_info): Fix formatting.
+
+2014-05-30 Siddhesh Poyarekar <siddhesh@redhat.com>
Roland McGrath <roland@hack.frob.com>
* malloc/malloc (malloc_info): Also print mmapped statistics.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index e78f8df..79b109d 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -5146,18 +5146,18 @@ malloc_info (int options, FILE *fp)
while (ar_ptr != &main_arena);
fprintf (fp,
- "<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
- "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
+ "<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
+ "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
"<total type=\"mmap\" count=\"%zu\" size=\"%zu\"/>\n"
- "<system type=\"current\" size=\"%zu\"/>\n"
- "<system type=\"max\" size=\"%zu\"/>\n"
- "<aspace type=\"total\" size=\"%zu\"/>\n"
- "<aspace type=\"mprotect\" size=\"%zu\"/>\n"
- "</malloc>\n",
- total_nfastblocks, total_fastavail, total_nblocks, total_avail,
+ "<system type=\"current\" size=\"%zu\"/>\n"
+ "<system type=\"max\" size=\"%zu\"/>\n"
+ "<aspace type=\"total\" size=\"%zu\"/>\n"
+ "<aspace type=\"mprotect\" size=\"%zu\"/>\n"
+ "</malloc>\n",
+ total_nfastblocks, total_fastavail, total_nblocks, total_avail,
mp_.n_mmaps, mp_.mmapped_mem,
- total_system, total_max_system,
- total_aspace, total_aspace_mprotect);
+ total_system, total_max_system,
+ total_aspace, total_aspace_mprotect);
return 0;
}
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4d653a59ffeae0f46f76a40230e2cfa9587b7e7e
commit 4d653a59ffeae0f46f76a40230e2cfa9587b7e7e
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Fri May 30 22:43:52 2014 +0530
Add mmap usage in malloc_info output
The current malloc_info xml output only has information about
allocations on the heap. Display information about number of mappings
and total mmapped size to this to complete the picture.
diff --git a/ChangeLog b/ChangeLog
index 06d529d..d2a94b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-30 Siddhesh Poyarekar <siddhesh@redhat.com>
+ Roland McGrath <roland@hack.frob.com>
+
+ * malloc/malloc (malloc_info): Also print mmapped statistics.
+
2014-05-30 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/m68k/arch-fork.h: New file.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 963a333..e78f8df 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -5148,12 +5148,14 @@ malloc_info (int options, FILE *fp)
fprintf (fp,
"<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
"<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
+ "<total type=\"mmap\" count=\"%zu\" size=\"%zu\"/>\n"
"<system type=\"current\" size=\"%zu\"/>\n"
"<system type=\"max\" size=\"%zu\"/>\n"
"<aspace type=\"total\" size=\"%zu\"/>\n"
"<aspace type=\"mprotect\" size=\"%zu\"/>\n"
"</malloc>\n",
total_nfastblocks, total_fastavail, total_nblocks, total_avail,
+ mp_.n_mmaps, mp_.mmapped_mem,
total_system, total_max_system,
total_aspace, total_aspace_mprotect);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
malloc/malloc.c | 22 ++++++++++++----------
2 files changed, 21 insertions(+), 10 deletions(-)
hooks/post-receive
--
GNU C Library master sources