Mercurial > hg > xemacs-beta
annotate src/sheap.c @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | 70921960b980 |
| 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 |