* fhandler_process.cc (heap_info::fill_if_match): Rename info to

	note that this heap is a Windows heap.
	(format_process_maps): Print info about application heap.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bd87fd3..5e7b077 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-28  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_process.cc (heap_info::fill_if_match): Rename info to
+       note that this heap is a Windows heap.
+       (format_process_maps): Print info about application heap.
+
 2011-06-24  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_console.cc (fhandler_console::read): Don't generate ^@ on

diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc
index 71a31ac..220d624 100644 (file)
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler_process.cc
@@ -668,7 +668,7 @@ struct heap_info
     for (heap *h = heap_vm_chunks; h; h = h->next)
       if (base >= h->base && base < h->end)
        {
-         char *p = dest + __small_sprintf (dest, "[heap %ld", h->heap_id);
+         char *p = dest + __small_sprintf (dest, "[win heap %ld", h->heap_id);
          if (!(h->flags & HEAP_FLAG_NONDEFAULT))
            p = stpcpy (p, " default");
          if ((h->flags & HEAP_FLAG_SHAREABLE) && (type & MEM_MAPPED))
@@ -976,6 +976,8 @@ format_process_maps (void *data, char *&destbuf)
                    strcpy (posix_modname, "[cygwin-user-shared]");
                  else if (cur.abase == (char *) *proc_pinfo)
                    strcpy (posix_modname, "[procinfo]");
+                 else if (cur.abase == cygheap->user_heap.base)
+                   strcpy (posix_modname, "[heap]");
                  else
                    posix_modname[0] = 0;
                }