mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-24 14:58:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sender realigns chunks with generator during an --inplace copy

Browse Source 
when sending a sequence of zeros.
This commit is contained in:
Wayne Davison
2011-01-14 21:32:15 -08:00
parent 58a1c1a218
commit 580cffdec9
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
match.c
View File

@@ -237,10 +237,11 @@ static void hash_search(int f,struct sum_struct *s,
/* All the generator's chunks start at blength boundaries. */
while (aligned_offset < offset)
aligned_offset += s->blength;
if (offset == aligned_offset) {
if (offset == aligned_offset
|| (sum == 0 && l == s->blength && aligned_offset + l <= len)) {
int32 i2;
for (i2 = i; i2 >= 0; i2 = s->sums[i2].chain) {
if (s->sums[i2].offset != offset)
if (s->sums[i2].offset != aligned_offset)
continue;
if (i2 != i) {
if (sum != s->sums[i2].sum1
@@ -249,9 +250,26 @@ static void hash_search(int f,struct sum_struct *s,
break;
i = i2;
}
want_i = i;
if (offset != aligned_offset) {
/* We've matched some zeros in a spot that is also zeros
* further along in the basis file, if we find zeros ahead
* in the sender's file, we'll output enough literal data
* to re-align with the basis file, and get back to seeking
* instead of writing. */
map = (schar *)map_ptr(buf, aligned_offset, l);
sum = get_checksum1((char *)map, l);
if (sum != s->sums[i2].sum1)
break;
get_checksum2((char *)map, l, sum2);
if (memcmp(sum2, s->sums[i2].sum2, s->s2length) != 0)
break;
/* OK, we have a re-alignment match. Bump the offset
* forward to the new match point. */
offset = aligned_offset;
}
/* This chunk remained in the same spot in the old and new file. */
s->sums[i].flags |= SUMFLG_SAME_OFFSET;
want_i = i;
break;
}
}