Skip to content

Commit

Permalink
xdiff: optimise for no whitespace difference when ignoring whitespace.
Browse files Browse the repository at this point in the history
In xdl_recmatch, do the memcmp to check if the two lines are equal before
checking if whitespace flags are set.  If the lines are identical, then
there is no need to check if they differ only in whitespace.
This makes the common case (there is no whitespace difference) faster.
It costs the case where lines are the same length and contain
whitespace differences, but the common case is more than 20% faster.

Signed-off-by: Dylan Reid <dgreid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Dylan Reid authored and Junio C Hamano committed Jul 6, 2010
1 parent 6b09778 commit b4cf0f1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion xdiff/xutils.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
{
int i1, i2;

if (s1 == s2 && !memcmp(l1, l2, s1))
return 1;
if (!(flags & XDF_WHITESPACE_FLAGS))
return s1 == s2 && !memcmp(l1, l2, s1);
return 0;

i1 = 0;
i2 = 0;
Expand Down

0 comments on commit b4cf0f1

Please sign in to comment.