Mercurial > hg > xemacs-beta
changeset 1157:6af03f821bbe
[xemacs-hg @ 2002-12-13 04:29:06 by andyp]
static heap fiuxups
| author | andyp |
|---|---|
| date | Fri, 13 Dec 2002 04:30:18 +0000 |
| parents | 64df484c9156 |
| children | b20980ea3210 |
| files | ChangeLog Makefile.in.in src/ChangeLog src/sheap.c |
| diffstat | 4 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Dec 12 22:53:10 2002 +0000 +++ b/ChangeLog Fri Dec 13 04:30:18 2002 +0000 @@ -1,3 +1,8 @@ +2002-07-08 Andy Piper <andy@xemacs.org> + + * Makefile.in.in (src/sheap-adjust.h): reset back to zero. Making + this anything other than zero was misguided. + 2002-12-04 Stephen J. Turnbull <stephen@xemacs.org> * configure.in: Make --pdump default per opsys; move Darwin's
--- a/Makefile.in.in Thu Dec 12 22:53:10 2002 +0000 +++ b/Makefile.in.in Fri Dec 13 04:30:18 2002 +0000 @@ -323,7 +323,7 @@ @echo "Resetting \`src/sheap-adjust.h'."; \ (echo "/* Do not edit this file!" ; \ echo " Automatically generated by XEmacs */" ; \ - echo "#define SHEAP_ADJUSTMENT 0x400000") > $@ + echo "#define SHEAP_ADJUSTMENT 0") > $@ src: @SRC_SUBDIR_DEPS@ FRC.src pkg-src/tree-x: pkg-src/FRC.tree-x
--- a/src/ChangeLog Thu Dec 12 22:53:10 2002 +0000 +++ b/src/ChangeLog Fri Dec 13 04:30:18 2002 +0000 @@ -1,3 +1,7 @@ +2002-12-12 Andy Piper <andy@xemacs.org> + + * sheap.c (report_sheap_usage): fixup calculation. + 2002-12-03 John Paul Wallington <jpw@shootybangbang.com> * alloc.c (garbage_collection_messages): New variable.
--- a/src/sheap.c Thu Dec 12 22:53:10 2002 +0000 +++ b/src/sheap.c Fri Dec 13 04:30:18 2002 +0000 @@ -27,7 +27,7 @@ #include <sheap-adjust.h> #define STATIC_HEAP_BASE 0x800000 -#define STATIC_HEAP_SLOP 0x500000 +#define STATIC_HEAP_SLOP 0x40000 #define STATIC_HEAP_SIZE \ (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP) #define BLOCKSIZE (1<<12) @@ -129,17 +129,17 @@ Bytecount lost = STATIC_HEAP_SIZE - (static_heap_ptr - static_heap_buffer); char buf[200]; - sprintf (buf, "Static heap usage: %ld of %ld, slop is %ld", - (long) (static_heap_ptr - static_heap_buffer), - (long) (STATIC_HEAP_SIZE), - (long) STATIC_HEAP_SLOP); + sprintf (buf, "Static heap usage: %ldk of %ldk, slop is %ldk", + (long) ((static_heap_ptr - static_heap_buffer) /1024), + (long) (STATIC_HEAP_SIZE / 1024), + (long) STATIC_HEAP_SLOP / 1024); if (lost > STATIC_HEAP_SLOP) { sprintf (buf + strlen (buf), " -- %ldk wasted", (long)(lost/1024)); if (die_if_pure_storage_exceeded) { sheap_adjust_h(STATIC_HEAP_SLOP - lost); sprintf (buf + strlen (buf), " -- reset to %ldk", - (long) (STATIC_HEAP_SIZE + STATIC_HEAP_SLOP - lost)); + (long) ((STATIC_HEAP_SIZE + STATIC_HEAP_SLOP - lost) / 1024)); rc = -1; } message ("%s", buf);