Mercurial > hg > xemacs-beta
view src/vm-limit.c @ 5776:65d65b52d608
Pass character count from coding systems to buffer insertion code.
src/ChangeLog addition:
2014-01-16 Aidan Kehoe <kehoea@parhasard.net>
Pass character count information from the no-conversion and
unicode coding systems to the buffer insertion code, making
#'find-file on large buffers a little snappier (if
ERROR_CHECK_TEXT is not defined).
* file-coding.c:
* file-coding.c (coding_character_tell): New.
* file-coding.c (conversion_coding_stream_description): New.
* file-coding.c (no_conversion_convert):
Update characters_seen when decoding.
* file-coding.c (no_conversion_character_tell): New.
* file-coding.c (lstream_type_create_file_coding): Create the
no_conversion type with data.
* file-coding.c (coding_system_type_create):
Make the character_tell method available here.
* file-coding.h:
* file-coding.h (struct coding_system_methods):
Add a new character_tell() method, passing charcount information
from the coding systems to the buffer code, avoiding duplicate
bytecount-to-charcount work especially with large buffers.
* fileio.c (Finsert_file_contents_internal):
Update this to pass charcount information to
buffer_insert_string_1(), if that is available from the lstream code.
* insdel.c:
* insdel.c (buffer_insert_string_1):
Add a new CCLEN argument, giving the character count of the string
to insert. It can be -1 to indicate that te function should work
it out itself using bytecount_to_charcount(), as it used to.
* insdel.c (buffer_insert_raw_string_1):
* insdel.c (buffer_insert_lisp_string_1):
* insdel.c (buffer_insert_ascstring_1):
* insdel.c (buffer_insert_emacs_char_1):
* insdel.c (buffer_insert_from_buffer_1):
* insdel.c (buffer_replace_char):
Update these functions to use the new calling convention.
* insdel.h:
* insdel.h (buffer_insert_string):
Update this header to reflect the new buffer_insert_string_1()
argument.
* lstream.c (Lstream_character_tell): New.
Return the number of characters *read* and seen by the consumer so
far, taking into account the unget buffer, and buffered reading.
* lstream.c (Lstream_unread):
Update unget_character_count here as appropriate.
* lstream.c (Lstream_rewind):
Reset unget_character_count here too.
* lstream.h:
* lstream.h (struct lstream):
Provide the character_tell method, add a new field,
unget_character_count, giving the number of characters ever passed
to Lstream_unread().
Declare Lstream_character_tell().
Make Lstream_ungetc(), which happens to be unused, an inline
function rather than a macro, in the course of updating it to
modify unget_character_count.
* print.c (output_string):
Use the new argument to buffer_insert_string_1().
* tests.c:
* tests.c (Ftest_character_tell):
New test function.
* tests.c (syms_of_tests):
Make it available.
* unicode.c:
* unicode.c (struct unicode_coding_stream):
* unicode.c (unicode_character_tell):
New method.
* unicode.c (unicode_convert):
Update the character counter as appropriate.
* unicode.c (coding_system_type_create_unicode):
Make the character_tell method available.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 16 Jan 2014 16:27:52 +0000 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Functions for memory limit warnings. Copyright (C) 1990, 1992 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: FSF 19.30. */ #ifdef emacs #include <config.h> #include "lisp.h" #endif #include <stddef.h> #ifndef emacs typedef size_t SIZE; typedef void *POINTER; #define EXCEEDS_LISP_PTR(x) 0 #endif #include "mem-limits.h" #ifndef _NO_MALLOC_WARNING_ /* Level number of warnings already issued. 0 -- no warnings issued. 1 -- 75% warning already issued. 2 -- 85% warning already issued. 3 -- 95% warning issued; keep warning frequently. */ static int warnlevel; /* Function to call to issue a warning; 0 means don't issue them. */ static void (*warn_function) (const char *); /* Get more memory space, complaining if we're near the end. */ static void check_memory_limits (void) { extern POINTER (*__morecore) (ptrdiff_t size); POINTER cp; unsigned long five_percent; unsigned long data_size; void (*save_warn_fun) (const char *); if (lim_data == 0) get_lim_data (); five_percent = lim_data / 20; /* Find current end of memory and issue warning if getting near max */ cp = (char *) (*__morecore) (0); data_size = (char *) cp - (char *) data_space_start; if (warn_function) { /* temporarily reset the warn_function to 0 or we will get infinite looping. */ save_warn_fun = warn_function; warn_function = 0; switch (warnlevel) { case 0: if (data_size > five_percent * 15) { warnlevel++; (*save_warn_fun) ("Warning: past 75% of memory limit"); } break; case 1: if (data_size > five_percent * 17) { warnlevel++; (*save_warn_fun) ("Warning: past 85% of memory limit"); } break; case 2: if (data_size > five_percent * 19) { warnlevel++; (*save_warn_fun) ("Warning: past 95% of memory limit"); } break; default: (*save_warn_fun) ("Warning: past acceptable memory limits"); break; } warn_function = save_warn_fun; } /* If we go down below 70% full, issue another 75% warning when we go up again. */ if (data_size < five_percent * 14) warnlevel = 0; /* If we go down below 80% full, issue another 85% warning when we go up again. */ else if (warnlevel > 1 && data_size < five_percent * 16) warnlevel = 1; /* If we go down below 90% full, issue another 95% warning when we go up again. */ else if (warnlevel > 2 && data_size < five_percent * 18) warnlevel = 2; if (EXCEEDS_LISP_PTR (cp)) { if (warn_function) { /* temporarily reset the warn_function to 0 or we will get infinite looping. */ save_warn_fun = warn_function; warn_function = 0; (*save_warn_fun) ("Warning: memory in use exceeds lisp pointer size"); warn_function = save_warn_fun; } } } #endif /* not _NO_MALLOC_WARNING_ */ /* Cause reinitialization based on job parameters; also declare where the end of pure storage is. */ void memory_warnings (void *start, #ifdef _NO_MALLOC_WARNING_ void (*UNUSED_ARG (warnfun)) (const char *) ATTRIBUTE_UNUSED #else void (*warnfun) (const char *) #endif ) { #ifndef _NO_MALLOC_WARNING_ extern void (* __after_morecore_hook) (void); /* From gmalloc.c */ #endif if (start) data_space_start = (char*) start; else data_space_start = start_of_data (); #ifndef _NO_MALLOC_WARNING_ warn_function = warnfun; __after_morecore_hook = check_memory_limits; #endif }