зеркало из https://github.com/microsoft/git.git
diffcore-rename: simplify and accelerate register_rename_src()
register_rename_src() took pains to create an array in rename_src which was sorted by pathname of the contained diff_filepair. The sorting was entirely unnecessary since callers pass filepairs to us in sorted order. We can simply append to the end of the rename_src array, speeding up diffcore_rename() setup time. Also, note that I dropped the return type on the function since it was unconditionally discarded anyway. This patch is being submitted in a different order than its original development, but in a large rebase of many commits with lots of renames and with several optimizations to inexact rename detection, diffcore_rename() setup time was a sizeable chunk of overall runtime. This patch dropped execution time of rebasing 35 commits with lots of renames by 2% overall. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
ac14de13b2
Коммит
b970b4ef62
|
@ -76,36 +76,23 @@ static struct diff_rename_src {
|
|||
} *rename_src;
|
||||
static int rename_src_nr, rename_src_alloc;
|
||||
|
||||
static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
|
||||
static void register_rename_src(struct diff_filepair *p)
|
||||
{
|
||||
int first, last;
|
||||
struct diff_filespec *one = p->one;
|
||||
unsigned short score = p->score;
|
||||
/*
|
||||
* If we have multiple entries at the same path in the source tree
|
||||
* (an invalid tree, to be sure), avoid using more more than one
|
||||
* such entry in rename detection. Once upon a time, doing so
|
||||
* caused segfaults; see commit 25d5ea410f ("[PATCH] Redo
|
||||
* rename/copy detection logic.", 2005-05-24).
|
||||
*/
|
||||
if (rename_src_nr > 0 &&
|
||||
!strcmp(rename_src[rename_src_nr-1].p->one->path, p->one->path))
|
||||
return;
|
||||
|
||||
first = 0;
|
||||
last = rename_src_nr;
|
||||
while (last > first) {
|
||||
int next = first + ((last - first) >> 1);
|
||||
struct diff_rename_src *src = &(rename_src[next]);
|
||||
int cmp = strcmp(one->path, src->p->one->path);
|
||||
if (!cmp)
|
||||
return src;
|
||||
if (cmp < 0) {
|
||||
last = next;
|
||||
continue;
|
||||
}
|
||||
first = next+1;
|
||||
}
|
||||
|
||||
/* insert to make it at "first" */
|
||||
ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
|
||||
rename_src[rename_src_nr].p = p;
|
||||
rename_src[rename_src_nr].score = p->score;
|
||||
rename_src_nr++;
|
||||
if (first < rename_src_nr)
|
||||
MOVE_ARRAY(rename_src + first + 1, rename_src + first,
|
||||
rename_src_nr - first - 1);
|
||||
rename_src[first].p = p;
|
||||
rename_src[first].score = score;
|
||||
return &(rename_src[first]);
|
||||
}
|
||||
|
||||
static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
|
||||
|
|
Загрузка…
Ссылка в новой задаче