X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilcidcache.c;h=da86f7437a5cc51409c6662ebd4c9772b6ec371b;hb=c257b555225193e54d85daf541d29578b3c93882;hp=44afd47bd566ca97b88fe06fea5272a83986bba2;hpb=912c824230695936999c0c54f02996ffa3b6409c;p=silc.git diff --git a/lib/silccore/silcidcache.c b/lib/silccore/silcidcache.c index 44afd47b..da86f743 100644 --- a/lib/silccore/silcidcache.c +++ b/lib/silccore/silcidcache.c @@ -4,13 +4,13 @@ Author: Pekka Riikonen - Copyright (C) 2000 - 2001 Pekka Riikonen + Copyright (C) 2000 - 2005 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -26,7 +26,7 @@ static void silc_idcache_destructor(void *key, void *context, void *user_context); static SilcIDCacheList silc_idcache_list_alloc(); -static void silc_idcache_list_add(SilcIDCacheList list, +static void silc_idcache_list_add(SilcIDCacheList list, SilcIDCacheEntry cache); /* @@ -68,11 +68,13 @@ struct SilcIDCacheStruct { SilcHashTable context_table; SilcIDCacheDestructor destructor; SilcIdType type; + unsigned int delete_id : 1; + unsigned int delete_name : 1; }; -/* +/* ID Cache list. - + This is returned when searching the cache. Enumeration functions are provided to traverse the list; actually this is used as table not as list. :) @@ -85,7 +87,7 @@ struct SilcIDCacheStruct { */ struct SilcIDCacheListStruct { - SilcIDCacheEntry cache[64]; + SilcIDCacheEntry cache[128]; SilcIDCacheEntry *cache_dyn; SilcUInt32 cache_dyn_count; SilcUInt32 cache_count; @@ -94,12 +96,13 @@ struct SilcIDCacheListStruct { }; /* Allocates new ID cache object. The initial amount of allocated entries - can be sent as argument. If `count' is 0 the system uses default values. + can be sent as argument. If `count' is 0 the system uses default values. The `id_type' defines the types of the ID's that will be saved to the cache. */ SilcIDCache silc_idcache_alloc(SilcUInt32 count, SilcIdType id_type, - SilcIDCacheDestructor destructor) + SilcIDCacheDestructor destructor, + bool delete_id, bool delete_name) { SilcIDCache cache; @@ -109,17 +112,20 @@ SilcIDCache silc_idcache_alloc(SilcUInt32 count, SilcIdType id_type, if (!cache) return NULL; cache->id_table = silc_hash_table_alloc(count, silc_hash_id, - (void *)(SilcUInt32)id_type, + SILC_32_TO_PTR(id_type), silc_hash_id_compare, - (void *)(SilcUInt32)id_type, - silc_idcache_destructor, NULL, TRUE); - cache->name_table = silc_hash_table_alloc(count, silc_hash_string, NULL, - silc_hash_string_compare, NULL, + SILC_32_TO_PTR(id_type), + silc_idcache_destructor, + cache, TRUE); + cache->name_table = silc_hash_table_alloc(count, silc_hash_utf8_string, NULL, + silc_hash_utf8_compare, NULL, NULL, NULL, TRUE); cache->context_table = silc_hash_table_alloc(count, silc_hash_ptr, NULL, NULL, NULL, NULL, NULL, TRUE); cache->destructor = destructor; cache->type = id_type; + cache->delete_id = delete_id; + cache->delete_name = delete_name; if (!cache->id_table || !cache->name_table || !cache->context_table) { if (cache->id_table) @@ -153,7 +159,7 @@ void silc_idcache_free(SilcIDCache cache) If the `expire' is TRUE the entry expires in default time and if FALSE the entry never expires from the cache. */ -bool silc_idcache_add(SilcIDCache cache, char *name, void *id, +bool silc_idcache_add(SilcIDCache cache, char *name, void *id, void *context, int expire, SilcIDCacheEntry *ret) { SilcIDCacheEntry c; @@ -189,7 +195,18 @@ bool silc_idcache_add(SilcIDCache cache, char *name, void *id, static void silc_idcache_destructor(void *key, void *context, void *user_context) { - silc_free(context); + SilcIDCacheEntry c = context; + if (c) { + SilcIDCache cache = user_context; + if (cache) { + if (cache->delete_id) + silc_free(c->id); + if (cache->delete_name) + silc_free(c->name); + } + memset(c, 'F', sizeof(*c)); + silc_free(c); + } } /* Delete cache entry from cache. */ @@ -206,8 +223,10 @@ bool silc_idcache_del(SilcIDCache cache, SilcIDCacheEntry old) ret = silc_hash_table_del(cache->context_table, old->context); if (old->id) ret = silc_hash_table_del(cache->id_table, old->id); - else - silc_free(old); + else { + silc_idcache_destructor(NULL, old, NULL); + ret = TRUE; + } return ret; } @@ -228,9 +247,9 @@ bool silc_idcache_del_by_id(SilcIDCache cache, void *id) functions are NULL then default values are used. */ bool silc_idcache_del_by_id_ext(SilcIDCache cache, void *id, - SilcHashFunction hash, + SilcHashFunction hash, void *hash_context, - SilcHashCompare compare, + SilcHashCompare compare, void *compare_context) { SilcIDCacheEntry c; @@ -239,7 +258,7 @@ bool silc_idcache_del_by_id_ext(SilcIDCache cache, void *id, SILC_LOG_DEBUG(("Deleting cache entry")); if (!silc_hash_table_find_ext(cache->id_table, id, NULL, (void *)&c, - hash, hash_context, compare, + hash, hash_context, compare, compare_context)) return FALSE; @@ -251,7 +270,6 @@ bool silc_idcache_del_by_id_ext(SilcIDCache cache, void *id, ret = silc_hash_table_del_ext(cache->id_table, c->id, hash, hash_context, compare, compare_context, NULL, NULL); - return ret; } @@ -273,8 +291,10 @@ bool silc_idcache_del_by_context(SilcIDCache cache, void *context) ret = silc_hash_table_del(cache->context_table, c->context); if (c->id) ret = silc_hash_table_del_by_context(cache->id_table, c->id, c); - else - silc_free(c); + else { + silc_idcache_destructor(NULL, c, NULL); + ret = TRUE; + } return ret; } @@ -304,6 +324,7 @@ static void silc_idcache_purge_foreach(void *key, void *context, SilcIDCache cache = (SilcIDCache)user_context; SilcUInt32 curtime = time(NULL); SilcIDCacheEntry c = (SilcIDCacheEntry)context; + bool ret = FALSE; if (!context) return; @@ -311,20 +332,23 @@ static void silc_idcache_purge_foreach(void *key, void *context, if (c->expire && c->expire < curtime) { /* Remove the entry from the hash tables */ if (c->name) - silc_hash_table_del_by_context(cache->name_table, c->name, c); + ret = silc_hash_table_del_by_context(cache->name_table, c->name, c); if (c->context) - silc_hash_table_del(cache->context_table, c->context); + ret = silc_hash_table_del(cache->context_table, c->context); if (c->id) - silc_hash_table_del_by_context_ext(cache->id_table, c->id, c, - NULL, NULL, NULL, NULL, - silc_idcache_destructor_dummy, NULL); - - /* Call the destructor */ - if (cache->destructor) - cache->destructor(cache, c); - - /* Free the entry, it has been deleted from the hash tables */ - silc_free(c); + ret = + silc_hash_table_del_by_context_ext(cache->id_table, c->id, c, + NULL, NULL, NULL, NULL, + silc_idcache_destructor_dummy, + NULL); + if (ret == TRUE) { + /* Call the destructor */ + if (cache->destructor) + cache->destructor(cache, c); + + /* Free the entry, it has been deleted from the hash tables */ + silc_idcache_destructor(NULL, c, NULL); + } } } @@ -344,7 +368,7 @@ bool silc_idcache_purge_by_context(SilcIDCache cache, void *context) SilcIDCacheEntry c; bool ret = FALSE; - if (!silc_hash_table_find(cache->context_table, context, NULL, + if (!silc_hash_table_find(cache->context_table, context, NULL, (void *)&c)) return FALSE; @@ -356,15 +380,16 @@ bool silc_idcache_purge_by_context(SilcIDCache cache, void *context) if (c->id) ret = silc_hash_table_del_by_context_ext(cache->id_table, c->id, c, - NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, silc_idcache_destructor_dummy, NULL); - - /* Call the destructor */ - if (cache->destructor) - cache->destructor(cache, c); + if (ret == TRUE) { + /* Call the destructor */ + if (cache->destructor) + cache->destructor(cache, c); - /* Free the entry, it has been deleted from the hash tables */ - silc_free(c); + /* Free the entry, it has been deleted from the hash tables */ + silc_idcache_destructor(NULL, c, NULL); + } return ret; } @@ -407,7 +432,7 @@ bool silc_idcache_get_all(SilcIDCache cache, SilcIDCacheList *ret) /* Find ID Cache entry by ID. May return multiple entries. */ -bool silc_idcache_find_by_id(SilcIDCache cache, void *id, +bool silc_idcache_find_by_id(SilcIDCache cache, void *id, SilcIDCacheList *ret) { SilcIDCacheList list; @@ -436,21 +461,21 @@ bool silc_idcache_find_by_id(SilcIDCache cache, void *id, If `hash' is NULL then the default hash funtion is used and if `compare' is NULL default comparison function is used. */ -bool silc_idcache_find_by_id_one_ext(SilcIDCache cache, void *id, - SilcHashFunction hash, +bool silc_idcache_find_by_id_one_ext(SilcIDCache cache, void *id, + SilcHashFunction hash, void *hash_context, - SilcHashCompare compare, + SilcHashCompare compare, void *compare_context, SilcIDCacheEntry *ret) { return silc_hash_table_find_ext(cache->id_table, id, NULL, (void *)ret, - hash, hash_context, compare, + hash, hash_context, compare, compare_context); } /* Find one specific ID entry. */ -bool silc_idcache_find_by_id_one(SilcIDCache cache, void *id, +bool silc_idcache_find_by_id_one(SilcIDCache cache, void *id, SilcIDCacheEntry *ret) { return silc_hash_table_find(cache->id_table, id, NULL, (void *)ret); @@ -458,10 +483,10 @@ bool silc_idcache_find_by_id_one(SilcIDCache cache, void *id, /* Finds cache entry by context. */ -bool silc_idcache_find_by_context(SilcIDCache cache, void *context, +bool silc_idcache_find_by_context(SilcIDCache cache, void *context, SilcIDCacheEntry *ret) { - return silc_hash_table_find(cache->context_table, context, NULL, + return silc_hash_table_find(cache->context_table, context, NULL, (void *)ret); } @@ -479,7 +504,7 @@ bool silc_idcache_find_by_name(SilcIDCache cache, char *name, if (!ret) return TRUE; - silc_hash_table_find_foreach(cache->name_table, name, + silc_hash_table_find_foreach(cache->name_table, name, silc_idcache_get_all_foreach, list); if (silc_idcache_list_count(list) == 0) { @@ -546,7 +571,7 @@ static void silc_idcache_list_add(SilcIDCacheList list, SilcIDCacheEntry cache) int k; i = list->cache_dyn_count; - list->cache_dyn = silc_realloc(list->cache_dyn, + list->cache_dyn = silc_realloc(list->cache_dyn, sizeof(*list->cache_dyn) * (i + 5)); if (!list->cache_dyn) return; @@ -576,7 +601,7 @@ bool silc_idcache_list_first(SilcIDCacheList list, SilcIDCacheEntry *ret) if (!list->cache[list->pos]) return FALSE; - + if (ret) *ret = list->cache[list->pos]; @@ -600,17 +625,17 @@ bool silc_idcache_list_next(SilcIDCacheList list, SilcIDCacheEntry *ret) if (!list->dyn && !list->cache[list->pos]) return FALSE; - + if (list->dyn && !list->cache_dyn[list->pos]) return FALSE; - + if (ret) { if (!list->dyn) *ret = list->cache[list->pos]; else *ret = list->cache_dyn[list->pos]; } - + return TRUE; }