VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup some code paths

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93880 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bill Stoddard
2002-03-12 22:26:07 +00:00
parent bed8256dc1
commit 1eddc44767
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/experimental/mod_mem_cache.c
View File

@ -320,6 +320,8 @@ static int create_entity(cache_handle_t *h, request_rec *r,
/* Reference mem_cache_object_t out of cache_object_t */
obj->vobj = mobj;
mobj->m_len = len;
obj->complete = 0;
obj->refcount = 1;
/* Place the cache_object_t into the hash table.
* Note: Perhaps we should wait to put the object in the
@ -343,14 +345,6 @@ static int create_entity(cache_handle_t *h, request_rec *r,
apr_hash_set(sconf->cacheht, obj->key, strlen(obj->key), obj);
sconf->object_cnt++;
sconf->cache_size += len;
/* Call a cleanup at the end of the request to garbage collect
* a partially completed (aborted) cache update.
*/
obj->complete = 0;
obj->refcount = 1;
obj->cleanup = 1;
apr_pool_cleanup_register(r->pool, obj, decrement_refcount,
apr_pool_cleanup_null);
}
if (sconf->lock) {
apr_thread_mutex_unlock(sconf->lock);
@ -365,6 +359,13 @@ static int create_entity(cache_handle_t *h, request_rec *r,
return DECLINED;
}
/* Set the cleanup flag and register the cleanup to cleanup
* the cache_object_t if the cache load is aborted.
*/
obj->cleanup = 1;
apr_pool_cleanup_register(r->pool, obj, decrement_refcount,
apr_pool_cleanup_null);
/* Populate the cache handle */
h->cache_obj = obj;
h->read_body = &read_body;
@ -434,10 +435,8 @@ static int remove_entity(cache_handle_t *h)
apr_hash_set(sconf->cacheht, obj->key, strlen(obj->key), NULL);
sconf->object_cnt--;
sconf->cache_size -= mobj->m_len;
if (obj->refcount) {
obj->cleanup = 1;
}
else {
obj->cleanup = 1;
if (!obj->refcount) {
cleanup_cache_object(obj);
}
h->cache_obj = NULL;
@ -531,10 +530,8 @@ static int remove_url(const char *type, const char *key)
apr_hash_set(sconf->cacheht, key, APR_HASH_KEY_STRING, NULL);
sconf->object_cnt--;
sconf->cache_size -= mobj->m_len;
if (obj->refcount) {
obj->cleanup = 1;
}
else {
obj->cleanup = 1;
if (!obj->refcount) {
cleanup_cache_object(obj);
}
}