You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2014/09/25 12:41:17 UTC
RE: 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
> -----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".
>
> * subversion/libsvn_fs_base/fs.c
> (svn_fs_base__clean_logs): s/sub_pool/subpool/g.
>
> * subversion/libsvn_fs_fs/cached_data.c
> (svn_fs_fs__rep_chain_length): Same.
>
> * subversion/libsvn_fs_x/cached_data.c
> (svn_fs_x__rep_chain_length): Same.
>
> * tools/dev/fsfs-access-map.c
> (open_file): Same.
>
> Modified:
> subversion/trunk/subversion/libsvn_fs_base/fs.c
> subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
> subversion/trunk/subversion/libsvn_fs_x/cached_data.c
> subversion/trunk/tools/dev/fsfs-access-map.c
>
> Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base
> /fs.c?rev=1627502&r1=1627501&r2=1627502&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
> +++ subversion/trunk/subversion/libsvn_fs_base/fs.c Thu Sep 25 10:29:29
> 2014
> @@ -1084,7 +1084,7 @@ svn_fs_base__clean_logs(const char *live
>
> { /* Process unused logs from live area */
> int idx;
> - apr_pool_t *sub_pool = svn_pool_create(pool);
> + apr_pool_t *subpool = svn_pool_create(pool);
>
> /* Process log files. */
> for (idx = 0; idx < logfiles->nelts; idx++)
> @@ -1093,9 +1093,9 @@ svn_fs_base__clean_logs(const char *live
> const char *live_log_path;
> const char *backup_log_path;
>
> - svn_pool_clear(sub_pool);
> - live_log_path = svn_dirent_join(live_path, log_file, sub_pool);
> - backup_log_path = svn_dirent_join(backup_path, log_file, sub_pool);
> + svn_pool_clear(subpool);
> + live_log_path = svn_dirent_join(live_path, log_file, subpool);
> + backup_log_path = svn_dirent_join(backup_path, log_file, subpool);
>
> { /* Compare files. No point in using MD5 and wasting CPU cycles as we
> got full copies of both logs */
> @@ -1112,17 +1112,17 @@ svn_fs_base__clean_logs(const char *live
> SVN_ERR(svn_io_files_contents_same_p(&files_match,
> live_log_path,
> backup_log_path,
> - sub_pool));
> + subpool));
>
> /* If log files do not match, go to the next log file. */
> if (!files_match)
> continue;
> }
>
> - SVN_ERR(svn_io_remove_file2(live_log_path, FALSE, sub_pool));
> + SVN_ERR(svn_io_remove_file2(live_log_path, FALSE, subpool));
> }
>
> - svn_pool_destroy(sub_pool);
> + svn_pool_destroy(subpool);
> }
>
> return SVN_NO_ERROR;
>
> Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/ca
> ched_data.c?rev=1627502&r1=1627501&r2=1627502&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
> +++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Thu Sep 25
> 10:29:29 2014
> @@ -979,7 +979,7 @@ svn_fs_fs__rep_chain_length(int *chain_l
> svn_revnum_t shard_size = ffd->max_files_per_dir
> ? ffd->max_files_per_dir
> : 1;
> - apr_pool_t *sub_pool = svn_pool_create(scratch_pool);
> + apr_pool_t *subpool = svn_pool_create(scratch_pool);
> apr_pool_t *iterpool = svn_pool_create(scratch_pool);
> svn_boolean_t is_delta = FALSE;
> int count = 0;
> @@ -1015,7 +1015,7 @@ svn_fs_fs__rep_chain_length(int *chain_l
> &file_hint,
> &base_rep,
> fs,
> - sub_pool,
> + subpool,
> iterpool));
>
> base_rep.revision = header->base_revision;
> @@ -1028,14 +1028,14 @@ svn_fs_fs__rep_chain_length(int *chain_l
> if (count % 16 == 0)
> {
> file_hint = NULL;
> - svn_pool_clear(sub_pool);
> + svn_pool_clear(subpool);
> }
> }
> while (is_delta && base_rep.revision);
>
> *chain_length = count;
> *shard_count = shards;
> - svn_pool_destroy(sub_pool);
> + svn_pool_destroy(subpool);
> svn_pool_destroy(iterpool);
>
> return SVN_NO_ERROR;
>
> 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.
Thanks,
Bert
Re: 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
Posted by Stefan Fuhrmann <st...@wandisco.com>.
On Thu, Sep 25, 2014 at 12:41 PM, Bert Huijben <be...@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.
Re: 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
Posted by Stefan Fuhrmann <st...@wandisco.com>.
On Thu, Sep 25, 2014 at 12:41 PM, Bert Huijben <be...@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.