svn commit: r1072543 - in /subversion/branches/integrate-txdelta-caching/subversion: libsvn_fs_fs/caching.c svnadmin/main.c

[st...@apache.org]

Author: stefan2
Date: Sun Feb 20 10:15:20 2011
New Revision: 1072543

URL: http://svn.apache.org/viewvc?rev=1072543&view=rev
Log:
Fix the breakage caused by later renaming.

* subversion/libsvn_fs_fs/caching.c
  (svn_fs_fs__initialize_caches): adapt to later renaming
* subversion/svnadmin/main.c
  (main): dito plus there is no file handle cache, yet

Modified:
    subversion/branches/integrate-txdelta-caching/subversion/libsvn_fs_fs/caching.c
    subversion/branches/integrate-txdelta-caching/subversion/svnadmin/main.c

Modified: subversion/branches/integrate-txdelta-caching/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-txdelta-caching/subversion/libsvn_fs_fs/caching.c?rev=1072543&r1=1072542&r2=1072543&view=diff
==============================================================================
--- subversion/branches/integrate-txdelta-caching/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/branches/integrate-txdelta-caching/subversion/libsvn_fs_fs/caching.c Sun Feb 20 10:15:20 2011
@@ -206,12 +206,12 @@ svn_fs_fs__initialize_caches(svn_fs_t *f
             warn_on_cache_errors, fs, pool));
 
   /* if enabled, enable the txdelta window cache */
-  if (get_global_membuffer_cache() &&
-      svn_fs_fs__get_cache_config()->cache_txdeltas)
+  if (svn_fs__get_global_membuffer_cache() &&
+      svn_fs_get_cache_config()->cache_txdeltas)
     {
       SVN_ERR(svn_cache__create_membuffer_cache
                 (&(ffd->txdelta_window_cache),
-                 get_global_membuffer_cache(),
+                 svn_fs__get_global_membuffer_cache(),
                  svn_fs_fs__serialize_txdelta_window,
                  svn_fs_fs__deserialize_txdelta_window,
                  APR_HASH_KEY_STRING,

Modified: subversion/branches/integrate-txdelta-caching/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-txdelta-caching/subversion/svnadmin/main.c?rev=1072543&r1=1072542&r2=1072543&view=diff
==============================================================================
--- subversion/branches/integrate-txdelta-caching/subversion/svnadmin/main.c (original)
+++ subversion/branches/integrate-txdelta-caching/subversion/svnadmin/main.c Sun Feb 20 10:15:20 2011
@@ -1938,15 +1938,14 @@ main(int argc, const char *argv[])
   /* Configure FSFS caches for maximum efficiency with svnadmin.
    * Also, apply the respective command line parameters, if given. */
   {
-    svn_fs_fs__cache_config_t settings = *svn_fs_fs__get_cache_config();
+    svn_fs_cache_config_t settings = *svn_fs_get_cache_config();
 
     settings.cache_size = opt_state.memory_cache_size;
-    settings.file_handle_count = opt_state.open_file_count;
     settings.cache_fulltexts = subcommand->cmd_func == subcommand_load;
     settings.cache_txdeltas = TRUE;
     settings.single_threaded = TRUE;
 
-    svn_fs_fs__set_cache_config(&settings);
+    svn_fs_set_cache_config(&settings);
   }
 
   /* Run the subcommand. */