drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fhandler_process.cc (format_process_maps): Actually print info about 

the application heap of the printed process, not of the current process.
This commit is contained in:
Corinna Vinschen 2011-08-07 11:04:32 +00:00
parent 1ae8302539
commit 60b55c4c18
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-07 Corinna Vinschen <corinna@vinschen.de>
* fhandler_process.cc (format_process_maps): Actually print info about
the application heap of the printed process, not of the current process.
2011-08-04 Corinna Vinschen <corinna@vinschen.de> 2011-08-04 Corinna Vinschen <corinna@vinschen.de>
* net.cc (socketpair): Release sb0 if there's no space left for sb1. * net.cc (socketpair): Release sb0 if there's no space left for sb1.

7
winsup/cygwin/fhandler_process.cc
View File

@ -842,6 +842,11 @@ format_process_maps (void *data, char *&destbuf)
pinfo proc_pinfo; pinfo proc_pinfo;
if (ReadProcessMemory (proc, &myself, &proc_pinfo, sizeof proc_pinfo, NULL)) if (ReadProcessMemory (proc, &myself, &proc_pinfo, sizeof proc_pinfo, NULL))
proc_pinfo.preserve (); proc_pinfo.preserve ();
/* The heap info on the cygheap is also in the same spot in each process
because the cygheap is located at the same address. */
user_heap_info user_heap;
ReadProcessMemory (proc, &cygheap->user_heap, &user_heap,
sizeof user_heap, NULL);
_off64_t len = 0; _off64_t len = 0;
@ -976,7 +981,7 @@ format_process_maps (void *data, char *&destbuf)
strcpy (posix_modname, "[cygwin-user-shared]"); strcpy (posix_modname, "[cygwin-user-shared]");
else if (cur.abase == (char *) *proc_pinfo) else if (cur.abase == (char *) *proc_pinfo)
strcpy (posix_modname, "[procinfo]"); strcpy (posix_modname, "[procinfo]");
else if (cur.abase == cygheap->user_heap.base) else if (cur.abase == user_heap.base)
strcpy (posix_modname, "[heap]"); strcpy (posix_modname, "[heap]");
else else
posix_modname[0] = 0; posix_modname[0] = 0;