2003-12-24 14:37:58 +01:00
|
|
|
/***************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* ftccache.c */
|
|
|
|
/* */
|
|
|
|
/* The FreeType internal cache interface (body). */
|
|
|
|
/* */
|
2006-01-27 15:16:16 +01:00
|
|
|
/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by */
|
2003-12-24 14:37:58 +01:00
|
|
|
/* 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_INTERNAL_MANAGER_H
|
|
|
|
#include FT_INTERNAL_OBJECTS_H
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
|
|
|
|
Fix callback functions in cache module.
* src/cache/ftccback.h: New file for callback declarations.
* src/cache/ftcbasic.c (ftc_basic_family_compare,
ftc_basic_family_init, ftc_basic_family_get_count,
ftc_basic_family_load_bitmap, ftc_basic_family_load_glyph,
ftc_basic_gnode_compare_faceid): Use FT_CALLBACK_DEF.
(ftc_basic_image_family_class, ftc_basic_image_cache_class,
ftc_basic_sbit_family_class, ftc_basic_sbit_cache_class):
Use FT_CALLBACK_TABLE_DEF and local wrapper functions.
* src/cache/ftccache.c: Include ftccback.h.
(ftc_cache_init, ftc_cache_done): New wrapper functions which use
FT_LOCAL_DEF.
* src/cache/ftccmap.c: Include ftccback.h.
(ftc_cmap_cache_class): Use local wrapper functions.
* src/cache/ftcglyph.c: Include ftccback.h.
(ftc_gnode_compare, ftc_gcache_init, ftc_gcache_done): New wrapper
functions which use FT_LOCAL_DEF.
* src/cache/ftcimage.c: Include ftccback.h.
(ftc_inode_free, ftc_inode_new, ftc_inode_weight): New wrapper
functions which use FT_LOCAL_DEF.
* src/cache/ftcmanag.c (ftc_size_list_class, ftc_face_list_class):
Use FT_CALLBACK_TABLE_DEF.
* src/cache;/ftcsbits.c: Include ftccback.h.
(ftc_snode_free, ftc_snode_new, ftc_snode_weight,
ftc_snode_compare): New wrapper functions which use FT_LOCAL_DEF.
* src/cache/rules.mk (CACHE_DRV_H): Add ftccback.h.
2004-02-17 19:41:58 +01:00
|
|
|
#include "ftccback.h"
|
2003-12-24 14:37:58 +01:00
|
|
|
#include "ftcerror.h"
|
|
|
|
|
|
|
|
|
|
|
|
#define FTC_HASH_MAX_LOAD 2
|
|
|
|
#define FTC_HASH_MIN_LOAD 1
|
|
|
|
#define FTC_HASH_SUB_LOAD ( FTC_HASH_MAX_LOAD - FTC_HASH_MIN_LOAD )
|
|
|
|
|
|
|
|
/* this one _must_ be a power of 2! */
|
|
|
|
#define FTC_HASH_INITIAL_SIZE 8
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** CACHE NODE DEFINITIONS *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/* 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 )
|
|
|
|
{
|
2003-12-26 08:26:08 +01:00
|
|
|
FTC_MruNode_Prepend( (FTC_MruNode*)&manager->nodes_list,
|
|
|
|
(FTC_MruNode)node );
|
2003-12-24 14:37:58 +01:00
|
|
|
manager->num_nodes++;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* remove a node from the manager's MRU list */
|
|
|
|
static void
|
|
|
|
ftc_node_mru_unlink( FTC_Node node,
|
|
|
|
FTC_Manager manager )
|
|
|
|
{
|
2003-12-26 08:26:08 +01:00
|
|
|
FTC_MruNode_Remove( (FTC_MruNode*)&manager->nodes_list,
|
|
|
|
(FTC_MruNode)node );
|
2003-12-24 14:37:58 +01:00
|
|
|
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 )
|
|
|
|
{
|
2003-12-26 08:26:08 +01:00
|
|
|
FTC_MruNode_Up( (FTC_MruNode*)&manager->nodes_list,
|
|
|
|
(FTC_MruNode)node );
|
2003-12-24 14:37:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
/* Note that this function cannot fail. If we cannot re-size the
|
|
|
|
* buckets array appropriately, we simply degrade the hash table's
|
|
|
|
* performance!
|
|
|
|
*/
|
2003-12-24 14:37:58 +01:00
|
|
|
static void
|
|
|
|
ftc_cache_resize( FTC_Cache cache )
|
|
|
|
{
|
|
|
|
for (;;)
|
|
|
|
{
|
2003-12-26 08:26:08 +01:00
|
|
|
FTC_Node node, *pnode;
|
|
|
|
FT_UInt p = cache->p;
|
|
|
|
FT_UInt mask = cache->mask;
|
|
|
|
FT_UInt count = mask + p + 1; /* number of buckets */
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
|
|
|
/* do we need to shrink the buckets array? */
|
2003-12-24 14:37:58 +01:00
|
|
|
if ( cache->slack < 0 )
|
|
|
|
{
|
2003-12-26 08:26:08 +01:00
|
|
|
FTC_Node new_list = NULL;
|
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
/* try to expand the buckets array _before_ splitting
|
|
|
|
* the bucket lists
|
|
|
|
*/
|
2003-12-26 08:26:08 +01:00
|
|
|
if ( p >= mask )
|
|
|
|
{
|
|
|
|
FT_Memory memory = cache->memory;
|
2006-01-27 13:11:22 +01:00
|
|
|
FT_Error error;
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
/* if we can't expand the array, leave immediately */
|
2006-01-27 13:11:22 +01:00
|
|
|
if ( FT_RENEW_ARRAY( cache->buckets, (mask+1)*2, (mask+1)*4 ) )
|
2003-12-26 08:26:08 +01:00
|
|
|
break;
|
|
|
|
}
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
/* split a single bucket */
|
2003-12-26 08:26:08 +01:00
|
|
|
pnode = cache->buckets + p;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
node = *pnode;
|
|
|
|
if ( node == NULL )
|
|
|
|
break;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
if ( node->hash & ( mask + 1 ) )
|
|
|
|
{
|
|
|
|
*pnode = node->link;
|
|
|
|
node->link = new_list;
|
|
|
|
new_list = node;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pnode = &node->link;
|
|
|
|
}
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
cache->buckets[p + mask + 1] = new_list;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
cache->slack += FTC_HASH_MAX_LOAD;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
if ( p >= mask )
|
|
|
|
{
|
|
|
|
cache->mask = 2 * mask + 1;
|
|
|
|
cache->p = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
cache->p = p + 1;
|
|
|
|
}
|
2003-12-26 08:26:08 +01:00
|
|
|
|
|
|
|
/* do we need to expand the buckets array? */
|
2003-12-24 14:37:58 +01:00
|
|
|
else if ( cache->slack > (FT_Long)count * FTC_HASH_SUB_LOAD )
|
|
|
|
{
|
|
|
|
FT_UInt old_index = p + mask;
|
|
|
|
FTC_Node* pold;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
if ( old_index + 1 <= FTC_HASH_INITIAL_SIZE )
|
|
|
|
break;
|
|
|
|
|
|
|
|
if ( p == 0 )
|
|
|
|
{
|
|
|
|
FT_Memory memory = cache->memory;
|
2006-01-27 13:11:22 +01:00
|
|
|
FT_Error error;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
|
|
|
/* if we can't shrink the array, leave immediately */
|
2006-01-27 13:11:22 +01:00
|
|
|
if ( FT_RENEW_ARRAY( cache->buckets,
|
|
|
|
( mask + 1 ) * 2, mask + 1 ) )
|
2003-12-24 14:37:58 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
cache->mask >>= 1;
|
|
|
|
p = cache->mask;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
p--;
|
|
|
|
|
|
|
|
pnode = cache->buckets + p;
|
|
|
|
while ( *pnode )
|
|
|
|
pnode = &(*pnode)->link;
|
|
|
|
|
|
|
|
pold = cache->buckets + old_index;
|
|
|
|
*pnode = *pold;
|
|
|
|
*pold = NULL;
|
|
|
|
|
|
|
|
cache->slack -= FTC_HASH_MAX_LOAD;
|
|
|
|
cache->p = p;
|
|
|
|
}
|
|
|
|
else /* the hash table is balanced */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* remove a node from its cache's hash table */
|
|
|
|
static void
|
|
|
|
ftc_node_hash_unlink( FTC_Node node0,
|
|
|
|
FTC_Cache cache )
|
|
|
|
{
|
|
|
|
FTC_Node *pnode;
|
|
|
|
FT_UInt idx;
|
|
|
|
|
|
|
|
|
|
|
|
idx = (FT_UInt)( node0->hash & cache->mask );
|
|
|
|
if ( idx < cache->p )
|
|
|
|
idx = (FT_UInt)( node0->hash & ( 2 * cache->mask + 1 ) );
|
|
|
|
|
|
|
|
pnode = cache->buckets + idx;
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
FTC_Node node = *pnode;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
if ( node == NULL )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "ftc_node_hash_unlink: unknown node!\n" ));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( node == node0 )
|
|
|
|
break;
|
|
|
|
|
|
|
|
pnode = &(*pnode)->link;
|
|
|
|
}
|
|
|
|
|
|
|
|
*pnode = node0->link;
|
|
|
|
node0->link = NULL;
|
|
|
|
|
|
|
|
cache->slack++;
|
|
|
|
ftc_cache_resize( cache );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
/* add a node to the `top' of its cache's hash table */
|
2003-12-24 14:37:58 +01:00
|
|
|
static void
|
|
|
|
ftc_node_hash_link( FTC_Node node,
|
|
|
|
FTC_Cache cache )
|
|
|
|
{
|
|
|
|
FTC_Node *pnode;
|
|
|
|
FT_UInt idx;
|
|
|
|
|
|
|
|
|
|
|
|
idx = (FT_UInt)( node->hash & cache->mask );
|
|
|
|
if ( idx < cache->p )
|
|
|
|
idx = (FT_UInt)( node->hash & (2 * cache->mask + 1 ) );
|
|
|
|
|
|
|
|
pnode = cache->buckets + idx;
|
|
|
|
|
|
|
|
node->link = *pnode;
|
|
|
|
*pnode = node;
|
|
|
|
|
|
|
|
cache->slack--;
|
|
|
|
ftc_cache_resize( cache );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_EXPORT_DEF( void )
|
2005-11-12 18:07:11 +01:00
|
|
|
FTC_Node_Destroy( FTC_Node node,
|
|
|
|
FTC_Manager manager )
|
|
|
|
{
|
|
|
|
ftc_node_destroy( node, manager );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* remove a node from the cache manager */
|
2006-02-25 18:11:04 +01:00
|
|
|
FT_LOCAL_DEF( void )
|
2003-12-24 14:37:58 +01:00
|
|
|
ftc_node_destroy( FTC_Node node,
|
|
|
|
FTC_Manager manager )
|
|
|
|
{
|
|
|
|
FTC_Cache cache;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef FT_DEBUG_ERROR
|
|
|
|
/* find node's cache */
|
|
|
|
if ( node->cache_index >= manager->num_caches )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "ftc_node_destroy: invalid node handle\n" ));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
cache = manager->caches[node->cache_index];
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
#ifdef FT_DEBUG_ERROR
|
|
|
|
if ( cache == NULL )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "ftc_node_destroy: invalid node handle\n" ));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
manager->cur_weight -= cache->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 */
|
|
|
|
cache->clazz.node_free( node, cache );
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* check, just in case of general corruption :-) */
|
|
|
|
if ( manager->num_nodes == 0 )
|
|
|
|
FT_ERROR(( "ftc_node_destroy: invalid cache node count! = %d\n",
|
|
|
|
manager->num_nodes ));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** ABSTRACT CACHE CLASS *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
FT_EXPORT_DEF( FT_Error )
|
2003-12-26 08:26:08 +01:00
|
|
|
FTC_Cache_Init( FTC_Cache cache )
|
2004-06-09 23:07:49 +02:00
|
|
|
{
|
|
|
|
return ftc_cache_init( cache );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
|
|
ftc_cache_init( FTC_Cache cache )
|
2003-12-24 14:37:58 +01:00
|
|
|
{
|
|
|
|
FT_Memory memory = cache->memory;
|
2006-01-27 13:11:22 +01:00
|
|
|
FT_Error error;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
|
|
|
cache->p = 0;
|
|
|
|
cache->mask = FTC_HASH_INITIAL_SIZE - 1;
|
|
|
|
cache->slack = FTC_HASH_INITIAL_SIZE * FTC_HASH_MAX_LOAD;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2006-01-27 13:11:22 +01:00
|
|
|
(void)FT_NEW_ARRAY( cache->buckets, FTC_HASH_INITIAL_SIZE * 2 );
|
|
|
|
return error;
|
2003-12-24 14:37:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-12 18:07:11 +01:00
|
|
|
static void
|
2003-12-24 14:37:58 +01:00
|
|
|
FTC_Cache_Clear( FTC_Cache cache )
|
|
|
|
{
|
|
|
|
if ( cache )
|
|
|
|
{
|
|
|
|
FTC_Manager manager = cache->manager;
|
|
|
|
FT_UFast i;
|
|
|
|
FT_UInt count;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
count = cache->p + cache->mask + 1;
|
|
|
|
|
|
|
|
for ( i = 0; i < count; 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 -= cache->clazz.node_weight( node, cache );
|
|
|
|
|
|
|
|
cache->clazz.node_free( node, cache );
|
|
|
|
node = next;
|
|
|
|
}
|
|
|
|
cache->buckets[i] = NULL;
|
|
|
|
}
|
|
|
|
ftc_cache_resize( cache );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-06-09 23:07:49 +02:00
|
|
|
FT_LOCAL_DEF( void )
|
|
|
|
ftc_cache_done( FTC_Cache cache )
|
2003-12-24 14:37:58 +01:00
|
|
|
{
|
|
|
|
if ( cache->memory )
|
|
|
|
{
|
|
|
|
FT_Memory memory = cache->memory;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
FTC_Cache_Clear( cache );
|
|
|
|
|
|
|
|
FT_FREE( cache->buckets );
|
|
|
|
cache->mask = 0;
|
|
|
|
cache->p = 0;
|
|
|
|
cache->slack = 0;
|
|
|
|
|
|
|
|
cache->memory = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-06-09 23:07:49 +02:00
|
|
|
FT_EXPORT_DEF( void )
|
|
|
|
FTC_Cache_Done( FTC_Cache cache )
|
Fix callback functions in cache module.
* src/cache/ftccback.h: New file for callback declarations.
* src/cache/ftcbasic.c (ftc_basic_family_compare,
ftc_basic_family_init, ftc_basic_family_get_count,
ftc_basic_family_load_bitmap, ftc_basic_family_load_glyph,
ftc_basic_gnode_compare_faceid): Use FT_CALLBACK_DEF.
(ftc_basic_image_family_class, ftc_basic_image_cache_class,
ftc_basic_sbit_family_class, ftc_basic_sbit_cache_class):
Use FT_CALLBACK_TABLE_DEF and local wrapper functions.
* src/cache/ftccache.c: Include ftccback.h.
(ftc_cache_init, ftc_cache_done): New wrapper functions which use
FT_LOCAL_DEF.
* src/cache/ftccmap.c: Include ftccback.h.
(ftc_cmap_cache_class): Use local wrapper functions.
* src/cache/ftcglyph.c: Include ftccback.h.
(ftc_gnode_compare, ftc_gcache_init, ftc_gcache_done): New wrapper
functions which use FT_LOCAL_DEF.
* src/cache/ftcimage.c: Include ftccback.h.
(ftc_inode_free, ftc_inode_new, ftc_inode_weight): New wrapper
functions which use FT_LOCAL_DEF.
* src/cache/ftcmanag.c (ftc_size_list_class, ftc_face_list_class):
Use FT_CALLBACK_TABLE_DEF.
* src/cache;/ftcsbits.c: Include ftccback.h.
(ftc_snode_free, ftc_snode_new, ftc_snode_weight,
ftc_snode_compare): New wrapper functions which use FT_LOCAL_DEF.
* src/cache/rules.mk (CACHE_DRV_H): Add ftccback.h.
2004-02-17 19:41:58 +01:00
|
|
|
{
|
2004-06-09 23:07:49 +02:00
|
|
|
ftc_cache_done( cache );
|
Fix callback functions in cache module.
* src/cache/ftccback.h: New file for callback declarations.
* src/cache/ftcbasic.c (ftc_basic_family_compare,
ftc_basic_family_init, ftc_basic_family_get_count,
ftc_basic_family_load_bitmap, ftc_basic_family_load_glyph,
ftc_basic_gnode_compare_faceid): Use FT_CALLBACK_DEF.
(ftc_basic_image_family_class, ftc_basic_image_cache_class,
ftc_basic_sbit_family_class, ftc_basic_sbit_cache_class):
Use FT_CALLBACK_TABLE_DEF and local wrapper functions.
* src/cache/ftccache.c: Include ftccback.h.
(ftc_cache_init, ftc_cache_done): New wrapper functions which use
FT_LOCAL_DEF.
* src/cache/ftccmap.c: Include ftccback.h.
(ftc_cmap_cache_class): Use local wrapper functions.
* src/cache/ftcglyph.c: Include ftccback.h.
(ftc_gnode_compare, ftc_gcache_init, ftc_gcache_done): New wrapper
functions which use FT_LOCAL_DEF.
* src/cache/ftcimage.c: Include ftccback.h.
(ftc_inode_free, ftc_inode_new, ftc_inode_weight): New wrapper
functions which use FT_LOCAL_DEF.
* src/cache/ftcmanag.c (ftc_size_list_class, ftc_face_list_class):
Use FT_CALLBACK_TABLE_DEF.
* src/cache;/ftcsbits.c: Include ftccback.h.
(ftc_snode_free, ftc_snode_new, ftc_snode_weight,
ftc_snode_compare): New wrapper functions which use FT_LOCAL_DEF.
* src/cache/rules.mk (CACHE_DRV_H): Add ftccback.h.
2004-02-17 19:41:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
static void
|
2003-12-26 08:26:08 +01:00
|
|
|
ftc_cache_add( FTC_Cache cache,
|
|
|
|
FT_UInt32 hash,
|
|
|
|
FTC_Node node )
|
2003-12-24 14:37:58 +01:00
|
|
|
{
|
|
|
|
node->hash = hash;
|
|
|
|
node->cache_index = (FT_UInt16) cache->index;
|
|
|
|
node->ref_count = 0;
|
|
|
|
|
|
|
|
ftc_node_hash_link( node, cache );
|
|
|
|
ftc_node_mru_link( node, cache->manager );
|
|
|
|
|
|
|
|
{
|
|
|
|
FTC_Manager manager = cache->manager;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
manager->cur_weight += cache->clazz.node_weight( node, cache );
|
|
|
|
|
|
|
|
if ( manager->cur_weight >= manager->max_weight )
|
|
|
|
{
|
|
|
|
node->ref_count++;
|
|
|
|
FTC_Manager_Compress( manager );
|
|
|
|
node->ref_count--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_EXPORT_DEF( FT_Error )
|
|
|
|
FTC_Cache_NewNode( FTC_Cache cache,
|
|
|
|
FT_UInt32 hash,
|
|
|
|
FT_Pointer query,
|
|
|
|
FTC_Node *anode )
|
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
FTC_Node node;
|
|
|
|
|
* builds/amiga/makefile.os4 (WARNINGS), builds/compiler/gcc-dev.mk
(CFLAGS), builds/compiler/gcc.mk (CFLAGS): Remove
-fno-strict-aliasing.
Say you have `(Foo*)x' and want to assign, pass, or return it as
`(Bar*)'. If you simply say `x' or `(Bar*)x', then the C compiler
would warn you that type casting incompatible pointer types breaks
strict-aliasing. The solution is to cast to `(void*)' instead which
is the generic pointer type, so the compiler knows that it should
make no strict-aliasing assumption on `x'. But the problem with
`(void*)x' is that seems like in C++, unlike C, `void*' is not a
generic pointer type and assigning `void*' to `Bar*' without a cast
causes an error. The solution is to cast to `Bar*' too, with
`(Bar*)(void*)x' as the result -- this is what the patch does.
* include/freetype/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP),
include/freetype/cache/ftcmru.h (FTC_MRULIST_LOOKUP_CMP): Remove
cast on lvalue, use a temporary pointer instead.
Cast temporarily to (void*) to not break strict aliasing.
* include/freetype/internal/ftmemory.h (FT_MEM_ALLOC,
FT_MEM_REALLOC, FT_MEM_QALLOC, FT_MEM_QREALLOC, FT_MEM_FREE),
src/base/ftglyph.c (FT_Glyph_To_Bitmap): Cast temporarily to (void*)
to not break strict aliasing.
* src/base/ftinit.c (FT_USE_MODULE): Fix wrong type information.
* builds/unix/configure.ac (XX_CFLAGS): Remove -fno-strict-aliasing.
* src/sfnt/rules.mk (SFNT_DRV_SRC): Don't include ttsbit0.c --
it is currently loaded from ttsbit.c.
Other formatting.
2005-05-23 23:33:02 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We use the FTC_CACHE_TRYLOOP macros to support out-of-memory
|
|
|
|
* errors (OOM) correctly, i.e., by flushing the cache progressively
|
|
|
|
* in order to make more room.
|
|
|
|
*/
|
|
|
|
|
|
|
|
FTC_CACHE_TRYLOOP( cache )
|
2005-05-23 15:04:53 +02:00
|
|
|
{
|
|
|
|
error = cache->clazz.node_new( &node, query, cache );
|
|
|
|
}
|
|
|
|
FTC_CACHE_TRYLOOP_END();
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2005-05-23 15:04:53 +02:00
|
|
|
if ( error )
|
|
|
|
node = NULL;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* don't assume that the cache has the same number of buckets, since
|
|
|
|
* our allocation request might have triggered global cache flushing
|
|
|
|
*/
|
|
|
|
ftc_cache_add( cache, hash, node );
|
|
|
|
}
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
*anode = node;
|
|
|
|
return error;
|
2003-12-24 19:42:04 +01:00
|
|
|
}
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
|
|
|
|
FT_EXPORT_DEF( FT_Error )
|
|
|
|
FTC_Cache_Lookup( FTC_Cache cache,
|
|
|
|
FT_UInt32 hash,
|
|
|
|
FT_Pointer query,
|
|
|
|
FTC_Node *anode )
|
|
|
|
{
|
|
|
|
FT_UFast idx;
|
|
|
|
FTC_Node* bucket;
|
|
|
|
FTC_Node* pnode;
|
|
|
|
FTC_Node node;
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
|
|
|
FTC_Node_CompareFunc compare = cache->clazz.node_compare;
|
|
|
|
|
|
|
|
|
|
|
|
if ( cache == NULL || anode == NULL )
|
|
|
|
return FT_Err_Invalid_Argument;
|
|
|
|
|
|
|
|
idx = hash & cache->mask;
|
|
|
|
if ( idx < cache->p )
|
|
|
|
idx = hash & ( cache->mask * 2 + 1 );
|
|
|
|
|
|
|
|
bucket = cache->buckets + idx;
|
|
|
|
pnode = bucket;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
node = *pnode;
|
|
|
|
if ( node == NULL )
|
|
|
|
goto NewNode;
|
|
|
|
|
|
|
|
if ( node->hash == hash && compare( node, query, cache ) )
|
|
|
|
break;
|
|
|
|
|
|
|
|
pnode = &node->link;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( node != *bucket )
|
|
|
|
{
|
|
|
|
*pnode = node->link;
|
|
|
|
node->link = *bucket;
|
|
|
|
*bucket = node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* move to head of MRU list */
|
|
|
|
{
|
|
|
|
FTC_Manager manager = cache->manager;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
if ( node != manager->nodes_list )
|
|
|
|
ftc_node_mru_up( node, manager );
|
|
|
|
}
|
|
|
|
*anode = node;
|
|
|
|
return error;
|
|
|
|
|
|
|
|
NewNode:
|
|
|
|
return FTC_Cache_NewNode( cache, hash, query, anode );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_EXPORT_DEF( void )
|
2003-12-26 08:26:08 +01:00
|
|
|
FTC_Cache_RemoveFaceID( FTC_Cache cache,
|
|
|
|
FTC_FaceID face_id )
|
2003-12-24 14:37:58 +01:00
|
|
|
{
|
|
|
|
FT_UFast i, count;
|
|
|
|
FTC_Manager manager = cache->manager;
|
2003-12-24 19:42:04 +01:00
|
|
|
FTC_Node frees = NULL;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
count = cache->p + cache->mask;
|
|
|
|
for ( i = 0; i < count; i++ )
|
|
|
|
{
|
|
|
|
FTC_Node* bucket = cache->buckets + i;
|
|
|
|
FTC_Node* pnode = bucket;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
for ( ;; )
|
|
|
|
{
|
|
|
|
FTC_Node node = *pnode;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
if ( node == NULL )
|
|
|
|
break;
|
|
|
|
|
|
|
|
if ( cache->clazz.node_remove_faceid( node, face_id, cache ) )
|
|
|
|
{
|
2003-12-26 08:26:08 +01:00
|
|
|
*pnode = node->link;
|
2003-12-24 19:42:04 +01:00
|
|
|
node->link = frees;
|
|
|
|
frees = node;
|
2003-12-24 14:37:58 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
pnode = &node->link;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
/* remove all nodes in the free list */
|
2003-12-24 19:42:04 +01:00
|
|
|
while ( frees )
|
2003-12-24 14:37:58 +01:00
|
|
|
{
|
|
|
|
FTC_Node node;
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 19:42:04 +01:00
|
|
|
node = frees;
|
|
|
|
frees = node->link;
|
2003-12-24 14:37:58 +01:00
|
|
|
|
|
|
|
manager->cur_weight -= cache->clazz.node_weight( node, cache );
|
|
|
|
ftc_node_mru_unlink( node, manager );
|
|
|
|
|
|
|
|
cache->clazz.node_free( node, cache );
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
cache->slack++;
|
2003-12-24 14:37:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ftc_cache_resize( cache );
|
|
|
|
}
|
|
|
|
|
2003-12-26 08:26:08 +01:00
|
|
|
|
2003-12-24 14:37:58 +01:00
|
|
|
/* END */
|