Mercurial > hg > xemacs-beta
annotate src/sheap.c @ 1315:70921960b980
[xemacs-hg @ 2003-02-20 08:19:28 by ben]
check in makefile fixes et al
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory into src/. Simplify the dependencies -- everything
in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
mule/mule-msw-init.el: Removed.
Delete this file.
mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows
native, boys and girls!
bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc
file in a non-Mule XEmacs. Formerly you got the rather cryptic
"The required feature `mule' cannot be provided". Now you get
"Loading this file requires Mule support".
finder.el: Remove dependency on which directory this function is invoked
from.
update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that
Makefile.in.in and xemacs.mak are in sync, both of them use
NEEDTODUMP and the other one isn't used.
dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so
we can have arbitrary forms, not just `when-feature'.
very-early-lisp.el: Nuke this file.
finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp.
msw-glyphs.el: Comment clarification.
xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro
section is now completely in sync with src/Makefile.in.in. Copy
check-features, load-shadows, and rebuilding finder-inf.el from
src/Makefile.in.in. The main build/dump/recompile process is now
synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE'
and `error checking' to `error-checking' TO avoid tripping
faux warnings and errors in the VC++ IDE.
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory from top-level Makefile.in.in to here. Simplify
the dependencies. Rearrange into logical subsections.
Synchronize the main compile/dump/build-elcs section with
xemacs.mak, which is already clean and in good working order.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add
additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS,
TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out
duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so
it doesn't need to ignore the return value from dumping. Add
.NO_PARALLEL since various aspects of building and dumping must be
serialized but do not always have dependencies between them
(this is impossible in some cases). Everything related to src/
now gets built in one pass in this directory by just running
`make' (except the Makefiles themselves and config.h, paths.h,
Emacs.ad.h, and other generated .h files).
console.c: Update list of possibly valid console types.
emacs.c: Rationalize the specifying and handling of the type of the first
frame. This was originally prompted by a workspace in which I got
GTK to compile under C++ and in the process fixed it so it could
coexist with X in the same build -- hence, a combined
TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However,
you can't simultaneously *display* more than one kind of device
connection -- but getting that to work is not that difficult.
Perhaps a project for a bored grad student. I (ben) would do it
but don't see the use.) To make sense of this, I added new
switches that can be used to specifically indicate the window
system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka
--use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka
--use-gnome, same as --use-gtk]. -nw continues as an alias for
-tty. When none have been given, XEmacs checks for other
parameters implying particular device types (-t -> tty, -display
-> x [or should it have same treatment as DISPLAY below?]), and
has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or
gtk? perhaps should check whether gnome is running), else MS
Windows if it exsits, else TTY if it exists, else stream, and you
must be running in batch mode. This also fixes an existing bug
whereby compiling with no x, no mswin, no tty, when running non-
interactively (e.g. to dump) I get "sorry, must have TTY support".
emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even
when occurring extremely early in reinitialization.
emacs.c: Try to make sure that the user can see message output under
Windows (i.e. it doesn't just disappear right away) regardless of
when it occurs, e.g. in the middle of creating the first frame.
emacs.c: Define new function `emacs-run-status', indicating whether XEmacs
is noninteractive or interactive, whether raw,
post-dump/pdump-load or run-temacs, whether we are dumping,
whether pdump is in effect.
event-stream.c: It's "mommas are fat", not "momas are fat".
Fix other typo.
event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS,
because it won't exist on w/o menubar support,
lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here
if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it
blank only for GCC 2.5 through 2.999999999999999.
Declare Vstack_trace_on_error.
profile.c: Need to include "profile.h" to fix warnings.
sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0).
That way we can distinguish between a dumping failing expectedly
(due to lack of stack space, triggering another dump) and unexpectedly,
in which case, we want to stop building. (or go on, if -K is given)
syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong,
and fix warnings thereby.
syntax.h: Fix crash caused by an edge condition in the syntax-cache macros.
text.h: Spacing fixes.
xmotif.h: New file, to get around shadowing warnings.
EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h.
alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC.
config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead.
Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY.
lisp.h: More futile attempts to walk and chew gum at the same time when
dealing with subr's that don't return.
| author | ben |
|---|---|
| date | Thu, 20 Feb 2003 08:19:44 +0000 |
| parents | 6af03f821bbe |
| children | 17b3dc5500b0 |
| rev | line source |
|---|---|
| 428 | 1 /* Static Heap management routines for XEmacs. |
| 2 Copyright (C) 1994, 1998 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to the Free | |
| 18 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 19 02111-1307, USA.*/ | |
| 20 | |
| 21 #include <config.h> | |
| 22 #include "lisp.h" | |
| 442 | 23 |
| 771 | 24 #include "sysfile.h" |
| 25 | |
| 428 | 26 #include <unistd.h> |
| 27 #include <sheap-adjust.h> | |
| 28 | |
| 29 #define STATIC_HEAP_BASE 0x800000 | |
| 1157 | 30 #define STATIC_HEAP_SLOP 0x40000 |
| 428 | 31 #define STATIC_HEAP_SIZE \ |
| 32 (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP) | |
| 33 #define BLOCKSIZE (1<<12) | |
| 34 #define ALLOC_UNIT (BLOCKSIZE-1) | |
| 35 #define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT)) | |
| 36 #define ALIGN_ALLOC(addr) ((((unsigned long)addr) + ALLOC_UNIT) & ALLOC_MASK) | |
| 37 | |
| 38 char static_heap_buffer[STATIC_HEAP_SIZE]={0}; | |
| 39 char* static_heap_base=static_heap_buffer; | |
| 40 char* static_heap_ptr=static_heap_buffer; | |
| 41 unsigned long static_heap_size=STATIC_HEAP_SIZE; | |
| 42 int static_heap_initialized=0; | |
| 43 int static_heap_dumped=0; | |
| 44 | |
| 853 | 45 void *more_static_core ( ptrdiff_t increment ); |
| 46 void *more_static_core ( ptrdiff_t increment ) | |
| 428 | 47 { |
| 48 int size = (int) increment; | |
| 49 void *result; | |
| 50 | |
| 51 if (!static_heap_initialized) | |
| 52 { | |
| 53 #ifdef VALMASK | |
| 54 if (((unsigned long) static_heap_base & ~VALMASK) != 0) | |
| 55 { | |
| 56 printf ("error: The heap was allocated in upper memory.\n"); | |
| 57 exit (-1); | |
| 58 } | |
| 59 #endif | |
| 60 static_heap_base=(char*)ALIGN_ALLOC(static_heap_buffer); | |
| 61 static_heap_ptr=static_heap_base; | |
| 62 static_heap_size=STATIC_HEAP_SIZE - | |
| 63 (static_heap_base-static_heap_buffer); | |
| 442 | 64 #ifdef CYGWIN |
| 428 | 65 sbrk(BLOCKSIZE); /* force space for fork to work */ |
| 66 #endif | |
| 67 static_heap_initialized=1; | |
| 68 } | |
| 69 | |
| 70 result = static_heap_ptr; | |
| 71 | |
| 72 /* we don't need to align - handled by gmalloc. */ | |
| 73 | |
| 74 if (size < 0) | |
| 75 { | |
| 76 if (static_heap_ptr + size < static_heap_base) | |
| 77 { | |
| 78 return 0; | |
| 79 } | |
| 80 } | |
| 81 else | |
| 82 { | |
| 83 if (static_heap_ptr + size >= static_heap_base + static_heap_size) | |
| 84 { | |
| 1111 | 85 printf ( |
| 86 "\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n" | |
| 87 "is %p. You have exhausted the static heap. \n" | |
| 88 "\n" | |
| 89 "If you are simply trying to compile, remove sheap-adjust.h\n" | |
| 90 "and recompile from the top level. If this doesn't\n" | |
| 91 "work then STATIC_HEAP_SLOP (defined in this file) is too small.\n" | |
| 92 "\n" | |
| 93 "If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n" | |
| 94 "to 0 or a +ve number. Generally you should *not* try to run temacs\n" | |
| 95 "with a static heap, you should dump first.\n", | |
| 96 size, static_heap_base, static_heap_ptr); | |
| 428 | 97 |
| 98 exit(-1); | |
| 99 return 0; | |
| 100 } | |
| 101 } | |
| 102 static_heap_ptr += size; | |
| 103 | |
| 104 return result; | |
| 105 } | |
| 106 | |
| 107 static void | |
| 903 | 108 sheap_adjust_h (long adjust) |
| 428 | 109 { |
| 771 | 110 FILE *stream = retry_fopen ("sheap-adjust.h", "w"); |
| 428 | 111 |
| 112 if (stream == NULL) | |
| 113 report_file_error ("Opening sheap adjustment file", | |
| 563 | 114 build_string ("sheap-adjust.h")); |
| 428 | 115 |
| 116 fprintf (stream, | |
| 117 "/*\tDo not edit this file!\n" | |
| 118 "\tAutomatically generated by XEmacs */\n" | |
| 903 | 119 "# define SHEAP_ADJUSTMENT (%ld)\n", adjust); |
| 771 | 120 retry_fclose (stream); |
| 428 | 121 } |
| 122 | |
| 442 | 123 void report_sheap_usage (int die_if_pure_storage_exceeded); |
| 428 | 124 void |
| 125 report_sheap_usage (int die_if_pure_storage_exceeded) | |
| 126 { | |
| 127 int rc = 0; | |
| 128 | |
| 903 | 129 Bytecount lost = STATIC_HEAP_SIZE |
| 428 | 130 - (static_heap_ptr - static_heap_buffer); |
| 131 char buf[200]; | |
| 1157 | 132 sprintf (buf, "Static heap usage: %ldk of %ldk, slop is %ldk", |
| 133 (long) ((static_heap_ptr - static_heap_buffer) /1024), | |
| 134 (long) (STATIC_HEAP_SIZE / 1024), | |
| 135 (long) STATIC_HEAP_SLOP / 1024); | |
| 428 | 136 |
| 1315 | 137 if (lost > STATIC_HEAP_SLOP) |
| 138 { | |
| 139 sprintf (buf + strlen (buf), " -- %ldk wasted", (long)(lost/1024)); | |
| 140 if (die_if_pure_storage_exceeded) | |
| 141 { | |
| 142 sheap_adjust_h(STATIC_HEAP_SLOP - lost); | |
| 143 sprintf (buf + strlen (buf), " -- reset to %ldk", | |
| 144 (long) ((STATIC_HEAP_SIZE + STATIC_HEAP_SLOP - lost) / | |
| 145 1024)); | |
| 146 rc = -1; | |
| 147 } | |
| 148 message ("%s\n", buf); | |
| 428 | 149 } |
| 150 | |
| 1315 | 151 if (rc < 0) |
| 152 { | |
| 153 unlink ("SATISFIED"); | |
| 154 stderr_out ("Static heap size adjusted, don't panic! I will restart the `make'\n"); | |
| 155 exit (0); | |
| 156 } | |
| 428 | 157 } |
| 158 | |
| 159 |