Mercurial > hg > xemacs-beta
annotate src/xgccache.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | a8d8f419b459 |
children | 3d8143fc88e1 |
rev | line source |
---|---|
428 | 1 /* Efficient caching of X GCs (graphics contexts). |
2 Copyright (C) 1993 Free Software Foundation, Inc. | |
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
4 | |
5 This file is part of XEmacs. | |
6 | |
7 XEmacs is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2, or (at your option) any | |
10 later version. | |
11 | |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with XEmacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 Boston, MA 02111-1307, USA. */ | |
21 | |
22 /* Synched up with: Not in FSF. */ | |
23 | |
24 /* Emacs uses a lot of different display attributes; for example, assume | |
25 that only four fonts are in use (normal, bold, italic, and bold-italic). | |
26 Then assume that one stipple or background is used for text selections, | |
27 and another is used for highlighting mousable regions. That makes 16 | |
28 GCs already. Add in the fact that another GC may be needed to display | |
29 the text cursor in any of those regions, and you've got 32. Add in | |
30 more fonts, and it keeps increasing exponentially. | |
31 | |
32 We used to keep these GCs in a cache of merged (fully qualified) faces. | |
33 However, a lot of other code in xterm.c used XChangeGC of existing GCs, | |
34 which is kind of slow and kind of random. Also, managing the face cache | |
35 was tricky because it was hard to know when a face was no longer visible | |
36 on the frame -- we had to mark all frames as garbaged whenever a face | |
37 was changed, which caused an unpleasant amount of flicker (since faces are | |
38 created/destroyed (= changed) whenever a frame is created/destroyed. | |
39 | |
40 So this code maintains a cache at the GC level instead of at the face | |
41 level. There is an upper limit on the size of the cache, after which we | |
42 will stop creating GCs and start reusing them (reusing the least-recently- | |
43 used ones first). So if faces get changed, their GCs will eventually be | |
44 recycled. Also more sharing of GCs is possible. | |
45 | |
46 This code uses hash tables. It could be that, if the cache size is small | |
47 enough, a linear search might be faster; but I doubt it, since we need | |
48 `equal' comparisons, not `eq', and I expect that the optimal cache size | |
49 will be ~100. | |
50 | |
51 Written by jwz, 14 jun 93 | |
52 */ | |
53 | |
54 #include <config.h> | |
55 #include <X11/Xlib.h> | |
56 #include "xgccache.h" | |
57 | |
58 | |
59 #define GC_CACHE_SIZE 100 | |
60 | |
61 #define GCCACHE_HASH | |
62 | |
63 | |
64 #ifdef GCCACHE_HASH | |
65 #include "lisp.h" | |
66 #include "hash.h" | |
67 #endif | |
68 | |
69 struct gcv_and_mask { | |
70 XGCValues gcv; | |
71 unsigned long mask; | |
72 }; | |
73 | |
74 struct gc_cache_cell { | |
75 GC gc; | |
76 struct gcv_and_mask gcvm; | |
77 struct gc_cache_cell *prev, *next; | |
78 }; | |
79 | |
80 struct gc_cache { | |
81 Display *dpy; /* used only as arg to XCreateGC/XFreeGC */ | |
82 Window window; /* used only as arg to XCreateGC */ | |
83 int size; | |
84 struct gc_cache_cell *head; | |
85 struct gc_cache_cell *tail; | |
86 #ifdef GCCACHE_HASH | |
87 struct hash_table *table; | |
88 #endif | |
89 | |
90 int create_count; | |
91 int delete_count; | |
92 }; | |
93 | |
94 #ifdef GCCACHE_HASH | |
95 static unsigned long | |
442 | 96 gc_cache_hash (const void *arg) |
428 | 97 { |
442 | 98 const struct gcv_and_mask *gcvm = (const struct gcv_and_mask *) arg; |
428 | 99 unsigned long *longs = (unsigned long *) &gcvm->gcv; |
100 unsigned long hash = gcvm->mask; | |
101 int i; | |
102 /* This could look at the mask and only use the used slots in the | |
103 hash code. That would win in that we wouldn't have to initialize | |
104 every slot of the gcv when calling gc_cache_lookup. But we need | |
105 the hash function to be as fast as possible; some timings should | |
106 be done. */ | |
647 | 107 for (i = 0; i < (int) (sizeof (XGCValues) / sizeof (unsigned long)); i++) |
428 | 108 hash = (hash<<1) ^ *longs++; |
109 return hash; | |
110 } | |
111 | |
112 #endif /* GCCACHE_HASH */ | |
113 | |
114 static int | |
442 | 115 gc_cache_eql (const void *arg1, const void *arg2) |
428 | 116 { |
117 /* See comment in gc_cache_hash */ | |
118 return !memcmp (arg1, arg2, sizeof (struct gcv_and_mask)); | |
119 } | |
120 | |
121 struct gc_cache * | |
122 make_gc_cache (Display *dpy, Window window) | |
123 { | |
124 struct gc_cache *cache = xnew (struct gc_cache); | |
125 cache->dpy = dpy; | |
126 cache->window = window; | |
127 cache->size = 0; | |
128 cache->head = cache->tail = 0; | |
129 cache->create_count = cache->delete_count = 0; | |
130 #ifdef GCCACHE_HASH | |
131 cache->table = | |
132 make_general_hash_table (GC_CACHE_SIZE, gc_cache_hash, gc_cache_eql); | |
133 #endif | |
134 return cache; | |
135 } | |
136 | |
137 void | |
138 free_gc_cache (struct gc_cache *cache) | |
139 { | |
140 struct gc_cache_cell *rest, *next; | |
141 rest = cache->head; | |
142 while (rest) | |
143 { | |
144 XFreeGC (cache->dpy, rest->gc); | |
145 next = rest->next; | |
1726 | 146 xfree (rest, struct gc_cache_cell *); |
428 | 147 rest = next; |
148 } | |
149 #ifdef GCCACHE_HASH | |
150 free_hash_table (cache->table); | |
151 #endif | |
1726 | 152 xfree (cache, struct gc_cache *); |
428 | 153 } |
154 | |
155 GC | |
156 gc_cache_lookup (struct gc_cache *cache, XGCValues *gcv, unsigned long mask) | |
157 { | |
158 struct gc_cache_cell *cell, *next, *prev; | |
159 struct gcv_and_mask gcvm; | |
160 | |
161 if ((!!cache->head) != (!!cache->tail)) abort (); | |
162 if (cache->head && (cache->head->prev || cache->tail->next)) abort (); | |
163 | |
164 gcvm.mask = mask; | |
165 gcvm.gcv = *gcv; /* this copies... */ | |
166 | |
167 #ifdef GCCACHE_HASH | |
168 | |
2367 | 169 /* The intermediate cast fools gcc into not outputting strict-aliasing |
170 complaints */ | |
171 if (gethash (&gcvm, cache->table, (const void **) (void *) &cell)) | |
428 | 172 |
173 #else /* !GCCACHE_HASH */ | |
174 | |
175 cell = cache->tail; /* start at the end (most recently used) */ | |
176 while (cell) | |
177 { | |
178 if (gc_cache_eql (&gcvm, &cell->gcvm)) | |
179 break; | |
180 else | |
181 cell = cell->prev; | |
182 } | |
183 | |
184 /* #### This whole file needs some serious overhauling. */ | |
185 if (!(mask | GCTile) && cell->gc->values.tile) | |
186 cell = 0; | |
187 else if (!(mask | GCStipple) && cell->gc->values.stipple) | |
188 cell = 0; | |
189 | |
190 if (cell) | |
191 | |
192 #endif /* !GCCACHE_HASH */ | |
193 | |
194 { | |
195 /* Found a cell. Move this cell to the end of the list, so that it | |
196 will be less likely to be collected than a cell that was accessed | |
197 less recently. | |
198 */ | |
199 if (cell == cache->tail) | |
200 return cell->gc; | |
201 | |
202 next = cell->next; | |
203 prev = cell->prev; | |
204 if (prev) prev->next = next; | |
205 if (next) next->prev = prev; | |
206 if (cache->head == cell) cache->head = next; | |
207 cell->next = 0; | |
208 cell->prev = cache->tail; | |
209 cache->tail->next = cell; | |
210 cache->tail = cell; | |
211 if (cache->head == cell) abort (); | |
212 if (cell->next) abort (); | |
213 if (cache->head->prev) abort (); | |
214 if (cache->tail->next) abort (); | |
215 return cell->gc; | |
216 } | |
217 | |
218 /* else, cache miss. */ | |
219 | |
220 if (cache->size == GC_CACHE_SIZE) | |
221 /* Reuse the first cell on the list (least-recently-used). | |
222 Remove it from the list, and unhash it from the table. | |
223 */ | |
224 { | |
225 cell = cache->head; | |
226 cache->head = cell->next; | |
227 cache->head->prev = 0; | |
228 if (cache->tail == cell) cache->tail = 0; /* only one */ | |
229 XFreeGC (cache->dpy, cell->gc); | |
230 cache->delete_count++; | |
231 #ifdef GCCACHE_HASH | |
232 remhash (&cell->gcvm, cache->table); | |
233 #endif | |
234 } | |
235 else if (cache->size > GC_CACHE_SIZE) | |
236 abort (); | |
237 else | |
238 { | |
239 /* Allocate a new cell (don't put it in the list or table yet). */ | |
240 cell = xnew (struct gc_cache_cell); | |
241 cache->size++; | |
242 } | |
243 | |
244 /* Now we've got a cell (new or reused). Fill it in. */ | |
245 memcpy (&cell->gcvm.gcv, gcv, sizeof (XGCValues)); | |
246 cell->gcvm.mask = mask; | |
247 | |
248 /* Put the cell on the end of the list. */ | |
249 cell->next = 0; | |
250 cell->prev = cache->tail; | |
251 if (cache->tail) cache->tail->next = cell; | |
252 cache->tail = cell; | |
253 if (! cache->head) cache->head = cell; | |
254 | |
255 cache->create_count++; | |
256 #ifdef GCCACHE_HASH | |
257 /* Hash it in the table */ | |
258 puthash (&cell->gcvm, cell, cache->table); | |
259 #endif | |
260 | |
261 /* Now make and return the GC. */ | |
262 cell->gc = XCreateGC (cache->dpy, cache->window, mask, gcv); | |
263 | |
264 /* debug */ | |
265 assert (cell->gc == gc_cache_lookup (cache, gcv, mask)); | |
266 | |
267 return cell->gc; | |
268 } | |
269 | |
270 | |
271 #ifdef DEBUG_XEMACS | |
272 | |
273 void describe_gc_cache (struct gc_cache *cache); | |
274 void | |
275 describe_gc_cache (struct gc_cache *cache) | |
276 { | |
277 int count = 0; | |
278 struct gc_cache_cell *cell = cache->head; | |
279 stderr_out ("\nsize: %d", cache->size); | |
280 stderr_out ("\ncreated: %d", cache->create_count); | |
281 stderr_out ("\ndeleted: %d", cache->delete_count); | |
282 while (cell) | |
283 { | |
284 struct gc_cache_cell *cell2; | |
285 int i = 0; | |
286 stderr_out ("\n%d:\t0x%lx GC: 0x%08lx hash: 0x%08lx\n", | |
287 count, (long) cell, (long) cell->gc, gc_cache_hash (&cell->gcvm)); | |
288 for (cell2 = cache->head; cell2; cell2 = cell2->next, i++) | |
289 if (count != i && | |
290 gc_cache_hash (&cell->gcvm) == gc_cache_hash (&cell2->gcvm)) | |
291 stderr_out ("\tHASH COLLISION with cell %d\n", i); | |
292 stderr_out ("\tmask: %8lx\n", cell->gcvm.mask); | |
293 | |
294 #define FROB(field) do { \ | |
295 if ((int)cell->gcvm.gcv.field != (~0)) \ | |
296 stderr_out ("\t%-12s%8x\n", #field ":", (int)cell->gcvm.gcv.field); \ | |
297 } while (0) | |
298 FROB (function); | |
299 FROB (plane_mask); | |
300 FROB (foreground); | |
301 FROB (background); | |
302 FROB (line_width); | |
303 FROB (line_style); | |
304 FROB (cap_style); | |
305 FROB (join_style); | |
306 FROB (fill_style); | |
307 FROB (fill_rule); | |
308 FROB (arc_mode); | |
309 FROB (tile); | |
310 FROB (stipple); | |
311 FROB (ts_x_origin); | |
312 FROB (ts_y_origin); | |
313 FROB (font); | |
314 FROB (subwindow_mode); | |
315 FROB (graphics_exposures); | |
316 FROB (clip_x_origin); | |
317 FROB (clip_y_origin); | |
318 FROB (clip_mask); | |
319 FROB (dash_offset); | |
320 #undef FROB | |
321 | |
322 count++; | |
323 if (cell->next && cell == cache->tail) | |
324 stderr_out ("\nERROR! tail is here!\n\n"); | |
325 else if (!cell->next && cell != cache->tail) | |
326 stderr_out ("\nERROR! tail is not at the end\n\n"); | |
327 cell = cell->next; | |
328 } | |
329 if (count != cache->size) | |
330 stderr_out ("\nERROR! count should be %d\n\n", cache->size); | |
331 } | |
332 | |
333 #endif /* DEBUG_XEMACS */ |