kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_sorcery_memory_cache.c: Misc tweaks.

Browse Source 
Change-Id: I8cd32dffbb4f33bb0c39518d6e4c991e73573160
This commit is contained in:
Richard Mudgett
2015-09-30 17:27:54 -05:00
parent 7942d1c2ff
commit 359394cc29
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_sorcery_memory_cache.c
View File

@@ -369,10 +369,10 @@ static void sorcery_memory_cache_destructor(void *obj)
struct sorcery_memory_cache *cache = obj; struct sorcery_memory_cache *cache = obj;
ast_free(cache->name); ast_free(cache->name);
ao2_cleanup(cache->objects);
if (cache->object_heap) { if (cache->object_heap) {
ast_heap_destroy(cache->object_heap); ast_heap_destroy(cache->object_heap);
} }
ao2_cleanup(cache->objects);
} }
/*! /*!
@@ -411,8 +411,7 @@ static int remove_from_cache(struct sorcery_memory_cache *cache, const char *id,
struct sorcery_memory_cached_object *oldest_object; struct sorcery_memory_cached_object *oldest_object;
struct sorcery_memory_cached_object *heap_object; struct sorcery_memory_cached_object *heap_object;
hash_object = ao2_find(cache->objects, id, hash_object = ao2_find(cache->objects, id, OBJ_SEARCH_KEY | OBJ_UNLINK | OBJ_NOLOCK);
OBJ_SEARCH_KEY | OBJ_UNLINK | OBJ_NOLOCK);
if (!hash_object) { if (!hash_object) {
return -1; return -1;
} }
@@ -483,7 +482,8 @@ static int expire_objects_from_cache(const void *data)
*/ */
static void remove_all_from_cache(struct sorcery_memory_cache *cache) static void remove_all_from_cache(struct sorcery_memory_cache *cache)
{ {
while (ast_heap_pop(cache->object_heap)); while (ast_heap_pop(cache->object_heap)) {
}
ao2_callback(cache->objects, OBJ_UNLINK | OBJ_NOLOCK | OBJ_NODATA | OBJ_MULTIPLE, ao2_callback(cache->objects, OBJ_UNLINK | OBJ_NOLOCK | OBJ_NODATA | OBJ_MULTIPLE,
NULL, NULL); NULL, NULL);
@@ -717,8 +717,8 @@ static int sorcery_memory_cache_create(const struct ast_sorcery *sorcery, void *
if (remove_oldest_from_cache(cache)) { if (remove_oldest_from_cache(cache)) {
ast_log(LOG_ERROR, "Unable to make room in cache for sorcery object '%s'.\n", ast_log(LOG_ERROR, "Unable to make room in cache for sorcery object '%s'.\n",
ast_sorcery_object_get_id(object)); ast_sorcery_object_get_id(object));
ao2_ref(cached, -1);
ao2_unlock(cache->objects); ao2_unlock(cache->objects);
ao2_ref(cached, -1);
return -1; return -1;
} }
ast_assert(ao2_container_count(cache->objects) != cache->maximum_objects); ast_assert(ao2_container_count(cache->objects) != cache->maximum_objects);
@@ -726,8 +726,8 @@ static int sorcery_memory_cache_create(const struct ast_sorcery *sorcery, void *
if (add_to_cache(cache, cached)) { if (add_to_cache(cache, cached)) {
ast_log(LOG_ERROR, "Unable to add object '%s' to the cache\n", ast_log(LOG_ERROR, "Unable to add object '%s' to the cache\n",
ast_sorcery_object_get_id(object)); ast_sorcery_object_get_id(object));
ao2_ref(cached, -1);
ao2_unlock(cache->objects); ao2_unlock(cache->objects);
ao2_ref(cached, -1);
return -1; return -1;
} }
ao2_unlock(cache->objects); ao2_unlock(cache->objects);