PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* strace.cc (strace::activate): Move printing heap size from here... 

* heap.cc (heap_init_info): ...to here.  Explain why.  Print heap
	size in hex and decimal.
This commit is contained in:
Corinna Vinschen 2012-05-21 19:45:12 +00:00
parent 428aba22a9
commit 08d7e0c909
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-21 Corinna Vinschen <corinna@vinschen.de>
* strace.cc (strace::activate): Move printing heap size from here...
* heap.cc (heap_init_info): ...to here. Explain why. Print heap
size in hex and decimal.
2012-05-21 Corinna Vinschen <corinna@vinschen.de>
* net.cc (cygwin_recvfrom): Don't shortcircuit if len == 0. Add comment

11
winsup/cygwin/heap.cc
View File

@ -192,8 +192,15 @@ heap_init ()
api_fatal ("MEM_COMMIT failed, %E");
}
debug_printf ("heap base %p, heap top %p", cygheap->user_heap.base,
cygheap->user_heap.top);
/* CV 2012-05-21: Moved printing heap size here from strace::activate.
The value printed in strace.activate was always wrong, because at the
time it's called, cygheap points to cygheap_dummy. Above all, the heap
size has not been evaluated yet, except in a forked child. Since
heap_init is called early, the heap size is printed pretty much at the
start of the strace output, so there isn't anything lost. */
debug_printf ("heap base %p, heap top %p, heap size %p (%u)",
cygheap->user_heap.base, cygheap->user_heap.top,
cygheap->user_heap.chunk, cygheap->user_heap.chunk);
page_const--;
// malloc_init ();
}

4
winsup/cygwin/strace.cc
View File

@ -1,7 +1,7 @@
/* strace.cc: system/windows tracing
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
2006, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
This file is part of Cygwin.
@ -59,8 +59,6 @@ strace::activate (bool isfork)
prntf (1, NULL, "**********************************************");
prntf (1, NULL, "Program name: %W %s", progname, pidbuf);
prntf (1, NULL, "OS version: Windows %s", wincap.osname ());
if (cygheap && cygheap->user_heap.chunk)
prntf (1, NULL, "Heap size: %u", cygheap->user_heap.chunk);
prntf (1, NULL, "**********************************************");
}
}