Commit a09764555c60459fe35d77e85ba13af62a80b0b0

David Turner 2001-12-06T16:45:26

oops, forgot to add new file and remove old one in src/cache

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
new file mode 100644
index 0000000..582d679
--- /dev/null
+++ b/src/cache/ftccache.c
@@ -0,0 +1,598 @@
+#include <ft2build.h>
+#include FT_CACHE_MANAGER_H
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
+
+#include "ftcerror.h"
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                   CACHE NODE DEFINITIONS                      *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  FT_EXPORT_DEF(void)
+  ftc_node_done( FTC_Node   node,
+                 FTC_Cache  cache )
+  {
+    FTC_Family       family;
+    FTC_FamilyEntry  entry;
+
+    entry  = cache->manager->families.entries + node->fam_index;
+    family = entry->family;
+
+    /* remove from parent set table - eventually destroy the set */
+    if ( --family->num_nodes <= 0 )
+      FT_LruList_Remove( cache->families, (FT_LruNode) family );
+  }
+
+
+
+
+ /* add a new node to the head of the manager's circular MRU list */
+  static void
+  ftc_node_mru_link( FTC_Node     node,
+                     FTC_Manager  manager )
+  {
+    FTC_Node  first = manager->nodes_list;
+
+
+    if ( first )
+    {
+      node->mru_prev = first->mru_prev;
+      node->mru_next = first;
+
+      first->mru_prev->mru_next = node;
+      first->mru_prev           = node;
+    }
+    else
+    {
+      node->mru_next = node;
+      node->mru_prev = node;
+    }
+
+    manager->nodes_list = node;
+    manager->num_nodes++;
+  }
+
+
+  /* remove a node from the manager's MRU list */
+  static void
+  ftc_node_mru_unlink( FTC_Node     node,
+                       FTC_Manager  manager )
+  {
+    FTC_Node  prev  = node->mru_prev;
+    FTC_Node  next  = node->mru_next;
+    FTC_Node  first = manager->nodes_list;
+
+
+    prev->mru_next = next;
+    next->mru_prev = prev;
+
+    if ( node->mru_next == first )
+    {
+      /* this is the last node in the list; update its head pointer */
+      if ( node == first )
+        manager->nodes_list = NULL;
+      else
+        first->mru_prev = prev;
+    }
+
+    node->mru_next = NULL;
+    node->mru_prev = NULL;
+    manager->num_nodes--;
+  }
+
+
+  /* move a node to the head of the manager's MRU list */
+  static void
+  ftc_node_mru_up( FTC_Node     node,
+                   FTC_Manager  manager )
+  {
+    FTC_Node  first = manager->nodes_list;
+
+
+    if ( node != first )
+    {
+      ftc_node_mru_unlink( node, manager );
+      ftc_node_mru_link( node, manager );
+    }
+  }
+
+
+  /* remove a node from its cache's hash table */
+  static void
+  ftc_node_hash_unlink( FTC_Node   node,
+                        FTC_Cache  cache )
+  {
+    FTC_Node  *pnode = cache->buckets + ( node->hash % cache->size );
+
+
+    for (;;)
+    {
+      if ( *pnode == NULL )
+      {
+        FT_ERROR(( "FreeType.cache.hash_unlink: unknown node!\n" ));
+        return;
+      }
+
+      if ( *pnode == node )
+      {
+        *pnode     = node->link;
+        node->link = NULL;
+
+        cache->nodes--;
+        return;
+      }
+
+      pnode = &(*pnode)->link;
+    }
+  }
+
+
+  /* add a node to the "top" of its cache's hash table */
+  static void
+  ftc_node_hash_link( FTC_Node   node,
+                      FTC_Cache  cache )
+  {
+    FTC_Node  *pnode = cache->buckets + ( node->hash % cache->size );
+
+
+    node->link = *pnode;
+    *pnode     = node;
+
+    cache->nodes++;
+  }
+
+
+
+ /* remove a node from the cache manager */
+  FT_LOCAL_DEF void
+  ftc_node_destroy( FTC_Node     node,
+                    FTC_Manager  manager )
+  {
+    FT_Memory        memory  = manager->library->memory;
+    FTC_Cache        cache;
+    FTC_FamilyEntry  entry;
+    FTC_Cache_Class  clazz;
+
+
+#ifdef FT_DEBUG_ERROR
+    /* find node's cache */
+    if ( node->fam_index >= manager->families.count )
+    {
+      FT_ERROR(( "FreeType.cache.node_destroy: invalid node handle\n" ));
+      return;
+    }
+#endif
+
+    entry = manager->families.entries + node->fam_index;
+    cache = entry->cache;
+
+#ifdef FT_DEBUG_ERROR
+    if ( cache == NULL )
+    {
+      FT_ERROR(( "FreeType.cache.node_destroy: invalid node handle\n" ));
+      return;
+    }
+#endif
+
+    clazz = cache->clazz;
+
+    manager->cur_weight -= clazz->node_weight( node, cache );
+
+    /* remove node from mru list */
+    ftc_node_mru_unlink( node, manager );
+
+    /* remove node from cache's hash table */
+    ftc_node_hash_unlink( node, cache );
+
+    /* now finalize it */
+    if ( clazz->node_done )
+      clazz->node_done( node, cache );
+
+    FREE( node );
+
+    /* check, just in case of general corruption :-) */
+    if ( manager->num_nodes <= 0 )
+      FT_ERROR(( "FTC_Manager_Compress: Invalid cache node count! = %d\n",
+                  manager->num_nodes ));
+  }
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                   CACHE FAMILY DEFINITIONS                    *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  FT_EXPORT_DEF(FT_Error)
+  ftc_family_init( FTC_Family  family,
+                   FTC_Query   query,
+                   FTC_Cache   cache )
+  {
+    FT_Error         error;
+    FTC_Manager      manager = cache->manager;
+    FT_Memory        memory  = manager->library->memory;
+    FTC_FamilyEntry  entry;
+
+    family->cache     = cache;
+    family->num_nodes = 0;
+
+    /* now add to manager's family table */
+    error = ftc_family_table_alloc( &manager->families, memory, &entry );
+    if (!error)
+    {
+      entry->cache      = cache;
+      entry->family     = family;
+      family->fam_index = entry->index;
+
+      query->family = family;   /* save family in query */
+    }
+    return error;
+  }
+
+
+
+  FT_EXPORT_DEF(void)
+  ftc_family_done( FTC_Family  family )
+  {
+    FTC_Manager  manager = family->cache->manager;
+
+    /* remove from manager's family table */
+    ftc_family_table_free( &manager->families, family->fam_index );
+  }
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                    ABSTRACT CACHE CLASS                       *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+#define FTC_PRIMES_MIN  7
+#define FTC_PRIMES_MAX  13845163
+
+  static const FT_UInt  ftc_primes[] =
+  {
+    7,
+    11,
+    19,
+    37,
+    73,
+    109,
+    163,
+    251,
+    367,
+    557,
+    823,
+    1237,
+    1861,
+    2777,
+    4177,
+    6247,
+    9371,
+    14057,
+    21089,
+    31627,
+    47431,
+    71143,
+    106721,
+    160073,
+    240101,
+    360163,
+    540217,
+    810343,
+    1215497,
+    1823231,
+    2734867,
+    4102283,
+    6153409,
+    9230113,
+    13845163,
+  };
+
+
+  static FT_UFast
+  ftc_prime_closest( FT_UFast  num )
+  {
+    FT_UInt  i;
+
+
+    for ( i = 0; i < sizeof ( ftc_primes ) / sizeof ( ftc_primes[0] ); i++ )
+      if ( ftc_primes[i] > num )
+        return ftc_primes[i];
+
+    return FTC_PRIMES_MAX;
+  }
+
+
+#define FTC_CACHE_RESIZE_TEST( c )       \
+          ( (c)->nodes*3 < (c)->size  || \
+            (c)->size*3  < (c)->nodes )
+
+
+
+  static void
+  ftc_cache_resize( FTC_Cache  cache )
+  {
+    FT_UFast  new_size;
+
+
+    new_size = ftc_prime_closest( cache->nodes );
+    if ( new_size != cache->size )
+    {
+      FT_Memory  memory = cache->memory;
+      FT_Error   error;
+      FTC_Node*  new_buckets ;
+      FT_ULong   i;
+
+      /* no need to report an error, we'll simply keep using the same */
+      /* buckets number / size                                        */
+      if ( ALLOC_ARRAY( new_buckets, new_size, FTC_Node ) )
+        return;
+
+      for ( i = 0; i < cache->size; i++ )
+      {
+        FTC_Node   node, next, *pnode;
+        FT_UFast   hash;
+
+
+        node = cache->buckets[i];
+        while ( node )
+        {
+          next  = node->link;
+          hash  = node->hash % new_size;
+          pnode = new_buckets + hash;
+
+          node->link = pnode[0];
+          pnode[0]   = node;
+
+          node = next;
+        }
+      }
+
+      if ( cache->buckets )
+        FREE( cache->buckets );
+
+      cache->buckets = new_buckets;
+      cache->size    = new_size;
+    }
+  }
+
+
+  FT_EXPORT_DEF( FT_Error )
+  ftc_cache_init( FTC_Cache  cache )
+  {
+    FT_Memory        memory = cache->memory;
+    FTC_Cache_Class  clazz  = cache->clazz;
+    FT_Error         error;
+
+
+    cache->nodes = 0;
+    cache->size  = FTC_PRIMES_MIN;
+
+    if ( ALLOC_ARRAY( cache->buckets, cache->size, FTC_Node ) )
+      goto Exit;
+
+    /* now, initialize the lru list of families for this cache */
+    if ( clazz->family_size > 0 )
+    {
+      FT_LruList_ClassRec*  lru_class = &cache->family_class;
+
+      lru_class->list_size = sizeof( FT_LruListRec );
+      lru_class->list_init = NULL;
+      lru_class->list_done = NULL;
+
+      lru_class->node_size    = clazz->family_size;
+      lru_class->node_init    = (FT_LruNode_InitFunc)    clazz->family_init;
+      lru_class->node_done    = (FT_LruNode_DoneFunc)    clazz->family_done;
+      lru_class->node_flush   = (FT_LruNode_FlushFunc)   NULL;
+      lru_class->node_compare = (FT_LruNode_CompareFunc) clazz->family_compare;
+
+      error = FT_LruList_New( (FT_LruList_Class) lru_class,
+                              0,  /* max items == 0 => unbounded list */
+                              cache,
+                              memory,
+                              &cache->families );
+      if (error)
+        FREE( cache->buckets );
+    }
+
+  Exit:
+    return error;
+  }
+
+
+  FT_EXPORT_DEF(void)
+  ftc_cache_clear( FTC_Cache  cache )
+  {
+    if ( cache )
+    {
+      FT_Memory        memory  = cache->memory;
+      FTC_Cache_Class  clazz   = cache->clazz;
+      FTC_Manager      manager = cache->manager;
+      FT_UFast         i;
+
+
+      for ( i = 0; i < cache->size; i++ )
+      {
+        FTC_Node  *pnode = cache->buckets + i, next, node = *pnode;
+
+        while ( node )
+        {
+          next        = node->link;
+          node->link  = NULL;
+
+          /* remove node from mru list */
+          ftc_node_mru_unlink( node, manager );
+
+          /* now finalize it */
+          manager->cur_weight -= clazz->node_weight( node, cache );
+
+          if ( clazz->node_done )
+            clazz->node_done( node, cache );
+
+          FREE( node );
+          node = next;
+        }
+        cache->buckets[i] = NULL;
+      }
+
+      cache->nodes = 0;
+
+      /* destroy the families */
+      if ( cache->families )
+        FT_LruList_Reset( cache->families );
+    }
+  }
+
+  FT_EXPORT_DEF( void )
+  ftc_cache_done( FTC_Cache  cache )
+  {
+    if ( cache )
+    {
+      FT_Memory  memory = cache->memory;
+
+      ftc_cache_clear( cache );
+
+      FREE( cache->buckets );
+      cache->size = 0;
+
+      if ( cache->families )
+      {
+        FT_LruList_Destroy( cache->families );
+        cache->families = NULL;
+      }
+    }
+  }
+
+
+
+  /* Look up a node in "top" of its cache's hash table. */
+  /* If not found, create a new node.                   */
+  /*                                                    */
+  FT_EXPORT_DEF(FT_Error)
+  ftc_cache_lookup( FTC_Cache   cache,
+                    FTC_Query   query,
+                    FTC_Node   *anode )
+  {
+    FT_Error    error;
+    FT_LruNode  lru;
+
+
+    /* some argument checks are delayed to ftc_glyph_cache_lookup */
+    if ( !cache || !query || !anode )
+      return FTC_Err_Invalid_Argument;
+
+    *anode = NULL;
+
+    query->hash   = 0;
+    query->family = NULL;
+
+    error = FT_LruList_Lookup( cache->families, query, &lru );
+    if (!error)
+    {
+      FTC_Family  family = (FTC_Family) lru;
+      FT_UFast    hash    = query->hash;
+      FTC_Node*   bucket  = cache->buckets + (hash % cache->size);
+
+       if ( query->family     != family                        ||
+            family->fam_index >= cache->manager->families.size )
+       {
+         FT_ERROR(( "%s: invalid query (bad 'family' field)\n",
+                    "FreeType.cache.lookup" ));
+         return FT_Err_Invalid_Argument;
+       }
+
+      if ( *bucket )
+      {
+        FTC_Node*             pnode   = bucket;
+        FTC_Node_CompareFunc  compare = cache->clazz->node_compare;
+
+        for ( ;; )
+        {
+          FTC_Node  node;
+
+          node = *pnode;
+          if ( node == NULL )
+            break;
+
+          if ( (FT_UInt)node->fam_index == family->fam_index &&
+                compare( node, query, cache ) )
+          {
+            /* move to head of bucket list */
+            if ( pnode != bucket )
+            {
+              *pnode     = node->link;
+              node->link = *bucket;
+              *bucket    = node;
+            }
+
+            /* move to head of MRU list */
+            if ( node != cache->manager->nodes_list )
+              ftc_node_mru_up( node, cache->manager );
+
+            *anode = node;
+            goto Exit;
+          }
+
+          pnode = &(*pnode)->link;
+        }
+      }
+
+      /* didn't find a node, create a new one */
+      {
+        FTC_Cache_Class  clazz   = cache->clazz;
+        FTC_Manager      manager = cache->manager;
+        FT_Memory        memory  = cache->memory;
+        FTC_Node         node;
+
+
+        if ( ALLOC( node, clazz->node_size ) )
+          goto Exit;
+
+        /* node initializer must set 'hash' field */
+        node->fam_index = (FT_UShort) family->fam_index;
+        node->ref_count = 0;
+
+        error = clazz->node_init( node, query, cache );
+        if ( error )
+        {
+          FREE( node );
+          goto Exit;
+        }
+
+        ftc_node_hash_link( node, cache );
+        ftc_node_mru_link( node, cache->manager );
+
+        cache->manager->cur_weight += clazz->node_weight( node, cache );
+
+        /* now try to compress the node pool when necessary */
+        if ( manager->cur_weight >= manager->max_weight )
+        {
+          node->ref_count++;
+          FTC_Manager_Compress( manager );
+          node->ref_count--;
+        }
+
+        /* try to resize the hash table when appropriate */
+        if ( FTC_CACHE_RESIZE_TEST(cache) )
+          ftc_cache_resize( cache );
+
+        *anode = node;
+      }
+    }
+
+  Exit:
+    return error;
+  }
+
+
diff --git a/src/cache/ftcchunk.c b/src/cache/ftcchunk.c
deleted file mode 100644
index 78040c3..0000000
--- a/src/cache/ftcchunk.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcchunk.c                                                             */
-/*                                                                         */
-/*    FreeType chunk cache cache (body).                                   */
-/*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_INTERNAL_CHUNK_H
-#include FT_LIST_H
-#include FT_ERRORS_H
-#include FT_INTERNAL_OBJECTS_H
-
-#include "ftcerror.h"
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                      GLYPH NODES                              *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#define FTC_CSET_CHUNK_INDEX( cset, gindex ) \
-          ( (gindex) / (cset)->item_count )
-                  
-#define FTC_CSET_START( cset, gindex )                                  \
-          ( FTC_CSET_CHUNK_INDEX( cset, gindex ) * (cset)->item_count )
-
-#define FTC_CSET_HASH( cset, gindex )                                         \
-          ( (FT_UFast)( ( (cset)->hash << 16 ) |                              \
-                        ( FTC_CSET_CHUNK_INDEX( cset, gindex ) & 0xFFFF ) ) )
-
-
-  /* create a new chunk node, setting its cache index and ref count */
-  FT_EXPORT_DEF( FT_Error )
-  ftc_chunk_node_init( FTC_ChunkNode  cnode,
-                       FTC_ChunkSet   cset,
-                       FT_UInt        gindex,
-                       FT_Bool        alloc )
-  {
-    FTC_ChunkCache  ccache = cset->ccache;
-    FT_Error        error  = 0;
-    FT_UInt         len;
-    FT_UInt         start  = FTC_CSET_START( cset, gindex );
-
-
-    cnode->cset       = cset;
-    cnode->node.hash  = FTC_CSET_HASH( cset, gindex );
-    cnode->item_start = start;
-
-    len = cset->item_total - start;
-    if ( len > cset->item_count )
-      len = cset->item_count;
-
-    cnode->item_count = len;
-    
-    if ( alloc )
-    {
-      FT_Memory  memory = ccache->cache.memory;
-     
-
-      error = MEM_Alloc( cnode->items, cset->item_size * cnode->item_count ); 
-    }
-
-    if ( !error )
-      cset->num_chunks++;
-      
-    return error;
-  }
-
-
-  FT_EXPORT_DEF( void )
-  ftc_chunk_node_done( FTC_ChunkNode  cnode )
-  {
-    FTC_ChunkSet  cset   = cnode->cset;
-    FT_Memory     memory = cset->ccache->cache.memory;
-
-
-    /* destroy the node */
-    FREE( cnode->items );
-    cnode->item_count = 0;
-    cnode->item_start = 0;
-
-    /* remove from parent set table -- eventually destroy the set */
-    if ( --cset->num_chunks <= 0 )
-      FT_LruList_Remove( cset->ccache->cset_lru, (FT_LruNode)cset );
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                      CHUNK SETS                               *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  FT_EXPORT_DEF( FT_Error )
-  ftc_chunk_set_init( FTC_ChunkSet    cset,
-                      FT_UInt         item_size,
-                      FT_UInt         item_count,
-                      FT_UInt         item_total,
-                      FTC_ChunkCache  cache )
-  {
-    cset->ccache     = cache;
-    cset->num_chunks = 0;
-
-    cset->item_total = item_total;
-    cset->item_size  = item_size;
-    cset->item_count = item_count;
-
-    return 0;
-  }
-
-
-  FT_EXPORT_DEF( void )
-  ftc_chunk_set_done( FTC_ChunkSet  cset )
-  {
-    /* nothing for now */
-    FT_UNUSED( cset );
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                      CHUNK CACHES                             *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  FT_EXPORT_DEF( void )
-  ftc_chunk_cache_done( FTC_ChunkCache  ccache )
-  {
-    ftc_cache_done( FTC_CACHE( ccache ) );
-
-    /* simply delete all remaining glyph sets */
-    if ( ccache->cset_lru )
-    {
-      FT_LruList_Destroy( ccache->cset_lru );
-      ccache->cset_lru = NULL;
-    }
-  }
-
-
-  FT_EXPORT_DEF( FT_Error )
-  ftc_chunk_cache_init( FTC_ChunkCache    ccache,
-                        FT_LruList_Class  cset_class )
-  {
-    FT_Error  error;
-
-
-    error = ftc_cache_init( FTC_CACHE( ccache ) );
-    if ( error )
-      goto Exit;
-
-    error = FT_LruList_New( cset_class, 0, ccache,
-                            ccache->cache.memory,
-                            &ccache->cset_lru );
-  Exit:
-    return error;
-  }
-
-
-  FT_EXPORT_DEF( FT_Error )
-  ftc_chunk_cache_lookup( FTC_ChunkCache   ccache,
-                          FTC_ChunkQuery   query,
-                          FTC_ChunkNode   *anode )
-  {
-    FT_LruNode    node;
-    FT_Error      error;
-    
-
-    error = FT_LruList_Lookup( ccache->cset_lru, query, &node );
-    if ( !error )
-    {
-      FTC_ChunkSet  cset = FTC_CHUNK_SET( node );
-      FT_UFast      hash = FTC_CSET_HASH( cset, query->gindex );
-
-      error = ftc_cache_lookup_node( FTC_CACHE( ccache ), hash, query,
-                                     FTC_NODE_P( anode ) );
-    }
-    return error;
-  }
-
-
-/* END */