Mercurial > hg > xemacs-beta
view src/xgccache.c @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 20 Jan 2010 07:05:57 -0600 |
| parents | ea87f3f1e3ff |
| children | b3ce27ca7647 |
line wrap: on
line source
/* Efficient caching of X GCs (graphics contexts). Copyright (C) 1993 Free Software Foundation, Inc. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Emacs uses a lot of different display attributes; for example, assume that only four fonts are in use (normal, bold, italic, and bold-italic). Then assume that one stipple or background is used for text selections, and another is used for highlighting mousable regions. That makes 16 GCs already. Add in the fact that another GC may be needed to display the text cursor in any of those regions, and you've got 32. Add in more fonts, and it keeps increasing exponentially. We used to keep these GCs in a cache of merged (fully qualified) faces. However, a lot of other code in xterm.c used XChangeGC of existing GCs, which is kind of slow and kind of random. Also, managing the face cache was tricky because it was hard to know when a face was no longer visible on the frame -- we had to mark all frames as garbaged whenever a face was changed, which caused an unpleasant amount of flicker (since faces are created/destroyed (= changed) whenever a frame is created/destroyed. So this code maintains a cache at the GC level instead of at the face level. There is an upper limit on the size of the cache, after which we will stop creating GCs and start reusing them (reusing the least-recently- used ones first). So if faces get changed, their GCs will eventually be recycled. Also more sharing of GCs is possible. This code uses hash tables. It could be that, if the cache size is small enough, a linear search might be faster; but I doubt it, since we need `equal' comparisons, not `eq', and I expect that the optimal cache size will be ~100. Written by jwz, 14 jun 93 */ #include <config.h> #include <X11/Xlib.h> #include "xgccache.h" #define GC_CACHE_SIZE 100 #define GCCACHE_HASH #ifdef GCCACHE_HASH #include "lisp.h" #include "hash.h" #endif struct gcv_and_mask { XGCValues gcv; unsigned long mask; }; struct gc_cache_cell { GC gc; struct gcv_and_mask gcvm; struct gc_cache_cell *prev, *next; }; struct gc_cache { Display *dpy; /* used only as arg to XCreateGC/XFreeGC */ Window window; /* used only as arg to XCreateGC */ int size; struct gc_cache_cell *head; struct gc_cache_cell *tail; #ifdef GCCACHE_HASH struct hash_table *table; #endif int create_count; int delete_count; }; #ifdef GCCACHE_HASH static Hashcode gc_cache_hash (const void *arg) { const struct gcv_and_mask *gcvm = (const struct gcv_and_mask *) arg; unsigned long *longs = (unsigned long *) &gcvm->gcv; Hashcode hash = gcvm->mask; int i; /* This could look at the mask and only use the used slots in the hash code. That would win in that we wouldn't have to initialize every slot of the gcv when calling gc_cache_lookup. But we need the hash function to be as fast as possible; some timings should be done. */ for (i = 0; i < (int) (sizeof (XGCValues) / sizeof (unsigned long)); i++) hash = (hash << 1) ^ *longs++; return hash; } #endif /* GCCACHE_HASH */ static int gc_cache_eql (const void *arg1, const void *arg2) { /* See comment in gc_cache_hash */ return !memcmp (arg1, arg2, sizeof (struct gcv_and_mask)); } struct gc_cache * make_gc_cache (Display *dpy, Window window) { struct gc_cache *cache = xnew (struct gc_cache); cache->dpy = dpy; cache->window = window; cache->size = 0; cache->head = cache->tail = 0; cache->create_count = cache->delete_count = 0; #ifdef GCCACHE_HASH cache->table = make_general_hash_table (GC_CACHE_SIZE, gc_cache_hash, gc_cache_eql); #endif return cache; } void free_gc_cache (struct gc_cache *cache) { struct gc_cache_cell *rest, *next; rest = cache->head; while (rest) { XFreeGC (cache->dpy, rest->gc); next = rest->next; xfree (rest, struct gc_cache_cell *); rest = next; } #ifdef GCCACHE_HASH free_hash_table (cache->table); #endif xfree (cache, struct gc_cache *); } GC gc_cache_lookup (struct gc_cache *cache, XGCValues *gcv, unsigned long mask) { struct gc_cache_cell *cell, *next, *prev; struct gcv_and_mask gcvm; #ifdef DEBUG_XEMACS (void) describe_gc_cache (cache, DGCCFLAG_DISABLE); #endif if ((!!cache->head) != (!!cache->tail)) ABORT (); if (cache->head && (cache->head->prev || cache->tail->next)) ABORT (); gcvm.mask = mask; gcvm.gcv = *gcv; /* this copies... */ #ifdef GCCACHE_HASH /* The intermediate cast fools gcc into not outputting strict-aliasing complaints */ if (gethash (&gcvm, cache->table, (const void **) (void *) &cell)) #else /* !GCCACHE_HASH */ cell = cache->tail; /* start at the end (most recently used) */ while (cell) { if (gc_cache_eql (&gcvm, &cell->gcvm)) break; else cell = cell->prev; } /* #### This whole file needs some serious overhauling. */ if (!(mask | GCTile) && cell->gc->values.tile) cell = 0; else if (!(mask | GCStipple) && cell->gc->values.stipple) cell = 0; if (cell) #endif /* !GCCACHE_HASH */ { /* Found a cell. Move this cell to the end of the list, so that it will be less likely to be collected than a cell that was accessed less recently. */ #if 0 debug_out ("Returning cached GC: %08lx\n", XE_GCONTEXT(cell)); #endif if (cell == cache->tail) return cell->gc; next = cell->next; prev = cell->prev; if (prev) prev->next = next; if (next) next->prev = prev; if (cache->head == cell) cache->head = next; cell->next = 0; cell->prev = cache->tail; cache->tail->next = cell; cache->tail = cell; if (cache->head == cell) ABORT (); if (cell->next) ABORT (); if (cache->head->prev) ABORT (); if (cache->tail->next) ABORT (); return cell->gc; } /* else, cache miss. */ if (cache->size == GC_CACHE_SIZE) /* Reuse the first cell on the list (least-recently-used). Remove it from the list, and unhash it from the table. */ { cell = cache->head; cache->head = cell->next; cache->head->prev = 0; if (cache->tail == cell) cache->tail = 0; /* only one */ #if 0 debug_out ("Cache full, freeing GC: %08lx\n ", XE_GCONTEXT(cell)); #endif XFreeGC (cache->dpy, cell->gc); cache->delete_count++; #ifdef GCCACHE_HASH remhash (&cell->gcvm, cache->table); #endif } else if (cache->size > GC_CACHE_SIZE) ABORT (); else { /* Allocate a new cell (don't put it in the list or table yet). */ cell = xnew (struct gc_cache_cell); cache->size++; } /* Now we've got a cell (new or reused). Fill it in. */ memcpy (&cell->gcvm.gcv, gcv, sizeof (XGCValues)); cell->gcvm.mask = mask; /* Put the cell on the end of the list. */ cell->next = 0; cell->prev = cache->tail; if (cache->tail) cache->tail->next = cell; cache->tail = cell; if (! cache->head) cache->head = cell; cache->create_count++; #ifdef GCCACHE_HASH /* Hash it in the table */ puthash (&cell->gcvm, cell, cache->table); #endif /* Now make and return the GC. */ cell->gc = XCreateGC (cache->dpy, cache->window, mask, gcv); /* debug */ assert (cell->gc == gc_cache_lookup (cache, gcv, mask)); #if 0 debug_out ("Returning new GC: %08lx\n ", XE_GCONTEXT(cell)); #endif return cell->gc; } #ifdef DEBUG_XEMACS /* FLAGS The flags argument is a bitwise or of any of the following: DGCCFLAG_SUMMARY Summary statistics for cache DGCCFLAG_LIST_CELLS If summary is being printed, print cell IDs too. DGCCFLAG_CELL_DETAILS If cell IDs are being printed, additionally print the internal fields used and values. DGCCFLAG_DEFAULT A predefined combination giving whatever the maintainers are currently interested in seeing. */ void describe_gc_cache (struct gc_cache *cache, int flags) { int count = 0; struct gc_cache_cell *cell = cache->head; if (! flags & DGCCFLAG_SUMMARY) return; stderr_out ("\nsize: %d", cache->size); stderr_out ("\ncreated: %d", cache->create_count); stderr_out ("\ndeleted: %d", cache->delete_count); if (flags & DGCCFLAG_LIST_CELLS) while (cell) { struct gc_cache_cell *cell2; int i = 0; stderr_out ("\n%d:\t0x%lx GC: 0x%08lx hash: 0x%08lx\n", count, (long) cell, (long) XE_GCONTEXT(cell), gc_cache_hash (&cell->gcvm)); for (cell2 = cache->head; cell2; cell2 = cell2->next, i++) if (count != i && gc_cache_hash (&cell->gcvm) == gc_cache_hash (&cell2->gcvm)) stderr_out ("\tHASH COLLISION with cell %d\n", i); stderr_out ("\tmask: %8lx\n", cell->gcvm.mask); if (flags & DGCCFLAG_CELL_DETAILS) { #define FROB(field) do { \ if ((int)cell->gcvm.gcv.field != (~0)) \ stderr_out ("\t%-12s%8x\n", #field ":", (int)cell->gcvm.gcv.field); \ } while (0) FROB (function); FROB (plane_mask); FROB (foreground); FROB (background); FROB (line_width); FROB (line_style); FROB (cap_style); FROB (join_style); FROB (fill_style); FROB (fill_rule); FROB (arc_mode); FROB (tile); FROB (stipple); FROB (ts_x_origin); FROB (ts_y_origin); FROB (font); FROB (subwindow_mode); FROB (graphics_exposures); FROB (clip_x_origin); FROB (clip_y_origin); FROB (clip_mask); FROB (dash_offset); #undef FROB } count++; if (cell->next && cell == cache->tail) stderr_out ("\nERROR! tail is here!\n\n"); else if (!cell->next && cell != cache->tail) stderr_out ("\nERROR! tail is not at the end\n\n"); cell = cell->next; } /* while (cell) */ if (count != cache->size) stderr_out ("\nERROR! count should be %d\n\n", cache->size); } #endif /* DEBUG_XEMACS */
