On Thu, Sep 25, 2014 at 12:41 PM, Bert Huijben <bert@qqmail.nl> wrote:


> -----Original Message-----
> From: stefan2@apache.org [mailto:stefan2@apache.org]
> Sent: donderdag 25 september 2014 12:30
> To: commits@subversion.apache.org
> Subject: svn commit: r1627502 - in /subversion/trunk:
> subversion/libsvn_fs_base/fs.c subversion/libsvn_fs_fs/cached_data.c
> subversion/libsvn_fs_x/cached_data.c tools/dev/fsfs-access-map.c
>
> Author: stefan2
> Date: Thu Sep 25 10:29:29 2014
> New Revision: 1627502
>
> URL: http://svn.apache.org/r1627502
> Log:
> As per convention, sub-pools shall be named "subpool".

[...]
> Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cac
> hed_data.c?rev=1627502&r1=1627501&r2=1627502&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
> +++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Thu Sep 25
> 10:29:29 2014
> @@ -772,7 +772,7 @@ svn_fs_x__rep_chain_length(int *chain_le
>    svn_revnum_t shard_size = ffd->max_files_per_dir
>                            ? ffd->max_files_per_dir
>                            : 1;
> -  apr_pool_t *sub_pool = svn_pool_create(pool);
> +  apr_pool_t *subpool = svn_pool_create(pool);
>    svn_boolean_t is_delta = FALSE;
>    int count = 0;
>    int shards = 1;
> @@ -806,7 +806,7 @@ svn_fs_x__rep_chain_length(int *chain_le
>                                      &file_hint,
>                                      &base_rep,
>                                      fs,
> -                                    sub_pool));
> +                                    subpool));
>
>        base_rep.id.change_set
>          = svn_fs_x__change_set_by_rev(header->base_revision);
> @@ -818,14 +818,14 @@ svn_fs_x__rep_chain_length(int *chain_le
>        if (count % 16 == 0)
>          {
>            file_hint = NULL;
> -          svn_pool_clear(sub_pool);
> +          svn_pool_clear(subpool);
>          }
>      }
>    while (is_delta && base_rep.id.change_set);

It looks like this subpool should really be called iterpool.

Hm, yah. As soon as r1605197 etc. gets ported from FSFS to FSX,
the code will actually use two pools.

For now, r1627946 renames the pool and explains how we use it.

-- Stefan^2.