*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2008 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
-extern int verbose;
-extern int do_progress;
extern int checksum_seed;
extern int append_mode;
extern struct stats stats;
-#define TABLESIZE (1<<16)
+#define TRADITIONAL_TABLESIZE (1<<16)
+static uint32 tablesize;
static int32 *hash_table;
#define SUM2HASH2(s1,s2) (((s1) + (s2)) & 0xFFFF)
#define SUM2HASH(sum) SUM2HASH2((sum)&0xFFFF,(sum)>>16)
+#define BIG_SUM2HASH(sum) ((sum)%tablesize)
+
static void build_hash_table(struct sum_struct *s)
{
+ static uint32 alloc_size;
int32 i;
- if (!hash_table) {
- hash_table = new_array(int32, TABLESIZE);
+ /* Dynamically calculate the hash table size so that the hash load
+ * for big files is about 80%. A number greater than the traditional
+ * size must be odd or s2 will not be able to span the entire set. */
+ tablesize = (uint32)(s->count/8) * 10 + 11;
+ if (tablesize < TRADITIONAL_TABLESIZE)
+ tablesize = TRADITIONAL_TABLESIZE;
+ if (tablesize > alloc_size || tablesize < alloc_size - 16*1024) {
+ if (hash_table)
+ free(hash_table);
+ hash_table = new_array(int32, tablesize);
if (!hash_table)
out_of_memory("build_hash_table");
+ alloc_size = tablesize;
}
- memset(hash_table, 0xFF, TABLESIZE * sizeof hash_table[0]);
+ memset(hash_table, 0xFF, tablesize * sizeof hash_table[0]);
- for (i = 0; i < s->count; i++) {
- uint32 t = SUM2HASH(s->sums[i].sum1);
- s->sums[i].chain = hash_table[t];
- hash_table[t] = i;
+ if (tablesize == TRADITIONAL_TABLESIZE) {
+ for (i = 0; i < s->count; i++) {
+ uint32 t = SUM2HASH(s->sums[i].sum1);
+ s->sums[i].chain = hash_table[t];
+ hash_table[t] = i;
+ }
+ } else {
+ for (i = 0; i < s->count; i++) {
+ uint32 t = BIG_SUM2HASH(s->sums[i].sum1);
+ s->sums[i].chain = hash_table[t];
+ hash_table[t] = i;
+ }
}
}
static void matched(int f, struct sum_struct *s, struct map_struct *buf,
OFF_T offset, int32 i)
{
- int32 n = offset - last_match; /* max value: block_size (int32) */
+ int32 n = (int32)(offset - last_match); /* max value: block_size (int32) */
int32 j;
- if (verbose > 2 && i >= 0) {
+ if (DEBUG_GTE(CHKSUM, 2) && i >= 0) {
rprintf(FINFO,
"match at %.0f last_match=%.0f j=%d len=%ld n=%ld\n",
(double)offset, (double)last_match, i,
else
last_match = offset;
- if (buf && do_progress)
+ if (buf && INFO_GTE(PROGRESS, 1))
show_progress(last_match, buf->file_size);
}
static void hash_search(int f,struct sum_struct *s,
struct map_struct *buf, OFF_T len)
{
- OFF_T offset, end, backup;
- int32 k, want_i;
+ OFF_T offset, end;
+ int32 k, want_i, backup;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
int more;
* coding of the output to work more efficiently. */
want_i = 0;
- if (verbose > 2) {
+ if (DEBUG_GTE(CHKSUM, 2)) {
rprintf(FINFO, "hash search b=%ld len=%.0f\n",
(long)s->blength, (double)len);
}
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
- if (verbose > 3)
+ if (DEBUG_GTE(CHKSUM, 3))
rprintf(FINFO, "sum=%.8x k=%ld\n", sum, (long)k);
offset = 0;
end = len + 1 - s->sums[s->count-1].len;
- if (verbose > 3) {
+ if (DEBUG_GTE(CHKSUM, 3)) {
rprintf(FINFO, "hash search s->blength=%ld len=%.0f count=%.0f\n",
(long)s->blength, (double)len, (double)s->count);
}
int done_csum2 = 0;
int32 i;
- if (verbose > 4) {
+ if (DEBUG_GTE(CHKSUM, 4)) {
rprintf(FINFO, "offset=%.0f sum=%04x%04x\n",
(double)offset, s2 & 0xFFFF, s1 & 0xFFFF);
}
- i = hash_table[SUM2HASH2(s1,s2)];
- if (i < 0)
- goto null_hash;
+ if (tablesize == TRADITIONAL_TABLESIZE) {
+ if ((i = hash_table[SUM2HASH2(s1,s2)]) < 0)
+ goto null_hash;
+ sum = (s1 & 0xffff) | (s2 << 16);
+ } else {
+ sum = (s1 & 0xffff) | (s2 << 16);
+ if ((i = hash_table[BIG_SUM2HASH(sum)]) < 0)
+ goto null_hash;
+ }
- sum = (s1 & 0xffff) | (s2 << 16);
hash_hits++;
do {
int32 l;
&& !(s->sums[i].flags & SUMFLG_SAME_OFFSET))
continue;
- if (verbose > 3) {
+ if (DEBUG_GTE(CHKSUM, 3)) {
rprintf(FINFO,
"potential match at %.0f i=%ld sum=%08x\n",
(double)offset, (long)i, sum);
} while ((i = s->sums[i].chain) >= 0);
null_hash:
- backup = offset - last_match;
+ backup = (int32)(offset - last_match);
/* We sometimes read 1 byte prior to last_match... */
if (backup < 0)
backup = 0;
**/
void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
{
- char file_sum[MD4_SUM_LENGTH];
+ char file_sum[MAX_DIGEST_LEN];
+ int sum_len;
last_match = 0;
false_alarms = 0;
sum_init(checksum_seed);
- if (append_mode) {
- OFF_T j = 0;
- for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
- if (buf && do_progress)
- show_progress(last_match, buf->file_size);
- sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
- CHUNK_SIZE);
- last_match = j;
- }
- if (last_match < s->flength) {
- int32 len = s->flength - last_match;
- if (buf && do_progress)
- show_progress(last_match, buf->file_size);
- sum_update(map_ptr(buf, last_match, len), len);
- last_match = s->flength;
+ if (append_mode > 0) {
+ if (append_mode == 2) {
+ OFF_T j = 0;
+ for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
+ if (buf && INFO_GTE(PROGRESS, 1))
+ show_progress(last_match, buf->file_size);
+ sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
+ CHUNK_SIZE);
+ last_match = j;
+ }
+ if (last_match < s->flength) {
+ int32 n = (int32)(s->flength - last_match);
+ if (buf && INFO_GTE(PROGRESS, 1))
+ show_progress(last_match, buf->file_size);
+ sum_update(map_ptr(buf, last_match, n), n);
+ }
}
+ last_match = s->flength;
s->count = 0;
}
if (len > 0 && s->count > 0) {
build_hash_table(s);
- if (verbose > 2)
+ if (DEBUG_GTE(CHKSUM, 2))
rprintf(FINFO,"built hash table\n");
- hash_search(f,s,buf,len);
+ hash_search(f, s, buf, len);
- if (verbose > 2)
+ if (DEBUG_GTE(CHKSUM, 2))
rprintf(FINFO,"done hash search\n");
} else {
OFF_T j;
matched(f, s, buf, len, -1);
}
- sum_end(file_sum);
+ sum_len = sum_end(file_sum);
/* If we had a read error, send a bad checksum. */
if (buf && buf->status != 0)
file_sum[0]++;
- if (verbose > 2)
+ if (DEBUG_GTE(CHKSUM, 2))
rprintf(FINFO,"sending file_sum\n");
- write_buf(f,file_sum,MD4_SUM_LENGTH);
+ write_buf(f, file_sum, sum_len);
- if (verbose > 2)
+ if (DEBUG_GTE(CHKSUM, 2))
rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",
false_alarms, hash_hits, matches);
void match_report(void)
{
- if (verbose <= 1)
+ if (!DEBUG_GTE(CHKSUM, 1))
return;
rprintf(FINFO,