Mercurial > hg > xemacs-beta
view src/sheap.c @ 5619:75ad4969a16d
Replace the 'flush face property with the opposite 'shrink one.
lisp/ChangeLog addition:
2011-12-26 Didier Verna <didier@xemacs.org>
* cl-macs.el (face-flush-p): Removed.
* cl-macs.el (face-shrink-p): New.
* faces.el (face-flush-p): Removed.
* faces.el (face-shrink-p): New.
* faces.el (set-face-flush-p): Removed.
* faces.el (set-face-shrink-p): New.
* cus-face.el (custom-face-attributes):
* faces.el (set-face-property):
* faces.el (face-equal):
* x-faces.el (x-init-face-from-resources):
* x-faces.el (make-face-x-resource-internal): Replace the 'flush
property with the opposite 'shrink one.
src/ChangeLog addition:
2011-12-26 Didier Verna <didier@xemacs.org>
* lisp.h:
* faces.c (mark_face):
* faces.c (face_equal):
* faces.c (face_getprop):
* faces.c (face_putprop):
* faces.c (face_remprop):
* faces.c (face_plist):
* faces.c (reset_face):
* faces.c (update_face_inheritance_mapper):
* faces.c (Fmake_face):
* faces.c (update_face_cachel_data):
* faces.c (merge_face_cachel_data):
* faces.c (Fcopy_face):
* faces.c (syms_of_faces):
* faces.c (vars_of_faces):
* faces.c (complex_vars_of_faces):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* faces.h (WINDOW_FACE_CACHEL_SHRINK_P):
* faces.h (FACE_SHRINK_P):
* fontcolor.c (face_boolean_validate): Replace the 'flush property
with the opposite 'shrink one.
* redisplay.c (create_text_block):
* redisplay.c (create_string_text_block): Ditto. Invert the logic
for storing a new clear_findex in the display lines.
author | Didier Verna <didier@xemacs.org> |
---|---|
date | Mon, 26 Dec 2011 15:04:25 +0100 |
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); } }