procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve dumped memory report on MS-Windows.

Browse source 
src/w32heap.c (report_temacs_memory_usage): Improve the report by
 reporting the large blocks that are actually occupied at dump time.
This commit is contained in:
Eli Zaretskii 2014-06-04 14:46:51 +03:00
parent 5dff48b0f8
commit a7f999dc5f
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2014-06-04 Eli Zaretskii <eliz@gnu.org>
* w32heap.c (report_temacs_memory_usage): Improve the report by
reporting the large blocks that are actually occupied at dump
time.
* w32console.c (initialize_w32_display): Set the console
menu_show_hook, otherwise TTY menus are broken on w32.

17
src/w32heap.c
View file

@ -479,7 +479,7 @@ free_before_dump (void *ptr)
/* Look for the big chunk. */
int i;
for(i = 0; i < blocks_number; i++)
for (i = 0; i < blocks_number; i++)
{
if (blocks[i].address == ptr)
{
@ -498,11 +498,22 @@ free_before_dump (void *ptr)
void
report_temacs_memory_usage (void)
{
DWORD blocks_used = 0, large_mem_used = 0;
int i;
for (i = 0; i < blocks_number; i++)
if (blocks[i].occupied)
{
blocks_used++;
large_mem_used += blocks[i].size;
}
/* Emulate 'message', which writes to stderr in non-interactive
sessions. */
fprintf (stderr,
"Dump memory usage: Heap: %" PRIu64 " Large blocks(%lu): %" PRIu64 "\n",
(unsigned long long)committed, blocks_number,
"Dump memory usage: Heap: %" PRIu64 " Large blocks(%lu/%lu): %" PRIu64 "/%" PRIu64 "\n",
(unsigned long long)committed, blocks_used, blocks_number,
(unsigned long long)large_mem_used,
(unsigned long long)(dumped_data + DUMPED_HEAP_SIZE - bc_limit));
}
#endif