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 2014/06/24 14:16:10 UTC
svn commit: r1605064 - in /subversion/trunk/subversion/libsvn_fs_fs:
cached_data.c fs_fs.c id.c id.h low_level.c recovery.c
Author: stefan2
Date: Tue Jun 24 12:16:09 2014
New Revision: 1605064
URL: http://svn.apache.org/r1605064
Log:
Reduce the memory consumption of the FSFS ID parser.
In the past, fs_fs__id_t would contain string elements and therefore,
the incoming data got copied before being shopped and processed. Since
1.9 uses integers only, no copy is required anymore.
The incoming data is usually writable and disposable as well so we process
it directly. Only one caller doesn't already provide a writable buffer.
* subversion/libsvn_fs_fs/id.h
(svn_fs_fs__id_parse): Mark incoming DATA buffer as mutable and drop the
unnecessary LENGTH argument.
* subversion/libsvn_fs_fs/id.c
(svn_fs_fs__id_parse): Don't duplicate DATA, process it directly.
* subversion/libsvn_fs_fs/cached_data.c
(read_dir_entries): Update caller.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__get_node_origin): This is the only caller that needs to
duplicate the DATA buffer. It's only
invoked for very old repo formats.
* subversion/libsvn_fs_fs/low_level.c
(read_change,
svn_fs_fs__read_noderev): Update caller.
* subversion/libsvn_fs_fs/recovery.c
(recover_find_max_ids): Same.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/id.c
subversion/trunk/subversion/libsvn_fs_fs/id.h
subversion/trunk/subversion/libsvn_fs_fs/low_level.c
subversion/trunk/subversion/libsvn_fs_fs/recovery.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1605064&r1=1605063&r2=1605064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Tue Jun 24 12:16:09 2014
@@ -2406,7 +2406,7 @@ read_dir_entries(apr_array_header_t *ent
_("Directory entry corrupt in '%s'"),
svn_fs_fs__id_unparse(id, scratch_pool)->data);
- dirent->id = svn_fs_fs__id_parse(str, strlen(str), result_pool);
+ dirent->id = svn_fs_fs__id_parse(str, result_pool);
/* In incremental mode, update the hash; otherwise, write to the
* final array. Be sure to use hash keys that survive this iteration.
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1605064&r1=1605063&r2=1605064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Jun 24 12:16:09 2014
@@ -1747,8 +1747,9 @@ svn_fs_fs__get_node_origin(const svn_fs_
= apr_hash_get(node_origins, node_id_ptr, len);
if (origin_id_str)
- *origin_id = svn_fs_fs__id_parse(origin_id_str->data,
- origin_id_str->len, pool);
+ *origin_id = svn_fs_fs__id_parse(apr_pstrdup(pool,
+ origin_id_str->data),
+ pool);
}
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_fs_fs/id.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/id.c?rev=1605064&r1=1605063&r2=1605064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/id.c Tue Jun 24 12:16:09 2014
@@ -435,16 +435,11 @@ svn_fs_fs__id_copy(const svn_fs_id_t *so
svn_fs_id_t *
-svn_fs_fs__id_parse(const char *data,
- apr_size_t len,
+svn_fs_fs__id_parse(char *data,
apr_pool_t *pool)
{
fs_fs__id_t *id;
- char *data_copy, *str;
-
- /* Dup the ID data into POOL. Our returned ID will have references
- into this memory. */
- data_copy = apr_pstrmemdup(pool, data, len);
+ char *str;
/* Alloc a new svn_fs_id_t structure. */
id = apr_pcalloc(pool, sizeof(*id));
@@ -458,21 +453,21 @@ svn_fs_fs__id_parse(const char *data,
string.*/
/* Node Id */
- str = svn_cstring_tokenize(".", &data_copy);
+ str = svn_cstring_tokenize(".", &data);
if (str == NULL)
return NULL;
if (! part_parse(&id->private_id.node_id, str))
return NULL;
/* Copy Id */
- str = svn_cstring_tokenize(".", &data_copy);
+ str = svn_cstring_tokenize(".", &data);
if (str == NULL)
return NULL;
if (! part_parse(&id->private_id.copy_id, str))
return NULL;
/* Txn/Rev Id */
- str = svn_cstring_tokenize(".", &data_copy);
+ str = svn_cstring_tokenize(".", &data);
if (str == NULL)
return NULL;
@@ -485,13 +480,13 @@ svn_fs_fs__id_parse(const char *data,
id->private_id.txn_id.revision = SVN_INVALID_REVNUM;
id->private_id.txn_id.number = 0;
- data_copy = str + 1;
- str = svn_cstring_tokenize("/", &data_copy);
+ data = str + 1;
+ str = svn_cstring_tokenize("/", &data);
if (str == NULL)
return NULL;
id->private_id.rev_item.revision = SVN_STR_TO_REV(str);
- err = svn_cstring_atoi64(&val, data_copy);
+ err = svn_cstring_atoi64(&val, data);
if (err)
{
svn_error_clear(err);
Modified: subversion/trunk/subversion/libsvn_fs_fs/id.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/id.h?rev=1605064&r1=1605063&r2=1605064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/id.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/id.h Tue Jun 24 12:16:09 2014
@@ -149,10 +149,9 @@ svn_fs_id_t *svn_fs_fs__id_rev_create(co
svn_fs_id_t *svn_fs_fs__id_copy(const svn_fs_id_t *id,
apr_pool_t *pool);
-/* Return an ID resulting from parsing the string DATA (with length
- LEN), or NULL if DATA is an invalid ID string. */
-svn_fs_id_t *svn_fs_fs__id_parse(const char *data,
- apr_size_t len,
+/* Return an ID resulting from parsing the string DATA, or NULL if DATA is
+ an invalid ID string. *DATA will be modified / invalidated by this call. */
+svn_fs_id_t *svn_fs_fs__id_parse(char *data,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_fs_fs/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/low_level.c?rev=1605064&r1=1605063&r2=1605064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/low_level.c Tue Jun 24 12:16:09 2014
@@ -228,7 +228,7 @@ read_change(change_t **change_p,
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Invalid changes line in rev-file"));
- info->node_rev_id = svn_fs_fs__id_parse(str, strlen(str), result_pool);
+ info->node_rev_id = svn_fs_fs__id_parse(str, result_pool);
if (info->node_rev_id == NULL)
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Invalid changes line in rev-file"));
@@ -782,7 +782,7 @@ svn_fs_fs__read_noderev(node_revision_t
SVN_ERR(svn_stream_close(stream));
- noderev->id = svn_fs_fs__id_parse(value, strlen(value), result_pool);
+ noderev->id = svn_fs_fs__id_parse(value, result_pool);
noderev_id = value; /* for error messages later */
/* Read the type. */
@@ -839,8 +839,7 @@ svn_fs_fs__read_noderev(node_revision_t
/* Get the predecessor ID. */
value = svn_hash_gets(headers, HEADER_PRED);
if (value)
- noderev->predecessor_id = svn_fs_fs__id_parse(value, strlen(value),
- result_pool);
+ noderev->predecessor_id = svn_fs_fs__id_parse(value, result_pool);
/* Get the copyroot. */
value = svn_hash_gets(headers, HEADER_COPYROOT);
Modified: subversion/trunk/subversion/libsvn_fs_fs/recovery.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/recovery.c?rev=1605064&r1=1605063&r2=1605064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/recovery.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/recovery.c Tue Jun 24 12:16:09 2014
@@ -244,7 +244,7 @@ recover_find_max_ids(svn_fs_t *fs,
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Directory entry corrupt"));
- id = svn_fs_fs__id_parse(str, strlen(str), iterpool);
+ id = svn_fs_fs__id_parse(str, iterpool);
rev_item = svn_fs_fs__id_rev_item(id);
if (rev_item->revision != rev)