[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 874c59a 06/15: Report static heap usage on non-Cygw
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 874c59a 06/15: Report static heap usage on non-Cygwin, too |
Date: |
Sat, 30 Jan 2016 23:26:15 +0000 |
branch: master
commit 874c59a81b7ee12a739149c5229e6d3bbd463324
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Report static heap usage on non-Cygwin, too
* src/emacs.c (Fdump_emacs) [HYBRID_MALLOC]: Report sheap usage here ...
* src/unexcw.c (unexec): ... instead of here, since sheap can be used
on platforms other than Cygwin (Bug#22086).
---
src/emacs.c | 5 +++++
src/unexcw.c | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/emacs.c b/src/emacs.c
index fb6f896..7ba5cfe 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -134,6 +134,7 @@ extern void unexec_init_emacs_zone (void);
#endif
extern void malloc_enable_thread (void);
+extern void report_sheap_usage (int);
/* If true, Emacs should not attempt to use a window-specific code,
but instead should use the virtual terminal under which it was started. */
@@ -2073,6 +2074,10 @@ You must run Emacs in batch mode in order to dump it.
*/)
tem = Vpurify_flag;
Vpurify_flag = Qnil;
+#ifdef HYBRID_MALLOC
+ report_sheap_usage (1);
+#endif
+
fflush (stdout);
/* Tell malloc where start of impure now is. */
/* Also arrange for warnings when nearly out of space. */
diff --git a/src/unexcw.c b/src/unexcw.c
index febe939..e4aa356 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -30,8 +30,6 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#define DOTEXE ".exe"
-extern void report_sheap_usage (int);
-
extern int bss_sbrk_did_unexec;
/*
@@ -276,8 +274,6 @@ unexec (const char *outfile, const char *infile)
int ret;
int ret2;
- report_sheap_usage (1);
-
infile = add_exe_suffix_if_necessary (infile, infile_buffer);
outfile = add_exe_suffix_if_necessary (outfile, outfile_buffer);
- [Emacs-diffs] master updated (935b4d0 -> 692e410), Paul Eggert, 2016/01/30
- [Emacs-diffs] master dec1390 03/15: unexelf.c hook to support HYBRID_MALLOC on ELF, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 874c59a 06/15: Report static heap usage on non-Cygwin, too,
Paul Eggert <=
- [Emacs-diffs] master a5f8586 02/15: Link temacs with gnulib compiled with -Demacs, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 384ffef 05/15: Pacify GCC on extern decls, Paul Eggert, 2016/01/30
- [Emacs-diffs] master d6585a9 04/15: Add musl patch to support HYBRID_MALLOC on elf systems, Paul Eggert, 2016/01/30
- [Emacs-diffs] master cb22fce 01/15: Internal linkage for gmalloc etc. if HYBRID_MALLOC, Paul Eggert, 2016/01/30
- [Emacs-diffs] master e4cd4a7 08/15: * src/alloc.c: Include "sheap.h"., Paul Eggert, 2016/01/30
- [Emacs-diffs] master e1a9f20 07/15: Pacify --enable-gcc-warnings when HYBRID_MALLOC, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 2ee2963 12/15: Shrink static heap a bit, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 370a260 14/15: Make it easy to override preferred-branch test, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 3d82a8e 11/15: Fix extern symbols defined and not used, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 7fdc3cf 10/15: Build lib/e-*.o only on platforms that need it, Paul Eggert, 2016/01/30