*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*/
#include "rsync.h"
+#include "inums.h"
extern int checksum_seed;
extern int append_mode;
if (DEBUG_GTE(DELTASUM, 2) && i >= 0) {
rprintf(FINFO,
"match at %s last_match=%s j=%d len=%ld n=%ld\n",
- big_num(offset, 0), big_num(last_match, 0), i,
+ big_num(offset), big_num(last_match), i,
(long)s->sums[i].len, (long)n);
}
static void hash_search(int f,struct sum_struct *s,
struct map_struct *buf, OFF_T len)
{
- OFF_T offset, end;
+ OFF_T offset, aligned_offset, end;
int32 k, want_i, backup;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
if (DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO, "hash search b=%ld len=%s\n",
- (long)s->blength, big_num(len, 0));
+ (long)s->blength, big_num(len));
}
k = (int32)MIN(len, (OFF_T)s->blength);
if (DEBUG_GTE(DELTASUM, 3))
rprintf(FINFO, "sum=%.8x k=%ld\n", sum, (long)k);
- offset = 0;
+ offset = aligned_offset = 0;
end = len + 1 - s->sums[s->count-1].len;
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO, "hash search s->blength=%ld len=%s count=%s\n",
- (long)s->blength, big_num(len, 0), big_num(s->count, 0));
+ (long)s->blength, big_num(len), big_num(s->count));
}
do {
if (DEBUG_GTE(DELTASUM, 4)) {
rprintf(FINFO, "offset=%s sum=%04x%04x\n",
- big_num(offset, 0), s2 & 0xFFFF, s1 & 0xFFFF);
+ big_num(offset), s2 & 0xFFFF, s1 & 0xFFFF);
}
if (tablesize == TRADITIONAL_TABLESIZE) {
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
"potential match at %s i=%ld sum=%08x\n",
- big_num(offset, 0), (long)i, sum);
+ big_num(offset), (long)i, sum);
}
if (!done_csum2) {
/* When updating in-place, the best possible match is
* one with an identical offset, so we prefer that over
- * the following want_i optimization. */
+ * the adjacent want_i optimization. */
if (updating_basis_file) {
- int32 i2;
- for (i2 = i; i2 >= 0; i2 = s->sums[i2].chain) {
- if (s->sums[i2].offset != offset)
- continue;
- if (i2 != i) {
- if (sum != s->sums[i2].sum1)
- break;
- if (memcmp(sum2, s->sums[i2].sum2,
- s->s2length) != 0)
- break;
- i = i2;
+ /* All the generator's chunks start at blength boundaries. */
+ while (aligned_offset < offset)
+ aligned_offset += s->blength;
+ if (offset == aligned_offset) {
+ int32 i2;
+ for (i2 = i; i2 >= 0; i2 = s->sums[i2].chain) {
+ if (s->sums[i2].offset != offset)
+ continue;
+ if (i2 != i) {
+ if (sum != s->sums[i2].sum1
+ || memcmp(sum2, s->sums[i2].sum2, s->s2length) != 0)
+ break;
+ i = i2;
+ }
+ /* This chunk remained in the same spot in the old and new file. */
+ s->sums[i].flags |= SUMFLG_SAME_OFFSET;
+ want_i = i;
}
- /* This chunk was at the same offset on
- * both the sender and the receiver. */
- s->sums[i].flags |= SUMFLG_SAME_OFFSET;
- goto set_want_i;
}
}
* will be happy */
i = want_i;
}
- set_want_i:
want_i = i + 1;
matched(f,s,buf,offset,i);
rprintf(FINFO,
"total: matches=%d hash_hits=%d false_alarms=%d data=%s\n",
total_matches, total_hash_hits, total_false_alarms,
- big_num(stats.literal_data, 0));
+ big_num(stats.literal_data));
}