diff options
| author | Daniel Colascione | 2013-02-19 21:43:53 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2013-02-19 21:43:53 -0800 |
| commit | d69f1120d8cfcb02f952003ab5a9e0a44dcd0151 (patch) | |
| tree | e4790e02ca46d843a3de60cb0906afdb56868d0b /src | |
| parent | 1dfcc79e83d3db031b45e9f6b9314dc1f0697b1d (diff) | |
| download | emacs-d69f1120d8cfcb02f952003ab5a9e0a44dcd0151.tar.gz emacs-d69f1120d8cfcb02f952003ab5a9e0a44dcd0151.zip | |
2013-02-19 Daniel Colascione <dancol@dancol.org>
* sheap.c (report_sheap_usage): Use message, not message1, so
that we don't try to create a buffer while we're in the middle
of dumping Emacs. Explain why.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/sheap.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ff059cf1a3c..720f3f28943 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-02-19 Daniel Colascione <dancol@dancol.org> | ||
| 2 | |||
| 3 | * sheap.c (report_sheap_usage): Use message, not message1, so | ||
| 4 | that we don't try to create a buffer while we're in the middle | ||
| 5 | of dumping Emacs. Explain why. | ||
| 6 | |||
| 1 | 2013-02-19 Eli Zaretskii <eliz@gnu.org> | 7 | 2013-02-19 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * w32proc.c (new_child): Avoid leaking handles if the subprocess | 9 | * w32proc.c (new_child): Avoid leaking handles if the subprocess |
diff --git a/src/sheap.c b/src/sheap.c index 06e205bc0e5..9e6b7fb1cf1 100644 --- a/src/sheap.c +++ b/src/sheap.c | |||
| @@ -91,5 +91,8 @@ report_sheap_usage (int die_if_pure_storage_exceeded) | |||
| 91 | char buf[200]; | 91 | char buf[200]; |
| 92 | sprintf (buf, "Static heap usage: %d of %d bytes", | 92 | sprintf (buf, "Static heap usage: %d of %d bytes", |
| 93 | bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE); | 93 | bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE); |
| 94 | message1 (buf); | 94 | /* Don't change this call to message1! message1 can log |
| 95 | messages, and at this point, we're not allowed to create | ||
| 96 | buffers. */ | ||
| 97 | message ("%s", buf); | ||
| 95 | } | 98 | } |