You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/10/21 15:27:14 UTC
svn commit: r1709830 - in
/subversion/branches/move-tracking-2/subversion/libsvn_delta: branch.c
branch_private.h
Author: julianfoad
Date: Wed Oct 21 13:27:13 2015
New Revision: 1709830
URL: http://svn.apache.org/viewvc?rev=1709830&view=rev
Log:
On the 'move-tracking-2' branch: Remove special scratch pool handling from
branch txn and branch state classes, for simplicity and generality.
* subversion/libsvn_delta/branch_private.h,
(svn_vtable_priv_t): Remove the scratch pool.
* subversion/libsvn_delta/branch.c
(...all methods...): Use the passed-in scratch pool instead.
(svn_branch_txn_create,
svn_branch_state_create): Remove initialization of the scratch pool.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1709830&r1=1709829&r2=1709830&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Wed Oct 21 13:27:13 2015
@@ -249,8 +249,7 @@ svn_branch_txn_new_eid(svn_branch_txn_t
{
SVN_ERR(txn->vtable->new_eid(txn,
new_eid_p,
- txn->vtable->vpriv.scratch_pool));
- svn_pool_clear(txn->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -268,8 +267,7 @@ svn_branch_txn_open_branch(svn_branch_tx
new_branch_p,
predecessor, outer_branch_id, outer_eid,
root_eid, result_pool,
- txn->vtable->vpriv.scratch_pool));
- svn_pool_clear(txn->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -285,8 +283,7 @@ svn_branch_txn_branch(svn_branch_txn_t *
SVN_ERR(txn->vtable->branch(txn,
new_branch_p,
from, outer_branch_id, outer_eid, result_pool,
- txn->vtable->vpriv.scratch_pool));
- svn_pool_clear(txn->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -295,8 +292,7 @@ svn_branch_txn_sequence_point(svn_branch
apr_pool_t *scratch_pool)
{
SVN_ERR(txn->vtable->sequence_point(txn,
- txn->vtable->vpriv.scratch_pool));
- svn_pool_clear(txn->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -312,7 +308,6 @@ svn_branch_txn_create(const svn_branch_t
txn->vtable->vpriv.cancel_func = cancel_func;
txn->vtable->vpriv.cancel_baton = cancel_baton;
- txn->vtable->vpriv.scratch_pool = svn_pool_create(result_pool);
#ifdef ENABLE_ORDERING_CHECK
txn->vtable->vpriv.within_callback = FALSE;
@@ -1027,8 +1022,7 @@ svn_branch_state_alter_one(svn_branch_st
{
SVN_ERR(branch->vtable->alter_one(branch,
eid, new_parent_eid, new_name, new_payload,
- branch->vtable->vpriv.scratch_pool));
- svn_pool_clear(branch->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -1041,8 +1035,7 @@ svn_branch_state_copy_tree(svn_branch_st
{
SVN_ERR(branch->vtable->copy_tree(branch,
src_el_rev, new_parent_eid, new_name,
- branch->vtable->vpriv.scratch_pool));
- svn_pool_clear(branch->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -1053,8 +1046,7 @@ svn_branch_state_delete_one(svn_branch_s
{
SVN_ERR(branch->vtable->delete_one(branch,
eid,
- branch->vtable->vpriv.scratch_pool));
- svn_pool_clear(branch->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -1063,8 +1055,7 @@ svn_branch_state_purge(svn_branch_state_
apr_pool_t *scratch_pool)
{
SVN_ERR(branch->vtable->purge(branch,
- branch->vtable->vpriv.scratch_pool));
- svn_pool_clear(branch->vtable->vpriv.scratch_pool); /* ### assumes no recursion */
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -1080,7 +1071,6 @@ svn_branch_state_create(const svn_branch
b->vtable->vpriv.cancel_func = cancel_func;
b->vtable->vpriv.cancel_baton = cancel_baton;
- b->vtable->vpriv.scratch_pool = svn_pool_create(result_pool);
#ifdef ENABLE_ORDERING_CHECK
b->vtable->vpriv.within_callback = FALSE;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h?rev=1709830&r1=1709829&r2=1709830&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h Wed Oct 21 13:27:13 2015
@@ -41,9 +41,6 @@ typedef struct svn_vtable_priv_t
svn_cancel_func_t cancel_func;
void *cancel_baton;
- /* This pool is used as the scratch_pool for all callbacks. */
- apr_pool_t *scratch_pool;
-
#ifdef ENABLE_ORDERING_CHECK
svn_boolean_t within_callback;
svn_boolean_t finished;