You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/05/26 00:13:59 UTC
svn commit: r1127705 - in /subversion/trunk/subversion/libsvn_subr:
cache-inprocess.c cache-membuffer.c cache-memcache.c cache.c cache.h
Author: stefan2
Date: Wed May 25 22:13:58 2011
New Revision: 1127705
URL: http://svn.apache.org/viewvc?rev=1127705&view=rev
Log:
Follow-up to r1127702: apply the same pool names to all implementations
of the svn_cache APIs.
* subversion/libsvn_subr/cache.h
(svn_cache__vtable_t): sync pool names with corresponding APIs
* subversion/libsvn_subr/cache.c
(svn_cache__set_error_handler, svn_cache__get, svn_cache__set,
svn_cache__iter, svn_cache__get_partial, svn_cache__set_partial,
svn_cache__get_info, svn_cache__format_info): same here
* subversion/libsvn_subr/cache-memcache.c
(memcache_get, memcache_internal_set, memcache_set,
memcache_get_partial, memcache_set_partial, memcache_iter,
memcache_get_info): and here
* subversion/libsvn_subr/cache-membuffer.c
(membuffer_cache_set, membuffer_cache_get,
membuffer_cache_get_partial, membuffer_cache_set_partial,
svn_membuffer_cache_get, svn_membuffer_cache_get_partial,
svn_membuffer_cache_set_partial, svn_membuffer_cache_get_info,
serialize_svn_stringbuf, deserialize_svn_stringbuf): more of the same
* subversion/libsvn_subr/cache-inprocess.c
(inprocess_cache_get, inprocess_cache_set, inprocess_cache_iter,
inprocess_cache_get_partial, inprocess_cache_set_partial,
inprocess_cache_get_info): dito
Modified:
subversion/trunk/subversion/libsvn_subr/cache-inprocess.c
subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
subversion/trunk/subversion/libsvn_subr/cache-memcache.c
subversion/trunk/subversion/libsvn_subr/cache.c
subversion/trunk/subversion/libsvn_subr/cache.h
Modified: subversion/trunk/subversion/libsvn_subr/cache-inprocess.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-inprocess.c?rev=1127705&r1=1127704&r2=1127705&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-inprocess.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-inprocess.c Wed May 25 22:13:58 2011
@@ -222,7 +222,7 @@ inprocess_cache_get(void **value_p,
svn_boolean_t *found,
void *cache_void,
const void *key,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
inprocess_cache_t *cache = cache_void;
svn_error_t *err = NULL;
@@ -241,7 +241,7 @@ inprocess_cache_get(void **value_p,
SVN_ERR(move_page_to_front(cache, entry->page));
/* duplicate the buffer entry */
- buffer = apr_palloc(pool, entry->size);
+ buffer = apr_palloc(result_pool, entry->size);
memcpy(buffer, entry->value, entry->size);
/* the cache is no longer being accessed */
@@ -252,7 +252,7 @@ inprocess_cache_get(void **value_p,
*/
*found = TRUE;
if (entry->value)
- err = cache->deserialize_func(value_p, buffer, entry->size, pool);
+ err = cache->deserialize_func(value_p, buffer, entry->size, result_pool);
else
*value_p = NULL;
@@ -295,7 +295,7 @@ static svn_error_t *
inprocess_cache_set(void *cache_void,
const void *key,
void *value,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
inprocess_cache_t *cache = cache_void;
struct cache_entry *existing_entry;
@@ -448,7 +448,7 @@ inprocess_cache_iter(svn_boolean_t *comp
void *cache_void,
svn_iter_apr_hash_cb_t user_cb,
void *user_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
inprocess_cache_t *cache = cache_void;
struct cache_iter_baton b;
@@ -458,7 +458,7 @@ inprocess_cache_iter(svn_boolean_t *comp
SVN_ERR(lock_cache(cache));
return unlock_cache(cache,
svn_iter_apr_hash(completed, cache->hash, iter_cb, &b,
- pool));
+ scratch_pool));
}
static svn_error_t *
@@ -468,7 +468,7 @@ inprocess_cache_get_partial(void **value
const void *key,
svn_cache__partial_getter_func_t func,
void *baton,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
inprocess_cache_t *cache = cache_void;
struct cache_entry *entry;
@@ -486,7 +486,8 @@ inprocess_cache_get_partial(void **value
*found = TRUE;
return unlock_cache(cache,
- func(value_p, entry->value, entry->size, baton, pool));
+ func(value_p, entry->value, entry->size, baton,
+ result_pool));
}
static svn_error_t *
@@ -494,7 +495,7 @@ inprocess_cache_set_partial(void *cache_
const void *key,
svn_cache__partial_setter_func_t func,
void *baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
inprocess_cache_t *cache = cache_void;
struct cache_entry *entry;
@@ -534,13 +535,13 @@ static svn_error_t *
inprocess_cache_get_info(void *cache_void,
svn_cache__info_t *info,
svn_boolean_t reset,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
inprocess_cache_t *cache = cache_void;
SVN_ERR(lock_cache(cache));
- info->id = apr_pstrdup(pool, cache->id);
+ info->id = apr_pstrdup(result_pool, cache->id);
info->used_entries = apr_hash_count(cache->hash);
info->total_entries = cache->items_per_page * cache->total_pages;
Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1127705&r1=1127704&r2=1127705&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Wed May 25 22:13:58 2011
@@ -1120,7 +1120,7 @@ membuffer_cache_set(svn_membuffer_t *cac
void *item,
svn_cache__serialize_func_t serializer,
DEBUG_CACHE_MEMBUFFER_TAG_ARG
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
apr_uint32_t group_index;
unsigned char to_find[KEY_SIZE];
@@ -1130,14 +1130,14 @@ membuffer_cache_set(svn_membuffer_t *cac
/* find the entry group that will hold the key.
*/
- group_index = get_group_index(&cache, key, key_len, to_find, pool);
+ group_index = get_group_index(&cache, key, key_len, to_find, scratch_pool);
if (group_index == NO_INDEX)
return SVN_NO_ERROR;
/* Serialize data data.
*/
if (item)
- SVN_ERR(serializer(&buffer, &size, item, pool));
+ SVN_ERR(serializer(&buffer, &size, item, scratch_pool));
/* The actual cache data access needs to sync'ed
*/
@@ -1161,7 +1161,7 @@ membuffer_cache_set(svn_membuffer_t *cac
/* Remember original content, type and key (hashes)
*/
- SVN_ERR(store_content_part(tag, buffer, size, pool));
+ SVN_ERR(store_content_part(tag, buffer, size, scratch_pool));
memcpy(&entry->tag, tag, sizeof(*tag));
#endif
@@ -1200,7 +1200,7 @@ membuffer_cache_get(svn_membuffer_t *cac
void **item,
svn_cache__deserialize_func_t deserializer,
DEBUG_CACHE_MEMBUFFER_TAG_ARG
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
apr_uint32_t group_index;
unsigned char to_find[KEY_SIZE];
@@ -1210,7 +1210,7 @@ membuffer_cache_get(svn_membuffer_t *cac
/* find the entry group that will hold the key.
*/
- group_index = get_group_index(&cache, key, key_len, to_find, pool);
+ group_index = get_group_index(&cache, key, key_len, to_find, result_pool);
if (group_index == NO_INDEX)
{
/* Some error occured, return "item not found".
@@ -1234,7 +1234,7 @@ membuffer_cache_get(svn_membuffer_t *cac
}
size = ALIGN_VALUE(entry->size);
- buffer = ALIGN_POINTER(apr_palloc(pool, size + ITEM_ALIGNMENT-1));
+ buffer = ALIGN_POINTER(apr_palloc(result_pool, size + ITEM_ALIGNMENT-1));
memcpy(buffer, (const char*)cache->data + entry->offset, size);
#ifdef DEBUG_CACHE_MEMBUFFER
@@ -1247,7 +1247,7 @@ membuffer_cache_get(svn_membuffer_t *cac
/* Compare original content, type and key (hashes)
*/
- SVN_ERR(store_content_part(tag, buffer, entry->size, pool));
+ SVN_ERR(store_content_part(tag, buffer, entry->size, result_pool));
SVN_ERR(assert_equal_tags(&entry->tag, tag));
#endif
@@ -1262,7 +1262,7 @@ membuffer_cache_get(svn_membuffer_t *cac
/* re-construct the original data object from its serialized form.
*/
- return deserializer(item, buffer, entry->size, pool);
+ return deserializer(item, buffer, entry->size, result_pool);
}
/* Look for the cache entry identified by KEY and KEY_LEN. FOUND indicates
@@ -1280,14 +1280,14 @@ membuffer_cache_get_partial(svn_membuffe
svn_cache__partial_getter_func_t deserializer,
void *baton,
DEBUG_CACHE_MEMBUFFER_TAG_ARG
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
apr_uint32_t group_index;
unsigned char to_find[KEY_SIZE];
entry_t *entry;
svn_error_t *err = SVN_NO_ERROR;
- group_index = get_group_index(&cache, key, key_len, to_find, pool);
+ group_index = get_group_index(&cache, key, key_len, to_find, result_pool);
SVN_ERR(lock_cache(cache));
@@ -1319,7 +1319,7 @@ membuffer_cache_get_partial(svn_membuffe
SVN_ERR(store_content_part(tag,
(const char*)cache->data + entry->offset,
entry->size,
- pool));
+ result_pool));
SVN_ERR(assert_equal_tags(&entry->tag, tag));
#endif
@@ -1328,7 +1328,7 @@ membuffer_cache_get_partial(svn_membuffe
(const char*)cache->data + entry->offset,
entry->size,
baton,
- pool);
+ result_pool);
}
/* done here -> unlock the cache
@@ -1348,7 +1348,7 @@ membuffer_cache_set_partial(svn_membuffe
svn_cache__partial_setter_func_t func,
void *baton,
DEBUG_CACHE_MEMBUFFER_TAG_ARG
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
apr_uint32_t group_index;
unsigned char to_find[KEY_SIZE];
@@ -1357,7 +1357,7 @@ membuffer_cache_set_partial(svn_membuffe
/* cache item lookup
*/
- group_index = get_group_index(&cache, key, key_len, to_find, pool);
+ group_index = get_group_index(&cache, key, key_len, to_find, scratch_pool);
SVN_ERR(lock_cache(cache));
@@ -1387,14 +1387,14 @@ membuffer_cache_set_partial(svn_membuffe
/* Compare original content, type and key (hashes)
*/
- SVN_ERR(store_content_part(tag, data, size, pool));
+ SVN_ERR(store_content_part(tag, data, size, scratch_pool));
SVN_ERR(assert_equal_tags(&entry->tag, tag));
#endif
/* modify it, preferrably in-situ.
*/
- err = func(&data, &size, baton, pool);
+ err = func(&data, &size, baton, scratch_pool);
if (err)
{
@@ -1432,7 +1432,7 @@ membuffer_cache_set_partial(svn_membuffe
/* Remember original content, type and key (hashes)
*/
- SVN_ERR(store_content_part(tag, data, size, pool));
+ SVN_ERR(store_content_part(tag, data, size, scratch_pool));
memcpy(&entry->tag, tag, sizeof(*tag));
#endif
@@ -1547,7 +1547,7 @@ svn_membuffer_cache_get(void **value_p,
svn_boolean_t *found,
void *cache_void,
const void *key,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_membuffer_cache_t *cache = cache_void;
@@ -1565,7 +1565,7 @@ svn_membuffer_cache_get(void **value_p,
cache->key_len,
&full_key,
&full_key_len,
- pool);
+ cache->pool);
/* Look the item up. */
SVN_ERR(membuffer_cache_get(cache->membuffer,
@@ -1574,7 +1574,7 @@ svn_membuffer_cache_get(void **value_p,
value_p,
cache->deserializer,
DEBUG_CACHE_MEMBUFFER_TAG
- pool));
+ result_pool));
/* We don't need more the key anymore.
* But since we allocate only small amounts of data per get() call and
@@ -1659,7 +1659,7 @@ svn_membuffer_cache_get_partial(void **v
const void *key,
svn_cache__partial_getter_func_t func,
void *baton,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_membuffer_cache_t *cache = cache_void;
@@ -1674,7 +1674,7 @@ svn_membuffer_cache_get_partial(void **v
cache->key_len,
&full_key,
&full_key_len,
- pool);
+ cache->pool);
SVN_ERR(membuffer_cache_get_partial(cache->membuffer,
full_key,
@@ -1684,7 +1684,7 @@ svn_membuffer_cache_get_partial(void **v
func,
baton,
DEBUG_CACHE_MEMBUFFER_TAG
- pool));
+ result_pool));
return SVN_NO_ERROR;
}
@@ -1694,7 +1694,7 @@ svn_membuffer_cache_set_partial(void *ca
const void *key,
svn_cache__partial_setter_func_t func,
void *baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
svn_membuffer_cache_t *cache = cache_void;
@@ -1709,7 +1709,7 @@ svn_membuffer_cache_set_partial(void *ca
cache->key_len,
&full_key,
&full_key_len,
- pool);
+ scratch_pool);
SVN_ERR(membuffer_cache_set_partial(cache->membuffer,
full_key,
@@ -1717,7 +1717,7 @@ svn_membuffer_cache_set_partial(void *ca
func,
baton,
DEBUG_CACHE_MEMBUFFER_TAG
- pool));
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -1738,14 +1738,14 @@ static svn_error_t *
svn_membuffer_cache_get_info(void *cache_void,
svn_cache__info_t *info,
svn_boolean_t reset,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_membuffer_cache_t *cache = cache_void;
apr_uint32_t i;
/* cache frontend specific data */
- info->id = apr_pstrdup(pool, cache->full_prefix);
+ info->id = apr_pstrdup(result_pool, cache->full_prefix);
/* collect info from shared cache backend */
@@ -1796,7 +1796,7 @@ static svn_error_t *
serialize_svn_stringbuf(char **buffer,
apr_size_t *buffer_size,
void *item,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_stringbuf_t *value_str = item;
@@ -1813,9 +1813,9 @@ static svn_error_t *
deserialize_svn_stringbuf(void **item,
char *buffer,
apr_size_t buffer_size,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
- svn_string_t *value_str = apr_palloc(pool, sizeof(svn_string_t));
+ svn_string_t *value_str = apr_palloc(result_pool, sizeof(svn_string_t));
value_str->data = buffer;
value_str->len = buffer_size-1;
Modified: subversion/trunk/subversion/libsvn_subr/cache-memcache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-memcache.c?rev=1127705&r1=1127704&r2=1127705&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-memcache.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-memcache.c Wed May 25 22:13:58 2011
@@ -173,7 +173,7 @@ memcache_get(void **value_p,
svn_boolean_t *found,
void *cache_void,
const void *key,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
memcache_t *cache = cache_void;
char *data;
@@ -183,18 +183,19 @@ memcache_get(void **value_p,
found,
cache_void,
key,
- pool));
+ result_pool));
/* If we found it, de-serialize it. */
if (*found)
{
if (cache->deserialize_func)
{
- SVN_ERR((cache->deserialize_func)(value_p, data, data_len, pool));
+ SVN_ERR((cache->deserialize_func)(value_p, data, data_len,
+ result_pool));
}
else
{
- svn_string_t *value = apr_pcalloc(pool, sizeof(*value));
+ svn_string_t *value = apr_pcalloc(result_pool, sizeof(*value));
value->data = data;
value->len = data_len;
*value_p = value;
@@ -213,13 +214,13 @@ memcache_internal_set(void *cache_void,
const void *key,
const char *data,
apr_size_t len,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
memcache_t *cache = cache_void;
const char *mc_key;
apr_status_t apr_err;
- SVN_ERR(build_key(&mc_key, cache, key, pool));
+ SVN_ERR(build_key(&mc_key, cache, key, scratch_pool));
apr_err = apr_memcache_set(cache->memcache, mc_key, (char *)data, len, 0, 0);
/* ### Maybe write failures should be ignored (but logged)? */
@@ -235,10 +236,10 @@ static svn_error_t *
memcache_set(void *cache_void,
const void *key,
void *value,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
memcache_t *cache = cache_void;
- apr_pool_t *subpool = svn_pool_create(pool);
+ apr_pool_t *subpool = svn_pool_create(scratch_pool);
char *data;
apr_size_t data_len;
svn_error_t *err;
@@ -267,7 +268,7 @@ memcache_get_partial(void **value_p,
const void *key,
svn_cache__partial_getter_func_t func,
void *baton,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_error_t *err = SVN_NO_ERROR;
@@ -278,11 +279,11 @@ memcache_get_partial(void **value_p,
found,
cache_void,
key,
- pool));
+ result_pool));
/* If we found it, de-serialize it. */
return *found
- ? func(value_p, data, size, baton, pool)
+ ? func(value_p, data, size, baton, result_pool)
: err;
}
@@ -292,7 +293,7 @@ memcache_set_partial(void *cache_void,
const void *key,
svn_cache__partial_setter_func_t func,
void *baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
svn_error_t *err = SVN_NO_ERROR;
@@ -300,13 +301,13 @@ memcache_set_partial(void *cache_void,
apr_size_t size;
svn_boolean_t found = FALSE;
- apr_pool_t *subpool = svn_pool_create(pool);
+ apr_pool_t *subpool = svn_pool_create(scratch_pool);
SVN_ERR(memcache_internal_get(&data,
&size,
&found,
cache_void,
key,
- pool));
+ subpool));
/* If we found it, modify it and write it back to cache */
if (found)
@@ -325,7 +326,7 @@ memcache_iter(svn_boolean_t *completed,
void *cache_void,
svn_iter_apr_hash_cb_t user_cb,
void *user_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Can't iterate a memcached cache"));
@@ -346,11 +347,11 @@ static svn_error_t *
memcache_get_info(void *cache_void,
svn_cache__info_t *info,
svn_boolean_t reset,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
memcache_t *cache = cache_void;
- info->id = apr_pstrdup(pool, cache->prefix);
+ info->id = apr_pstrdup(result_pool, cache->prefix);
/* we don't have any memory allocation info */
Modified: subversion/trunk/subversion/libsvn_subr/cache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache.c?rev=1127705&r1=1127704&r2=1127705&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache.c Wed May 25 22:13:58 2011
@@ -27,7 +27,7 @@ svn_error_t *
svn_cache__set_error_handler(svn_cache__t *cache,
svn_cache__error_handler_t handler,
void *baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
cache->error_handler = handler;
cache->error_baton = baton;
@@ -68,7 +68,7 @@ svn_cache__get(void **value_p,
svn_boolean_t *found,
svn_cache__t *cache,
const void *key,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_error_t *err;
@@ -82,8 +82,8 @@ svn_cache__get(void **value_p,
found,
cache->cache_internal,
key,
- pool),
- pool);
+ result_pool),
+ result_pool);
if (*found)
cache->hits++;
@@ -95,15 +95,15 @@ svn_error_t *
svn_cache__set(svn_cache__t *cache,
const void *key,
void *value,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
cache->writes++;
return handle_error(cache,
(cache->vtable->set)(cache->cache_internal,
key,
value,
- pool),
- pool);
+ scratch_pool),
+ scratch_pool);
}
@@ -112,13 +112,13 @@ svn_cache__iter(svn_boolean_t *completed
svn_cache__t *cache,
svn_iter_apr_hash_cb_t user_cb,
void *user_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
return (cache->vtable->iter)(completed,
cache->cache_internal,
user_cb,
user_baton,
- pool);
+ scratch_pool);
}
svn_error_t *
@@ -128,7 +128,7 @@ svn_cache__get_partial(void **value,
const void *key,
svn_cache__partial_getter_func_t func,
void *baton,
- apr_pool_t *scratch_pool)
+ apr_pool_t *result_pool)
{
svn_error_t *err;
@@ -144,8 +144,8 @@ svn_cache__get_partial(void **value,
key,
func,
baton,
- scratch_pool),
- scratch_pool);
+ result_pool),
+ result_pool);
if (*found)
cache->hits++;
@@ -174,7 +174,7 @@ svn_error_t *
svn_cache__get_info(svn_cache__t *cache,
svn_cache__info_t *info,
svn_boolean_t reset,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
/* write general statistics */
@@ -190,7 +190,7 @@ svn_cache__get_info(svn_cache__t *cache,
SVN_ERR((cache->vtable->get_info)(cache->cache_internal,
info,
reset,
- pool));
+ result_pool));
/* reset statistics */
@@ -207,7 +207,7 @@ svn_cache__get_info(svn_cache__t *cache,
svn_string_t *
svn_cache__format_info(const svn_cache__info_t *info,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
enum { _1MB = 1024 * 1024 };
@@ -221,7 +221,7 @@ svn_cache__format_info(const svn_cache__
double data_entry_rate = (100.0 * info->used_entries)
/ (info->total_entries ? info->total_entries : 1);
- return svn_string_createf(pool,
+ return svn_string_createf(result_pool,
"prefix : %s\n"
"gets : %" APR_UINT64_T_FMT
Modified: subversion/trunk/subversion/libsvn_subr/cache.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache.h?rev=1127705&r1=1127704&r2=1127705&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache.h (original)
+++ subversion/trunk/subversion/libsvn_subr/cache.h Wed May 25 22:13:58 2011
@@ -35,18 +35,18 @@ typedef struct svn_cache__vtable_t {
svn_boolean_t *found,
void *cache_implementation,
const void *key,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
svn_error_t *(*set)(void *cache_implementation,
const void *key,
void *value,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
svn_error_t *(*iter)(svn_boolean_t *completed,
void *cache_implementation,
svn_iter_apr_hash_cb_t func,
void *baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
svn_boolean_t (*is_cachable)(void *cache_implementation,
apr_size_t size);
@@ -57,7 +57,7 @@ typedef struct svn_cache__vtable_t {
const void *key,
svn_cache__partial_getter_func_t func,
void *baton,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
svn_error_t *(*set_partial)(void *cache_implementation,
const void *key,
svn_cache__partial_setter_func_t func,
@@ -67,7 +67,7 @@ typedef struct svn_cache__vtable_t {
svn_error_t *(*get_info)(void *cache_implementation,
svn_cache__info_t *info,
svn_boolean_t reset,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
} svn_cache__vtable_t;
struct svn_cache__t {