HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove Lisp_Free struct type
[bpt/emacs.git]
/
src
/
sheap.c
diff --git
a/src/sheap.c
b/src/sheap.c
index
f8eec75
..
5069744
100644
(file)
--- a/
src/sheap.c
+++ b/
src/sheap.c
@@
-1,7
+1,7
@@
/* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
complete rewrite of xemacs Cygwin `unexec' code
/* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
complete rewrite of xemacs Cygwin `unexec' code
- Copyright (C) 2004-201
3
Free Software Foundation, Inc.
+ Copyright (C) 2004-201
4
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-25,7
+25,19
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <unistd.h>
+#ifdef __x86_64__
+#ifdef ENABLE_CHECKING
+#define STATIC_HEAP_SIZE (28 * 1024 * 1024)
+#else
+#define STATIC_HEAP_SIZE (19 * 1024 * 1024)
+#endif
+#else /* x86 */
+#ifdef ENABLE_CHECKING
+#define STATIC_HEAP_SIZE (18 * 1024 * 1024)
+#else
#define STATIC_HEAP_SIZE (13 * 1024 * 1024)
#define STATIC_HEAP_SIZE (13 * 1024 * 1024)
+#endif
+#endif /* x86 */
int debug_sheap = 0;
int debug_sheap = 0;
@@
-33,6
+45,7
@@
int debug_sheap = 0;
char bss_sbrk_buffer[STATIC_HEAP_SIZE];
char *bss_sbrk_ptr;
char bss_sbrk_buffer[STATIC_HEAP_SIZE];
char *bss_sbrk_ptr;
+char *max_bss_sbrk_ptr;
int bss_sbrk_did_unexec;
void *
int bss_sbrk_did_unexec;
void *
@@
-40,7
+53,7
@@
bss_sbrk (ptrdiff_t request_size)
{
if (!bss_sbrk_ptr)
{
{
if (!bss_sbrk_ptr)
{
- bss_sbrk_ptr = bss_sbrk_buffer;
+
max_bss_sbrk_ptr =
bss_sbrk_ptr = bss_sbrk_buffer;
#ifdef CYGWIN
sbrk (BLOCKSIZE); /* force space for fork to work */
#endif
#ifdef CYGWIN
sbrk (BLOCKSIZE); /* force space for fork to work */
#endif
@@
-81,6
+94,8
@@
bss_sbrk (ptrdiff_t request_size)
if (debug_sheap)
printf ("allocated 0x%08x size %d\n", ret, request_size);
bss_sbrk_ptr += (int) request_size;
if (debug_sheap)
printf ("allocated 0x%08x size %d\n", ret, request_size);
bss_sbrk_ptr += (int) request_size;
+ if (bss_sbrk_ptr > max_bss_sbrk_ptr)
+ max_bss_sbrk_ptr = bss_sbrk_ptr;
return ret;
}
}
return ret;
}
}
@@
-89,8
+104,8
@@
void
report_sheap_usage (int die_if_pure_storage_exceeded)
{
char buf[200];
report_sheap_usage (int die_if_pure_storage_exceeded)
{
char buf[200];
- sprintf (buf, "
S
tatic heap usage: %d of %d bytes",
- bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
+ sprintf (buf, "
Maximum s
tatic heap usage: %d of %d bytes",
+
max_
bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
/* Don't log messages, cause at this point, we're not allowed to create
buffers. */
message1_nolog (buf);
/* Don't log messages, cause at this point, we're not allowed to create
buffers. */
message1_nolog (buf);