admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge-ort: store filepairs and filespecs in our mem_pool

Browse Source 
For the testcases mentioned in commit 557ac0350d ("merge-ort: begin
performance work; instrument with trace2_region_* calls", 2020-10-28),
this change improves the performance as follows:

                            Before                  After
    no-renames:       198.1 ms ±  2.6 ms     198.5 ms ±  3.4 ms
    mega-renames:     715.8 ms ±  4.0 ms     679.1 ms ±  5.6 ms
    just-one-mega:    276.8 ms ±  4.2 ms     271.9 ms ±  2.8 ms

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2021-07-30 11:47:42 +00:00
committed by Junio C Hamano
parent a8791ef649
commit f239fff4c1
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
diffcore-rename.c
View File

@@ -1334,7 +1334,6 @@ static void free_filespec_data(struct diff_filespec *spec)
diff_free_filespec_data(spec);
}
MAYBE_UNUSED
static void pool_free_filespec(struct mem_pool *pool,
struct diff_filespec *spec)
{
@@ -1351,7 +1350,6 @@ static void pool_free_filespec(struct mem_pool *pool,
free_filespec_data(spec);
}
MAYBE_UNUSED
void pool_diff_free_filepair(struct mem_pool *pool,
struct diff_filepair *p)
{
@@ -1370,6 +1368,7 @@ void pool_diff_free_filepair(struct mem_pool *pool,
}
void diffcore_rename_extended(struct diff_options *options,
struct mem_pool *pool,
struct strintmap *relevant_sources,
struct strintmap *dirs_removed,
struct strmap *dir_rename_count,
@@ -1683,7 +1682,7 @@ void diffcore_rename_extended(struct diff_options *options,
pair_to_free = p;
if (pair_to_free)
diff_free_filepair(pair_to_free);
pool_diff_free_filepair(pool, pair_to_free);
}
diff_debug_queue("done copying original", &outq);
@@ -1693,7 +1692,7 @@ void diffcore_rename_extended(struct diff_options *options,
for (i = 0; i < rename_dst_nr; i++)
if (rename_dst[i].filespec_to_free)
free_filespec(rename_dst[i].filespec_to_free);
pool_free_filespec(pool, rename_dst[i].filespec_to_free);
cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
FREE_AND_NULL(rename_dst);
@@ -1710,5 +1709,5 @@ void diffcore_rename_extended(struct diff_options *options,
void diffcore_rename(struct diff_options *options)
{
diffcore_rename_extended(options, NULL, NULL, NULL, NULL);
diffcore_rename_extended(options, NULL, NULL, NULL, NULL, NULL);
}