*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2007 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 verbose;
-extern int do_progress;
extern int checksum_seed;
extern int append_mode;
+extern int checksum_len;
int updating_basis_file;
+char sender_file_sum[MAX_DIGEST_LEN];
static int false_alarms;
static int hash_hits;
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)
-static int32 build_hash_table(struct sum_struct *s, int32 start)
-{
- int32 i, end = s->count;
+#define BIG_SUM2HASH(sum) ((sum)%tablesize)
- if (!hash_table) {
- hash_table = new_array(int32, TABLESIZE);
+static void build_hash_table(struct sum_struct *s)
+{
+ static uint32 alloc_size;
+ int32 i;
+
+ /* 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]);
-
- if (end - start > TABLESIZE*8/10)
- end = start + TABLESIZE*8/10;
-
- for (i = start; i < end; i++) {
- uint32 t = SUM2HASH(s->sums[i].sum1);
- s->sums[i].chain = hash_table[t];
- hash_table[t] = i;
- }
+ memset(hash_table, 0xFF, tablesize * sizeof hash_table[0]);
- if (verbose > 2) {
- rprintf(FINFO, "built hash table for entries %ld - %ld\n",
- (long)start, (long)end - 1);
+ 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;
+ }
}
-
- return end;
}
int32 n = (int32)(offset - last_match); /* max value: block_size (int32) */
int32 j;
- if (verbose > 2 && i >= 0) {
+ if (DEBUG_GTE(DELTASUM, 2) && i >= 0) {
rprintf(FINFO,
- "match at %.0f last_match=%.0f j=%d len=%ld n=%ld\n",
- (double)offset, (double)last_match, i,
+ "match at %s last_match=%s j=%d len=%ld n=%ld\n",
+ big_num(offset), big_num(last_match), i,
(long)s->sums[i].len, (long)n);
}
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, reset = 0;
- int32 k, want_i, backup, sum_pos = 0;
+ 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) {
- rprintf(FINFO, "hash search b=%ld len=%.0f\n",
- (long)s->blength, (double)len);
+ if (DEBUG_GTE(DELTASUM, 2)) {
+ rprintf(FINFO, "hash search b=%ld len=%s\n",
+ (long)s->blength, big_num(len));
}
k = (int32)MIN(len, (OFF_T)s->blength);
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
- if (verbose > 3)
+ if (DEBUG_GTE(DELTASUM, 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) {
- rprintf(FINFO, "hash search s->blength=%ld len=%.0f count=%.0f\n",
- (long)s->blength, (double)len, (double)s->count);
+ if (DEBUG_GTE(DELTASUM, 3)) {
+ rprintf(FINFO, "hash search s->blength=%ld len=%s count=%s\n",
+ (long)s->blength, big_num(len), big_num(s->count));
}
do {
int done_csum2 = 0;
int32 i;
- if (offset >= reset) {
- sum_pos = build_hash_table(s, sum_pos);
- reset = sum_pos * s->blength;
+ if (DEBUG_GTE(DELTASUM, 4)) {
+ rprintf(FINFO, "offset=%s sum=%04x%04x\n",
+ big_num(offset), s2 & 0xFFFF, s1 & 0xFFFF);
}
- if (verbose > 4) {
- rprintf(FINFO, "offset=%.0f sum=%04x%04x\n",
- (double)offset, s2 & 0xFFFF, s1 & 0xFFFF);
+ 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;
}
- i = hash_table[SUM2HASH2(s1,s2)];
- if (i < 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(DELTASUM, 3)) {
rprintf(FINFO,
- "potential match at %.0f i=%ld sum=%08x\n",
- (double)offset, (long)i, sum);
+ "potential match at %s i=%ld sum=%08x\n",
+ big_num(offset), (long)i, sum);
}
if (!done_csum2) {
**/
void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
{
- char file_sum[MAX_DIGEST_LEN];
- int sum_len;
-
last_match = 0;
false_alarms = 0;
hash_hits = 0;
if (append_mode == 2) {
OFF_T j = 0;
for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
- if (buf && do_progress)
+ if (buf && INFO_GTE(PROGRESS, 1))
show_progress(last_match, buf->file_size);
sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
CHUNK_SIZE);
}
if (last_match < s->flength) {
int32 n = (int32)(s->flength - last_match);
- if (buf && do_progress)
+ if (buf && INFO_GTE(PROGRESS, 1))
show_progress(last_match, buf->file_size);
sum_update(map_ptr(buf, last_match, n), n);
}
}
if (len > 0 && s->count > 0) {
+ build_hash_table(s);
+
+ if (DEBUG_GTE(DELTASUM, 2))
+ rprintf(FINFO,"built hash table\n");
+
hash_search(f, s, buf, len);
- if (verbose > 2)
+ if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO,"done hash search\n");
} else {
OFF_T j;
matched(f, s, buf, len, -1);
}
- 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 (sum_end(sender_file_sum) != checksum_len)
+ overflow_exit("checksum_len"); /* Impossible... */
+
+ /* If we had a read error, send a bad checksum. We use all bits
+ * off as long as the checksum doesn't happen to be that, in
+ * which case we turn the last 0 bit into a 1. */
+ if (buf && buf->status != 0) {
+ int i;
+ for (i = 0; i < checksum_len && sender_file_sum[i] == 0; i++) {}
+ memset(sender_file_sum, 0, checksum_len);
+ if (i == checksum_len)
+ sender_file_sum[i-1]++;
+ }
- if (verbose > 2)
+ if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO,"sending file_sum\n");
- write_buf(f, file_sum, sum_len);
+ write_buf(f, sender_file_sum, checksum_len);
- if (verbose > 2)
+ if (DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",
false_alarms, hash_hits, matches);
+ }
total_hash_hits += hash_hits;
total_false_alarms += false_alarms;
void match_report(void)
{
- if (verbose <= 1)
+ if (!DEBUG_GTE(DELTASUM, 1))
return;
rprintf(FINFO,
- "total: matches=%d hash_hits=%d false_alarms=%d data=%.0f\n",
+ "total: matches=%d hash_hits=%d false_alarms=%d data=%s\n",
total_matches, total_hash_hits, total_false_alarms,
- (double)stats.literal_data);
+ big_num(stats.literal_data));
}