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 2014/09/27 12:47:40 UTC
svn commit: r1627948 - /subversion/trunk/subversion/libsvn_fs_fs/caching.c
Author: stefan2
Date: Sat Sep 27 10:47:39 2014
New Revision: 1627948
URL: http://svn.apache.org/r1627948
Log:
Make sure the svn_fs_t remains valid after calls to svn svn_fs_upgrade.
If we make the creation of cache instances contingent upon the initial
FS format, those instances will not be available after the FS upgrade.
And if those cache instances are mandatory with the new format, we may
segfault.
* subversion/libsvn_fs_fs/caching.c
(svn_fs_fs__initialize_caches): Always create all cache instances that
are mandatory for some FS format even if
the current format would not need them.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/caching.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/caching.c?rev=1627948&r1=1627947&r2=1627948&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/caching.c Sat Sep 27 10:47:39 2014
@@ -640,70 +640,60 @@ svn_fs_fs__initialize_caches(svn_fs_t *f
ffd->combined_window_cache = NULL;
}
- if (ffd->format >= SVN_FS_FS__MIN_LOG_ADDRESSING_FORMAT)
- {
- SVN_ERR(create_cache(&(ffd->l2p_header_cache),
- NULL,
- membuffer,
- 64, 16, /* entry size varies but we must cover
- a reasonable number of revisions (1k) */
- svn_fs_fs__serialize_l2p_header,
- svn_fs_fs__deserialize_l2p_header,
- sizeof(pair_cache_key_t),
- apr_pstrcat(pool, prefix, "L2P_HEADER",
- (char *)NULL),
- SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
- fs,
- no_handler,
- fs->pool, pool));
- SVN_ERR(create_cache(&(ffd->l2p_page_cache),
- NULL,
- membuffer,
- 64, 16, /* entry size varies but we must cover
- a reasonable number of revisions (1k) */
- svn_fs_fs__serialize_l2p_page,
- svn_fs_fs__deserialize_l2p_page,
- sizeof(svn_fs_fs__page_cache_key_t),
- apr_pstrcat(pool, prefix, "L2P_PAGE",
- (char *)NULL),
- SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
- fs,
- no_handler,
- fs->pool, pool));
- SVN_ERR(create_cache(&(ffd->p2l_header_cache),
- NULL,
- membuffer,
- 4, 1, /* Large entries. Rarely used. */
- svn_fs_fs__serialize_p2l_header,
- svn_fs_fs__deserialize_p2l_header,
- sizeof(pair_cache_key_t),
- apr_pstrcat(pool, prefix, "P2L_HEADER",
- (char *)NULL),
- SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
- fs,
- no_handler,
- fs->pool, pool));
- SVN_ERR(create_cache(&(ffd->p2l_page_cache),
- NULL,
- membuffer,
- 4, 16, /* Variably sized entries. Rarely used. */
- svn_fs_fs__serialize_p2l_page,
- svn_fs_fs__deserialize_p2l_page,
- sizeof(svn_fs_fs__page_cache_key_t),
- apr_pstrcat(pool, prefix, "P2L_PAGE",
- (char *)NULL),
- SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
- fs,
- no_handler,
- fs->pool, pool));
- }
- else
- {
- ffd->l2p_header_cache = NULL;
- ffd->l2p_page_cache = NULL;
- ffd->p2l_header_cache = NULL;
- ffd->p2l_page_cache = NULL;
- }
+ SVN_ERR(create_cache(&(ffd->l2p_header_cache),
+ NULL,
+ membuffer,
+ 64, 16, /* entry size varies but we must cover
+ a reasonable number of revisions (1k) */
+ svn_fs_fs__serialize_l2p_header,
+ svn_fs_fs__deserialize_l2p_header,
+ sizeof(pair_cache_key_t),
+ apr_pstrcat(pool, prefix, "L2P_HEADER",
+ (char *)NULL),
+ SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
+ fs,
+ no_handler,
+ fs->pool, pool));
+ SVN_ERR(create_cache(&(ffd->l2p_page_cache),
+ NULL,
+ membuffer,
+ 64, 16, /* entry size varies but we must cover
+ a reasonable number of revisions (1k) */
+ svn_fs_fs__serialize_l2p_page,
+ svn_fs_fs__deserialize_l2p_page,
+ sizeof(svn_fs_fs__page_cache_key_t),
+ apr_pstrcat(pool, prefix, "L2P_PAGE",
+ (char *)NULL),
+ SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
+ fs,
+ no_handler,
+ fs->pool, pool));
+ SVN_ERR(create_cache(&(ffd->p2l_header_cache),
+ NULL,
+ membuffer,
+ 4, 1, /* Large entries. Rarely used. */
+ svn_fs_fs__serialize_p2l_header,
+ svn_fs_fs__deserialize_p2l_header,
+ sizeof(pair_cache_key_t),
+ apr_pstrcat(pool, prefix, "P2L_HEADER",
+ (char *)NULL),
+ SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
+ fs,
+ no_handler,
+ fs->pool, pool));
+ SVN_ERR(create_cache(&(ffd->p2l_page_cache),
+ NULL,
+ membuffer,
+ 4, 16, /* Variably sized entries. Rarely used. */
+ svn_fs_fs__serialize_p2l_page,
+ svn_fs_fs__deserialize_p2l_page,
+ sizeof(svn_fs_fs__page_cache_key_t),
+ apr_pstrcat(pool, prefix, "P2L_PAGE",
+ (char *)NULL),
+ SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
+ fs,
+ no_handler,
+ fs->pool, pool));
return SVN_NO_ERROR;
}