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 2015/02/09 18:09:09 UTC

svn commit: r1658468 - in /subversion/branches/fsx-1.10/subversion/libsvn_fs_x: caching.c dag_cache.h tree.c tree.h

Author: stefan2
Date: Mon Feb  9 17:09:08 2015
New Revision: 1658468

URL: http://svn.apache.org/r1658468
Log:
On the fsx-1.10 branch: Begin moving the DAG traversal and node caching
logic into a separate file.

This patch merely introduces a new header and moves a first declaration
there.  Step-by-step others will follow with renames and caller updates
and their implementation will only be moved as the last step.

* subversion/libsvn_fs_x/dag_cache.h
  (): New header file.
  (svn_fs_x__create_dag_cache): Move declaration here.

* subversion/libsvn_fs_x/tree.h
  (svn_fs_x__create_dag_cache): Remove here.

* subversion/libsvn_fs_x/caching.c
  (): Update #includes.

* subversion/libsvn_fs_x/tree.c
  (): Same.

Added:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h   (with props)
Modified:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/caching.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.h

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/caching.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/caching.c?rev=1658468&r1=1658467&r2=1658468&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/caching.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/caching.c Mon Feb  9 17:09:08 2015
@@ -24,7 +24,7 @@
 #include "fs_x.h"
 #include "id.h"
 #include "dag.h"
-#include "tree.h"
+#include "dag_cache.h"
 #include "index.h"
 #include "changes.h"
 #include "noderevs.h"

Added: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h?rev=1658468&view=auto
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h (added)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h Mon Feb  9 17:09:08 2015
@@ -0,0 +1,40 @@
+/* dag_cache.h : Interface to the DAG walker and node cache.
+ *
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ */
+
+#ifndef SVN_LIBSVN_FS_X_DAG_CACHE_H
+#define SVN_LIBSVN_FS_X_DAG_CACHE_H
+
+#include "svn_fs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* In RESULT_POOL, create an instance of a DAG node cache. */
+svn_fs_x__dag_cache_t*
+svn_fs_x__create_dag_cache(apr_pool_t *result_pool);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_LIBSVN_FS_X_DAG_CACHE_H */

Propchange: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.h
------------------------------------------------------------------------------
    svn:eolstyle = native

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c?rev=1658468&r1=1658467&r2=1658468&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c Mon Feb  9 17:09:08 2015
@@ -53,6 +53,7 @@
 
 #include "fs.h"
 #include "dag.h"
+#include "dag_cache.h"
 #include "lock.h"
 #include "tree.h"
 #include "fs_x.h"

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.h?rev=1658468&r1=1658467&r2=1658468&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.h Mon Feb  9 17:09:08 2015
@@ -31,10 +31,6 @@ extern "C" {
 
 
 
-/* In RESULT_POOL, create an instance of a DAG node 1st level cache. */
-svn_fs_x__dag_cache_t*
-svn_fs_x__create_dag_cache(apr_pool_t *result_pool);
-
 /* Set *ROOT_P to the root directory of revision REV in filesystem FS.
    Allocate the structure in POOL. */
 svn_error_t *