annotate src/xgccache.c @ 617:af57a77cbc92

[xemacs-hg @ 2001-06-18 07:09:50 by ben] --------------------------------------------------------------- DOCUMENTATION FIXES: --------------------------------------------------------------- eval.c: Correct documentation. elhash.c: Doc correction. --------------------------------------------------------------- LISP OBJECT CLEANUP: --------------------------------------------------------------- bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them) -- an expression to encapsulate a pointer into a Lisp object, rather than the inconvenient XSET*. "wrap" was chosen because "make" as in make_int(), make_char() is not appropriate. (It implies allocation. The issue does not exist for ints and chars because they are not allocated.) Full error checking has been added to these expressions. When used without error checking, non-union build, use of these expressions will incur no loss of efficiency. (In fact, XSET* is now defined in terms of wrap_* in a non-union build.) In a union build, you will also get no loss of efficiency provided that you have a decent optimizing compiler, and a compiler that either understands inlines or automatically inlines those particular functions. (And since people don't normally do their production builds on union, it doesn't matter.) Update the sample Lisp object definition in lrecord.h accordingly. dumper.c: Fix places in dumper that referenced wrap_object to reference its new name, wrap_pointer_1. buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h, just like for the other structures. -- Extract out the remaining (not copied into the window config) Lisp objects in `struct window' into winslots.h; use different macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them. -- Eliminate the `dead' flag of `struct frame', since it duplicates information already available in `framemeths', and fix FRAME_LIVE_P accordingly. (Devices and consoles already work this way.) -- In *slots.h, switch to system where MARKED_SLOT is automatically undef'd at the end of the file. (Follows what winslots.h already does.) -- Update the comments at the beginning of *slots.h to be accurate. -- When making any of the above objects dead, zero it out entirely and reset all Lisp object slots to Qnil. (We were already doing this somewhat, but not consistently.) This (1) Eliminates the possibility of extra objects hanging around that ought to be GC'd, (2) Causes an immediate crash if anyone tries to access a structure in one of these objects, (3) Ensures consistent behavior wrt dead objects. dialog-msw.c: Use internal_object_printer, since this object should not escape. --------------------------------------------------------------- FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR): --------------------------------------------------------------- eval.c: Fix up some comments about the FSF implementation. Fix two nasty bugs: (1) condition_case_unwind frees the conses sitting in the catch->tag slot too quickly, resulting in a crash that I hit. (2) catches need to be unwound one at a time when calling unwind-protect code, rather than all at once at the end; otherwise, incorrect behavior can result. (A comment shows exactly how.) backtrace.h: Improve comment about FSF differences in the handler stack. --------------------------------------------------------------- FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL UNDER MSWINDOWS: --------------------------------------------------------------- Basic idea: My crash is due either to a dead, non-marked, GC-collected frame inside of a window mirror, or a prematurely freed window mirror. We need to mark the Lisp objects inside of window mirrors. Tracking the lifespan of window mirrors and scrollbar instances is extremely hard, and there may well be lurking bugs where such objects are freed too soon. The only safe way to fix these problems (and it fixes both problems at once) is to make both of these structures Lisp objects. lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window mirrors in them. inline.c needs to know about scrollbar.h now. Record the new type in lrecord.h. Fix up scrollbar-*.c appropriately. Create a hash table in scrollbar-msw.c so that the scrollbar instances stored in scrollbar HWND's are properly GC-protected. Create complex_vars_of_scrollbar_mswindows() to create the hash table at startup, and call it from emacs.c. Don't store the scrollbar instance as a property of the GTK scrollbar, as it's not used and if we did this, we'd have to separately GC-protect it in a hash table, like in MS Windows. lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window mirrors actual Lisp objects. Tell lrecord.h about them. Change the window mirror member of struct frame from a pointer to a Lisp object, and add XWINDOW_MIRROR in appropriate places. Mark the scrollbar instances in the window mirror. redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark frame-specific structures in mark_frame. NOTE: I also deleted an extremely questionable call to update_frame_window_mirrors(). It was extremely questionable before, and now totally impossible, since it will create Lisp objects during redisplay. frame.c: Mark the scrollbar instances, which are now Lisp objects. Call mark_gutter() here, not in mark_redisplay(). gutter.c: Update comments about correct marking. --------------------------------------------------------------- ISSUES BROUGHT UP BY MARTIN: --------------------------------------------------------------- buffer.h: Put back these macros the way Steve T and I think they ought to be. I already explained in a previous changelog entry why I think these macros should be the way I'd defined them. Once again: We fix these macros so they don't care about the type of their lvalues. The non-C-string equivalents of these already function in the same way, and it's correct because it should be OK to pass in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *, etc. The whole reason for these different types is to work around errors caused by signed-vs-unsigned non-matching types. Any possible error that might be caught in a DFC macro would also be caught wherever the argument is used elsewhere. So creating multiple macro versions would add no useful error-checking and just further complicate an already complicated area. As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing clean and probably never will be. Unless the board agrees to change XEmacs in this way (and we really don't want to go down that road), this is not a bug. sound.h: Undo Martin's type change. signal.c: Fix problem identified by Martin with Linux and g++ due to non-standard declaration of setitimer(). systime.h: Update the docs for "qxe_" to point out why making the encapsulation explicit is always the right way to go. (setitimer() itself serves as an example.) For 21.4: update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get recompiled.
author ben
date Mon, 18 Jun 2001 07:10:32 +0000
parents abe6d1db359e
children b39c14581166
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 /* Efficient caching of X GCs (graphics contexts).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2 Copyright (C) 1993 Free Software Foundation, Inc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 Free Software Foundation; either version 2, or (at your option) any
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 along with XEmacs; see the file COPYING. If not, write to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 Boston, MA 02111-1307, USA. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 /* Synched up with: Not in FSF. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 /* Emacs uses a lot of different display attributes; for example, assume
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 that only four fonts are in use (normal, bold, italic, and bold-italic).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 Then assume that one stipple or background is used for text selections,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 and another is used for highlighting mousable regions. That makes 16
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 GCs already. Add in the fact that another GC may be needed to display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 the text cursor in any of those regions, and you've got 32. Add in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 more fonts, and it keeps increasing exponentially.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 We used to keep these GCs in a cache of merged (fully qualified) faces.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 However, a lot of other code in xterm.c used XChangeGC of existing GCs,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 which is kind of slow and kind of random. Also, managing the face cache
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 was tricky because it was hard to know when a face was no longer visible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 on the frame -- we had to mark all frames as garbaged whenever a face
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 was changed, which caused an unpleasant amount of flicker (since faces are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 created/destroyed (= changed) whenever a frame is created/destroyed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 So this code maintains a cache at the GC level instead of at the face
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 level. There is an upper limit on the size of the cache, after which we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42 will stop creating GCs and start reusing them (reusing the least-recently-
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 used ones first). So if faces get changed, their GCs will eventually be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 recycled. Also more sharing of GCs is possible.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 This code uses hash tables. It could be that, if the cache size is small
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 enough, a linear search might be faster; but I doubt it, since we need
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 `equal' comparisons, not `eq', and I expect that the optimal cache size
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 will be ~100.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 Written by jwz, 14 jun 93
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 #include <config.h>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 #include <X11/Xlib.h>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 #include "xgccache.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 #define GC_CACHE_SIZE 100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 #define GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 #include "lisp.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 #include "hash.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 struct gcv_and_mask {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 XGCValues gcv;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 unsigned long mask;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 };
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 struct gc_cache_cell {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 GC gc;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 struct gcv_and_mask gcvm;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 struct gc_cache_cell *prev, *next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 };
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 struct gc_cache {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 Display *dpy; /* used only as arg to XCreateGC/XFreeGC */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 Window window; /* used only as arg to XCreateGC */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 int size;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84 struct gc_cache_cell *head;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
85 struct gc_cache_cell *tail;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 struct hash_table *table;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 int create_count;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91 int delete_count;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 };
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 static unsigned long
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
96 gc_cache_hash (const void *arg)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
98 const struct gcv_and_mask *gcvm = (const struct gcv_and_mask *) arg;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 unsigned long *longs = (unsigned long *) &gcvm->gcv;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 unsigned long hash = gcvm->mask;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 int i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102 /* This could look at the mask and only use the used slots in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 hash code. That would win in that we wouldn't have to initialize
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104 every slot of the gcv when calling gc_cache_lookup. But we need
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105 the hash function to be as fast as possible; some timings should
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106 be done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107 for (i = 0; i < (sizeof (XGCValues) / sizeof (unsigned long)); i++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108 hash = (hash<<1) ^ *longs++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 return hash;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 #endif /* GCCACHE_HASH */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114 static int
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
115 gc_cache_eql (const void *arg1, const void *arg2)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
116 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
117 /* See comment in gc_cache_hash */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
118 return !memcmp (arg1, arg2, sizeof (struct gcv_and_mask));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
119 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121 struct gc_cache *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 make_gc_cache (Display *dpy, Window window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
124 struct gc_cache *cache = xnew (struct gc_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125 cache->dpy = dpy;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126 cache->window = window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127 cache->size = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 cache->head = cache->tail = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129 cache->create_count = cache->delete_count = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
130 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
131 cache->table =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
132 make_general_hash_table (GC_CACHE_SIZE, gc_cache_hash, gc_cache_eql);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
133 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
134 return cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
135 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
136
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
137 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
138 free_gc_cache (struct gc_cache *cache)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
140 struct gc_cache_cell *rest, *next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
141 rest = cache->head;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
142 while (rest)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
143 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
144 XFreeGC (cache->dpy, rest->gc);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
145 next = rest->next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
146 xfree (rest);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
147 rest = next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
148 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
149 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
150 free_hash_table (cache->table);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
151 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
152 xfree (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
153 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
154
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
155 GC
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
156 gc_cache_lookup (struct gc_cache *cache, XGCValues *gcv, unsigned long mask)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
157 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
158 struct gc_cache_cell *cell, *next, *prev;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
159 struct gcv_and_mask gcvm;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161 if ((!!cache->head) != (!!cache->tail)) abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
162 if (cache->head && (cache->head->prev || cache->tail->next)) abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
163
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
164 gcvm.mask = mask;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
165 gcvm.gcv = *gcv; /* this copies... */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
166
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
167 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
168
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
169 if (gethash (&gcvm, cache->table, (const void **) &cell))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
170
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
171 #else /* !GCCACHE_HASH */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
172
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
173 cell = cache->tail; /* start at the end (most recently used) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
174 while (cell)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
175 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176 if (gc_cache_eql (&gcvm, &cell->gcvm))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
177 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
178 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
179 cell = cell->prev;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
180 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
181
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
182 /* #### This whole file needs some serious overhauling. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
183 if (!(mask | GCTile) && cell->gc->values.tile)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
184 cell = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
185 else if (!(mask | GCStipple) && cell->gc->values.stipple)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
186 cell = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
188 if (cell)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
189
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
190 #endif /* !GCCACHE_HASH */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
191
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
192 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
193 /* Found a cell. Move this cell to the end of the list, so that it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
194 will be less likely to be collected than a cell that was accessed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
195 less recently.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
196 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
197 if (cell == cache->tail)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
198 return cell->gc;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
199
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200 next = cell->next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
201 prev = cell->prev;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
202 if (prev) prev->next = next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 if (next) next->prev = prev;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 if (cache->head == cell) cache->head = next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
205 cell->next = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
206 cell->prev = cache->tail;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
207 cache->tail->next = cell;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
208 cache->tail = cell;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
209 if (cache->head == cell) abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
210 if (cell->next) abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
211 if (cache->head->prev) abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
212 if (cache->tail->next) abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
213 return cell->gc;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
214 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
215
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
216 /* else, cache miss. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
217
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218 if (cache->size == GC_CACHE_SIZE)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
219 /* Reuse the first cell on the list (least-recently-used).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
220 Remove it from the list, and unhash it from the table.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
221 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
222 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
223 cell = cache->head;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
224 cache->head = cell->next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
225 cache->head->prev = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
226 if (cache->tail == cell) cache->tail = 0; /* only one */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
227 XFreeGC (cache->dpy, cell->gc);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
228 cache->delete_count++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
229 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
230 remhash (&cell->gcvm, cache->table);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
231 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
232 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
233 else if (cache->size > GC_CACHE_SIZE)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
234 abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
235 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
236 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
237 /* Allocate a new cell (don't put it in the list or table yet). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 cell = xnew (struct gc_cache_cell);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239 cache->size++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
240 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
241
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
242 /* Now we've got a cell (new or reused). Fill it in. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
243 memcpy (&cell->gcvm.gcv, gcv, sizeof (XGCValues));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
244 cell->gcvm.mask = mask;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
245
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
246 /* Put the cell on the end of the list. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
247 cell->next = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
248 cell->prev = cache->tail;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
249 if (cache->tail) cache->tail->next = cell;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
250 cache->tail = cell;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
251 if (! cache->head) cache->head = cell;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
252
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
253 cache->create_count++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
254 #ifdef GCCACHE_HASH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
255 /* Hash it in the table */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
256 puthash (&cell->gcvm, cell, cache->table);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
257 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
258
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
259 /* Now make and return the GC. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
260 cell->gc = XCreateGC (cache->dpy, cache->window, mask, gcv);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
261
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
262 /* debug */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
263 assert (cell->gc == gc_cache_lookup (cache, gcv, mask));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
264
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
265 return cell->gc;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
266 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
267
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
268
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
269 #ifdef DEBUG_XEMACS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
270
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
271 void describe_gc_cache (struct gc_cache *cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
272 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
273 describe_gc_cache (struct gc_cache *cache)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
274 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 int count = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 struct gc_cache_cell *cell = cache->head;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277 stderr_out ("\nsize: %d", cache->size);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
278 stderr_out ("\ncreated: %d", cache->create_count);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
279 stderr_out ("\ndeleted: %d", cache->delete_count);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
280 while (cell)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
281 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
282 struct gc_cache_cell *cell2;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
283 int i = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
284 stderr_out ("\n%d:\t0x%lx GC: 0x%08lx hash: 0x%08lx\n",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
285 count, (long) cell, (long) cell->gc, gc_cache_hash (&cell->gcvm));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
286 for (cell2 = cache->head; cell2; cell2 = cell2->next, i++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
287 if (count != i &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
288 gc_cache_hash (&cell->gcvm) == gc_cache_hash (&cell2->gcvm))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
289 stderr_out ("\tHASH COLLISION with cell %d\n", i);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
290 stderr_out ("\tmask: %8lx\n", cell->gcvm.mask);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
291
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
292 #define FROB(field) do { \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
293 if ((int)cell->gcvm.gcv.field != (~0)) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
294 stderr_out ("\t%-12s%8x\n", #field ":", (int)cell->gcvm.gcv.field); \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
295 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
296 FROB (function);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
297 FROB (plane_mask);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
298 FROB (foreground);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
299 FROB (background);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
300 FROB (line_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
301 FROB (line_style);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
302 FROB (cap_style);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
303 FROB (join_style);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
304 FROB (fill_style);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
305 FROB (fill_rule);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
306 FROB (arc_mode);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
307 FROB (tile);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
308 FROB (stipple);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
309 FROB (ts_x_origin);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
310 FROB (ts_y_origin);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
311 FROB (font);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
312 FROB (subwindow_mode);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
313 FROB (graphics_exposures);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
314 FROB (clip_x_origin);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
315 FROB (clip_y_origin);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
316 FROB (clip_mask);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
317 FROB (dash_offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
318 #undef FROB
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
319
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
320 count++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
321 if (cell->next && cell == cache->tail)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
322 stderr_out ("\nERROR! tail is here!\n\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
323 else if (!cell->next && cell != cache->tail)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
324 stderr_out ("\nERROR! tail is not at the end\n\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
325 cell = cell->next;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
326 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
327 if (count != cache->size)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
328 stderr_out ("\nERROR! count should be %d\n\n", cache->size);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
329 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
330
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 #endif /* DEBUG_XEMACS */