Mercurial > hg > xemacs-beta
view src/sheap.c @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 Jan 2012 15:18:52 +0000 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Static Heap management routines for XEmacs. Copyright (C) 1994, 1998 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/>. */ #include <config.h> #include "lisp.h" #include "sysfile.h" #include <unistd.h> #include <sheap-adjust.h> #define STATIC_HEAP_BASE 0x800000 #define STATIC_HEAP_SLOP 0x80000 #define STATIC_HEAP_SIZE \ (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP) #define BLOCKSIZE (1<<12) #define ALLOC_UNIT (BLOCKSIZE-1) #define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT)) #define ALIGN_ALLOC(addr) ((((unsigned long)addr) + ALLOC_UNIT) & ALLOC_MASK) char static_heap_buffer[STATIC_HEAP_SIZE]={0}; char* static_heap_base=static_heap_buffer; char* static_heap_ptr=static_heap_buffer; unsigned long static_heap_size=STATIC_HEAP_SIZE; int static_heap_initialized=0; int static_heap_dumped=0; void *more_static_core ( ptrdiff_t increment ); void *more_static_core ( ptrdiff_t increment ) { int size = (int) increment; void *result; if (!static_heap_initialized) { #ifdef VALMASK if (((unsigned long) static_heap_base & ~VALMASK) != 0) { printf ("error: The heap was allocated in upper memory.\n"); exit (-1); } #endif static_heap_base=(char*)ALIGN_ALLOC(static_heap_buffer); static_heap_ptr=static_heap_base; static_heap_size=STATIC_HEAP_SIZE - (static_heap_base-static_heap_buffer); #ifdef CYGWIN sbrk(BLOCKSIZE); /* force space for fork to work */ #endif static_heap_initialized=1; } result = static_heap_ptr; /* we don't need to align - handled by gmalloc. */ if (size < 0) { if (static_heap_ptr + size < static_heap_base) { return 0; } } else { if (static_heap_ptr + size >= static_heap_base + static_heap_size) { printf ( "\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n" "is %p, static heap size is %ld. You have exhausted the static heap. \n" "\n" "If you are simply trying to compile, remove sheap-adjust.h\n" "and recompile from the top level. If this doesn't\n" "work then STATIC_HEAP_SLOP (defined in this file) is too small.\n" "\n" "If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n" "to 0 or a +ve number. Generally you should *not* try to run temacs\n" "with a static heap, you should dump first.\n", size, static_heap_base, static_heap_ptr, static_heap_size); exit(-1); return 0; } } static_heap_ptr += size; return result; } static void sheap_adjust_h (long adjust) { FILE *stream = retry_fopen ("sheap-adjust.h", "w"); if (stream == NULL) report_file_error ("Opening sheap adjustment file", build_ascstring ("sheap-adjust.h")); fprintf (stream, "/*\tDo not edit this file!\n" "\tAutomatically generated by XEmacs */\n" "# define SHEAP_ADJUSTMENT (%ld)\n", adjust); retry_fclose (stream); } void report_sheap_usage (int die_if_pure_storage_exceeded); void report_sheap_usage (int die_if_pure_storage_exceeded) { int rc = 0; Bytecount lost = STATIC_HEAP_SIZE - (static_heap_ptr - static_heap_buffer); char buf[200]; 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) / 1024)); rc = -1; } message ("%s\n", buf); } if (rc < 0) { unlink ("SATISFIED"); stderr_out ("Static heap size adjusted, don't panic! I will restart the `make'\n"); exit (0); } }