svn commit: r1096927 [1/3] - in /subversion/trunk: ./ subversion/include/ subversion/include/private/ subversion/libsvn_fs_fs/ subversion/libsvn_fs_util/ subversion/libsvn_ra/ subversion/libsvn_subr/ subversion/svn/ subversion/svnadmin/ subversion/svns...

[st...@apache.org]

Author: stefan2
Date: Tue Apr 26 22:01:40 2011
New Revision: 1096927

URL: http://svn.apache.org/viewvc?rev=1096927&view=rev
Log:
Moving membuffer cache related configuration code from deep inside the FS
layer to the svn utilities where all other cache related code lives.
Details on the discussion can be found here:
http://svn.haxx.se/dev/archive-2011-04/0169.shtml

To minimize the risks of breaking builds on other platforms, library 
dependencies will be cleaned up in a follow-up commit.

* subversion/include/private/svn_fs_private.h
  (svn_fs__get_global_membuffer_cache): remove here
* subversion/include/private/svn_cache.h
  (svn_cache__get_global_membuffer_cache): rename and move it to here

* subversion/include/svn_fs.h
  (svn_fs_cache_config_t, svn_fs_get_cache_config, svn_fs_set_cache_config):
   remove here
* subversion/include/svn_cache_config.h
  (svn_cache_config_t, svn_get_cache_config, svn_set_cache_config):
   rename and move them to this new header file; adapt docstrings

* subversion/libsvn_fs_util/caching.c
  move to:
* subversion/libsvn_subr/svn_cache_config.c
  (svn_cache_config_t, svn_get_cache_config, svn_set_cache_config):
   rename

* subversion/libsvn_fs_fs/caching.c
  (svn_fs_fs__initialize_caches, svn_fs_fs__initialize_txn_caches):
   adapt to renamed API functions

* subversion/libsvn_ra/ra_loader.c
  (svn_ra_initialize): remove cache config code
* subversion/svn/main.c
  (main): move it here and adapt it to renamed API

* subversion/svnadmin/main.c
  (#includes): include svn_cache_config.h instead of svn_fs.h
  (main): adapt to renamed API functions and structures
* subversion/svnserve/main.c
  (#includes, main): dito


* build.conf
  (libsvn_subr): add the new svn_cache_config.h header to the DLL exports

Added:
    subversion/trunk/subversion/include/svn_cache_config.h
      - copied, changed from r1095795, subversion/trunk/subversion/include/svn_fs.h
    subversion/trunk/subversion/libsvn_subr/svn_cache_config.c
      - copied, changed from r1095795, subversion/trunk/subversion/libsvn_fs_util/caching.c
Removed:
    subversion/trunk/subversion/libsvn_fs_util/caching.c
Modified:
    subversion/trunk/build.conf
    subversion/trunk/subversion/include/private/svn_cache.h
    subversion/trunk/subversion/include/private/svn_fs_private.h
    subversion/trunk/subversion/include/svn_fs.h
    subversion/trunk/subversion/libsvn_fs_fs/caching.c
    subversion/trunk/subversion/libsvn_ra/ra_loader.c
    subversion/trunk/subversion/svn/main.c
    subversion/trunk/subversion/svnadmin/main.c
    subversion/trunk/subversion/svnserve/main.c

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1096927&r1=1096926&r2=1096927&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Apr 26 22:01:40 2011
@@ -318,10 +318,10 @@ path = subversion/libsvn_subr
 libs = aprutil apriconv apr xml zlib apr_memcache sqlite
 msvc-libs = advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib
 msvc-export = 
-        svn_auth.h svn_base64.h svn_checksum.h svn_cmdline.h svn_compat.h
-        svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h svn_error.h
-        svn_hash.h svn_io.h svn_iter.h svn_md5.h svn_mergeinfo.h svn_nls.h
-        svn_opt.h svn_path.h svn_pools.h svn_props.h svn_quoprint.h 
+        svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
+        svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h 
+        svn_error.h svn_hash.h svn_io.h svn_iter.h svn_md5.h svn_mergeinfo.h 
+        svn_nls.h svn_opt.h svn_path.h svn_pools.h svn_props.h svn_quoprint.h 
         svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h
         svn_utf.h svn_version.h svn_xml.h 
         private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h

Modified: subversion/trunk/subversion/include/private/svn_cache.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_cache.h?rev=1096927&r1=1096926&r2=1096927&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_cache.h (original)
+++ subversion/trunk/subversion/include/private/svn_cache.h Tue Apr 26 22:01:40 2011
@@ -440,6 +440,16 @@ 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);
+
+/* Access the process-global (singleton) membuffer cache. The first call
+ * will automatically allocate the cache using the current cache config.
+ * NULL will be returned if the desired cache size is 0.
+ *
+ * @since New in 1.7.
+ */
+struct svn_membuffer_t *
+svn_cache__get_global_membuffer_cache(void);
+
 /** @} */
 
 

Modified: subversion/trunk/subversion/include/private/svn_fs_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fs_private.h?rev=1096927&r1=1096926&r2=1096927&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fs_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_fs_private.h Tue Apr 26 22:01:40 2011
@@ -58,15 +58,6 @@ extern "C" {
 apr_hash_t *
 svn_fs__access_get_lock_tokens(svn_fs_access_t *access_ctx);
 
-/* Access the process-global (singleton) membuffer cache. The first call
- * will automatically allocate the cache using the current cache config.
- * NULL will be returned if the desired cache size is 0.
- *
- * @since New in 1.7.
- */
-struct svn_membuffer_t *
-svn_fs__get_global_membuffer_cache(void);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */