Mercurial > emacs
view src/ralloc.c @ 3881:9d92b383b584
Separate parameter faces (those created and modified by the user)
from the computed faces (the combinations created by
compute_char_face), so that we don't waste global face id's.
* xterm.h (struct x_display): Replace the fields faces and n_faces
with fields param_faces, n_param_faces, computed_faces,
n_computed_faces, and size_computed_faces.
(FRAME_FACES, FRAME_N_FACES): Replaced by...
(FRAME_COMPUTED_FACES, FRAME_N_COMPUTED_FACES, FRAME_PARAM_FACES,
FRAME_N_PARAM_FACES): New macros.
* xfaces.c: Doc fixes.
(init_frame_faces): Call new_computed_face to create entries for
the default and mode line faces. Use the FRAME...PARAM_FACES
macros.
(free_frame_faces): Use the FRAME...PARAM_FACES and
FRAME...COMPUTED_FACES macros. Don't use the copy flag; all
parameter faces have real X resources, and all computed faces just
have copies. Free both the parameter and computed face arrays.
(new_computed_face): New function.
(intern_computed_face): Renamed from intern_frame_face; callers
changed. Call new_computed_face.
(ensure_face_ready, compute_char_face, compute_glyph_face): Use the
FRAME...PARAM_FACES macros.
(recompute_basic_faces): Use the FRAME...PARAM_FACES and
FRAME...COMPUTED_FACES macros. Produce the computed faces by
starting with the base faces and merging in the parameter faces.
(Fset_face_attribute_internal): Use the FRAME...PARAM_FACES
macros. Just call recompute_basic_faces if the default or mode
line faces have changed.
* xfns.c (Fx_list_fonts): Use the FRAME...PARAM_FACES macros.
* xterm.c (dumpglyphs): Use the FRAME...COMPUTED_FACES macros.
* dispextern.h (struct face): Remove the copy member. This is no
longer necessary; all computed faces are copies, and no parameter
faces are.
* xfns.c (Fx_open_connection): Remember to block input while
calling x_load_resources.
* xrdb.c: Undo change of June 19th; it was a BLOCK_INPUT problem,
not a server-specific bug.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Tue, 22 Jun 1993 07:25:11 +0000 |
parents | 507f64624555 |
children | df4d091e603e |
line wrap: on
line source
/* Block-relocating memory allocator. Copyright (C) 1993 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs 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 1, or (at your option) any later version. GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* NOTES: Only relocate the blocs necessary for SIZE in r_alloc_sbrk, rather than all of them. This means allowing for a possible hole between the first bloc and the end of malloc storage. */ #ifdef emacs #include "config.h" #include "lisp.h" /* Needed for VALBITS. */ #undef NULL /* The important properties of this type are that 1) it's a pointer, and 2) arithmetic on it should work as if the size of the object pointed to has a size of 1. */ #if 0 /* Arithmetic on void* is a GCC extension. */ #ifdef __STDC__ typedef void *POINTER; #else #ifdef HAVE_CONFIG_H #include "config.h" #endif typedef char *POINTER; #endif #endif /* 0 */ /* Unconditionally use char * for this. */ typedef char *POINTER; typedef unsigned long SIZE; /* Declared in dispnew.c, this version doesn't screw up if regions overlap. */ extern void safe_bcopy (); #include "getpagesize.h" #else /* Not emacs. */ #include <stddef.h> typedef size_t SIZE; typedef void *POINTER; #include <unistd.h> #include <malloc.h> #include <string.h> #define safe_bcopy(x, y, z) memmove (y, x, z) #endif /* emacs. */ #define NIL ((POINTER) 0) /* A flag to indicate whether we have initialized ralloc yet. For Emacs's sake, please do not make this local to malloc_init; on some machines, the dumping procedure makes all static variables read-only. On these machines, the word static is #defined to be the empty string, meaning that r_alloc_initialized becomes an automatic variable, and loses its value each time Emacs is started up. */ static int r_alloc_initialized = 0; static void r_alloc_init (); /* Declarations for working with the malloc, ralloc, and system breaks. */ /* Function to set the real break value. */ static POINTER (*real_morecore) (); /* The break value, as seen by malloc (). */ static POINTER virtual_break_value; /* The break value, viewed by the relocatable blocs. */ static POINTER break_value; /* The REAL (i.e., page aligned) break value of the process. */ static POINTER page_break_value; /* This is the size of a page. We round memory requests to this boundary. */ static int page_size; /* Whenever we get memory from the system, get this many extra bytes. This must be a multiple of page_size. */ static int extra_bytes; /* Macros for rounding. Note that rounding to any value is possible by changing the definition of PAGE. */ #define PAGE (getpagesize ()) #define ALIGNED(addr) (((unsigned int) (addr) & (page_size - 1)) == 0) #define ROUNDUP(size) (((unsigned int) (size) + page_size - 1) & ~(page_size - 1)) #define ROUND_TO_PAGE(addr) (addr & (~(page_size - 1))) /* Functions to get and return memory from the system. */ /* Obtain SIZE bytes of space. If enough space is not presently available in our process reserve, (i.e., (page_break_value - break_value)), this means getting more page-aligned space from the system. Return non-zero if all went well, or zero if we couldn't allocate the memory. */ static int obtain (size) SIZE size; { SIZE already_available = page_break_value - break_value; if (already_available < size) { SIZE get = ROUNDUP (size - already_available); /* Get some extra, so we can come here less often. */ get += extra_bytes; if ((*real_morecore) (get) == 0) return 0; page_break_value += get; } break_value += size; return 1; } /* Obtain SIZE bytes of space and return a pointer to the new area. If we could not allocate the space, return zero. */ static POINTER get_more_space (size) SIZE size; { POINTER ptr = break_value; if (obtain (size)) return ptr; else return 0; } /* Note that SIZE bytes of space have been relinquished by the process. If SIZE is more than a page, return the space to the system. */ static void relinquish (size) SIZE size; { POINTER new_page_break; int excess; break_value -= size; new_page_break = (POINTER) ROUNDUP (break_value); excess = (char *) page_break_value - (char *) new_page_break; if (excess > extra_bytes * 2) { /* Keep extra_bytes worth of empty space. And don't free anything unless we can free at least extra_bytes. */ if ((*real_morecore) (extra_bytes - excess) == 0) abort (); page_break_value += extra_bytes - excess; } /* Zero the space from the end of the "official" break to the actual break, so that bugs show up faster. */ bzero (break_value, ((char *) page_break_value - (char *) break_value)); } /* The meat - allocating, freeing, and relocating blocs. */ /* These structures are allocated in the malloc arena. The linked list is kept in order of increasing '.data' members. The data blocks abut each other; if b->next is non-nil, then b->data + b->size == b->next->data. */ typedef struct bp { struct bp *next; struct bp *prev; POINTER *variable; POINTER data; SIZE size; } *bloc_ptr; #define NIL_BLOC ((bloc_ptr) 0) #define BLOC_PTR_SIZE (sizeof (struct bp)) /* Head and tail of the list of relocatable blocs. */ static bloc_ptr first_bloc, last_bloc; /* Find the bloc referenced by the address in PTR. Returns a pointer to that block. */ static bloc_ptr find_bloc (ptr) POINTER *ptr; { register bloc_ptr p = first_bloc; while (p != NIL_BLOC) { if (p->variable == ptr && p->data == *ptr) return p; p = p->next; } return p; } /* Allocate a bloc of SIZE bytes and append it to the chain of blocs. Returns a pointer to the new bloc, or zero if we couldn't allocate memory for the new block. */ static bloc_ptr get_bloc (size) SIZE size; { register bloc_ptr new_bloc; if (! (new_bloc = (bloc_ptr) malloc (BLOC_PTR_SIZE)) || ! (new_bloc->data = get_more_space (size))) { if (new_bloc) free (new_bloc); return 0; } new_bloc->size = size; new_bloc->next = NIL_BLOC; new_bloc->variable = (POINTER *) NIL; if (first_bloc) { new_bloc->prev = last_bloc; last_bloc->next = new_bloc; last_bloc = new_bloc; } else { first_bloc = last_bloc = new_bloc; new_bloc->prev = NIL_BLOC; } return new_bloc; } /* Relocate all blocs from BLOC on upward in the list to the zone indicated by ADDRESS. Direction of relocation is determined by the position of ADDRESS relative to BLOC->data. If BLOC is NIL_BLOC, nothing is done. Note that ordering of blocs is not affected by this function. */ static void relocate_some_blocs (bloc, address) bloc_ptr bloc; POINTER address; { if (bloc != NIL_BLOC) { register SIZE offset = address - bloc->data; register SIZE data_size = 0; register bloc_ptr b; for (b = bloc; b != NIL_BLOC; b = b->next) { data_size += b->size; b->data += offset; *b->variable = b->data; } safe_bcopy (address - offset, address, data_size); } } /* Free BLOC from the chain of blocs, relocating any blocs above it and returning BLOC->size bytes to the free area. */ static void free_bloc (bloc) bloc_ptr bloc; { if (bloc == first_bloc && bloc == last_bloc) { first_bloc = last_bloc = NIL_BLOC; } else if (bloc == last_bloc) { last_bloc = bloc->prev; last_bloc->next = NIL_BLOC; } else if (bloc == first_bloc) { first_bloc = bloc->next; first_bloc->prev = NIL_BLOC; } else { bloc->next->prev = bloc->prev; bloc->prev->next = bloc->next; } relocate_some_blocs (bloc->next, bloc->data); relinquish (bloc->size); free (bloc); } /* Interface routines. */ static int use_relocatable_buffers; /* Obtain SIZE bytes of storage from the free pool, or the system, as necessary. If relocatable blocs are in use, this means relocating them. This function gets plugged into the GNU malloc's __morecore hook. We provide hysteresis, never relocating by less than extra_bytes. If we're out of memory, we should return zero, to imitate the other __morecore hook values - in particular, __default_morecore in the GNU malloc package. */ POINTER r_alloc_sbrk (size) long size; { /* This is the first address not currently available for the heap. */ POINTER top; /* Amount of empty space below that. */ /* It is not correct to use SIZE here, because that is usually unsigned. ptrdiff_t would be okay, but is not always available. `long' will work in all cases, in practice. */ long already_available; POINTER ptr; if (! use_relocatable_buffers) return (*real_morecore) (size); top = first_bloc ? first_bloc->data : page_break_value; already_available = (char *) top - (char *) virtual_break_value; /* Do we not have enough gap already? */ if (size > 0 && already_available < size) { /* Get what we need, plus some extra so we can come here less often. */ SIZE get = size - already_available + extra_bytes; if (! obtain (get)) return 0; if (first_bloc) relocate_some_blocs (first_bloc, first_bloc->data + get); /* Zero out the space we just allocated, to help catch bugs quickly. */ bzero (virtual_break_value, get); } /* Can we keep extra_bytes of gap while freeing at least extra_bytes? */ else if (size < 0 && already_available - size > 2 * extra_bytes) { /* Ok, do so. This is how many to free. */ SIZE give_back = already_available - size - extra_bytes; if (first_bloc) relocate_some_blocs (first_bloc, first_bloc->data - give_back); relinquish (give_back); } ptr = virtual_break_value; virtual_break_value += size; return ptr; } /* Allocate a relocatable bloc of storage of size SIZE. A pointer to the data is returned in *PTR. PTR is thus the address of some variable which will use the data area. If we can't allocate the necessary memory, set *PTR to zero, and return zero. */ POINTER r_alloc (ptr, size) POINTER *ptr; SIZE size; { register bloc_ptr new_bloc; if (! r_alloc_initialized) r_alloc_init (); new_bloc = get_bloc (size); if (new_bloc) { new_bloc->variable = ptr; *ptr = new_bloc->data; } else *ptr = 0; return *ptr; } /* Free a bloc of relocatable storage whose data is pointed to by PTR. Store 0 in *PTR to show there's no block allocated. */ void r_alloc_free (ptr) register POINTER *ptr; { register bloc_ptr dead_bloc; dead_bloc = find_bloc (ptr); if (dead_bloc == NIL_BLOC) abort (); free_bloc (dead_bloc); *ptr = 0; } /* Given a pointer at address PTR to relocatable data, resize it to SIZE. Do this by shifting all blocks above this one up in memory, unless SIZE is less than or equal to the current bloc size, in which case do nothing. Change *PTR to reflect the new bloc, and return this value. If more memory cannot be allocated, then leave *PTR unchanged, and return zero. */ POINTER r_re_alloc (ptr, size) POINTER *ptr; SIZE size; { register bloc_ptr bloc; bloc = find_bloc (ptr); if (bloc == NIL_BLOC) abort (); if (size <= bloc->size) /* Wouldn't it be useful to actually resize the bloc here? */ return *ptr; if (! obtain (size - bloc->size)) return 0; relocate_some_blocs (bloc->next, bloc->data + size); /* Zero out the new space in the bloc, to help catch bugs faster. */ bzero (bloc->data + bloc->size, size - bloc->size); /* Indicate that this block has a new size. */ bloc->size = size; return *ptr; } /* The hook `malloc' uses for the function which gets more space from the system. */ extern POINTER (*__morecore) (); /* Initialize various things for memory allocation. */ static void r_alloc_init () { if (r_alloc_initialized) return; r_alloc_initialized = 1; real_morecore = __morecore; __morecore = r_alloc_sbrk; virtual_break_value = break_value = (*real_morecore) (0); if (break_value == NIL) abort (); page_size = PAGE; extra_bytes = ROUNDUP (50000); page_break_value = (POINTER) ROUNDUP (break_value); /* Clear the rest of the last page; this memory is in our address space even though it is after the sbrk value. */ bzero (break_value, (page_break_value - break_value)); use_relocatable_buffers = 1; }