* malloc/malloc.c (malloc_info): Output address space information.

diff --git a/ChangeLog b/ChangeLog
index 1c3ddbdc32ff24d69df4ed414185d20a1eda622e..bbb4a57f946dc902abed88455e33a0e41027e02d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-18  Ulrich Drepper  <drepper@redhat.com>
+
+       * malloc/malloc.c (malloc_info): Output address space information.
+
 2009-04-17  Ulrich Drepper  <drepper@redhat.com>
 
        * malloc/malloc.c (malloc_info): Also output system memory information.

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8958c21bbc2e29105e387f92130b3271a9e84a49..9e5182edf131ff7591f74b2b6b26a81e68c81bfe 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-18  Ulrich Drepper  <drepper@redhat.com>
+
+       * SUPPORTED: Add ks_IN.
+
 2009-04-07  Ulrich Drepper  <drepper@redhat.com>
 
        * locales/ks_IN@devanagari: Replace duplicated information with copy.

diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index c1e236c3f96ac8b23f7ddcd38a8c09f61bfe0654..9d000da45a5e7bf2c226c80ada54bb0ad38d6c6f 100644 (file)
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -258,6 +258,7 @@ km_KH/UTF-8 \
 kn_IN/UTF-8 \
 ko_KR.EUC-KR/EUC-KR \
 ko_KR.UTF-8/UTF-8 \
+ks_IN/UTF-8 \
 ks_IN@devanagari/UTF-8 \
 ku_TR.UTF-8/UTF-8 \
 ku_TR/ISO-8859-9 \

diff --git a/malloc/malloc.c b/malloc/malloc.c
index c9141f7fb868172e8ffd66e4b1f6f1caa27c5474..0b9facefd4e326a46ac4d013094f05db8decc5d0 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -6251,6 +6251,8 @@ malloc_info (int options, FILE *fp)
   size_t total_fastavail = 0;
   size_t total_system = 0;
   size_t total_max_system = 0;
+  size_t total_aspace = 0;
+  size_t total_aspace_mprotect = 0;
 
   void mi_arena (mstate ar_ptr)
   {
@@ -6363,10 +6365,31 @@ malloc_info (int options, FILE *fp)
             "</sizes>\n<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
             "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
             "<system type=\"current\" size=\"%zu\"/>\n"
-            "<system type=\"max\" size=\"%zu\"/>\n"
-            "</heap>\n",
+            "<system type=\"max\" size=\"%zu\"/>\n",
             nfastblocks, fastavail, nblocks, avail,
             ar_ptr->system_mem, ar_ptr->max_system_mem);
+
+    if (ar_ptr != &main_arena)
+      {
+       heap_info *heap = heap_for_ptr(top(ar_ptr));
+       fprintf (fp,
+                "<aspace type=\"total\" size=\"%zu\"/>\n"
+                "<aspace type=\"mprotect\" size=\"%zu\"/>\n",
+                heap->size, heap->mprotect_size);
+       total_aspace += heap->size;
+       total_aspace_mprotect += heap->mprotect_size;
+      }
+    else
+      {
+       fprintf (fp,
+                "<aspace type=\"total\" size=\"%zu\"/>\n"
+                "<aspace type=\"mprotect\" size=\"%zu\"/>\n",
+                ar_ptr->system_mem, ar_ptr->system_mem);
+       total_aspace += ar_ptr->system_mem;
+       total_aspace_mprotect += ar_ptr->system_mem;
+      }
+
+    fputs ("</heap>\n", fp);
   }
 
   fputs ("<malloc version=\"1\">\n", fp);
@@ -6385,9 +6408,12 @@ malloc_info (int options, FILE *fp)
           "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
           "<system type=\"current\" size=\"%zu\n/>\n"
           "<system type=\"max\" size=\"%zu\n/>\n"
+          "<aspace type=\"total\" size=\"%zu\"/>\n"
+          "<aspace type=\"mprotect\" size=\"%zu\"/>\n"
           "</malloc>\n",
           total_nfastblocks, total_fastavail, total_nblocks, total_avail,
-          total_system, total_max_system);
+          total_system, total_max_system,
+          total_aspace, total_aspace_mprotect);
 
   return 0;
 }