X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/264042760bd909eeca281dc8c937357e98bf6bf8..c5d77e9659bb40db09376beb31ba9d23396ae601:/match.c

diff --git a/match.c b/match.c
index cbc856c2..79e591a2 100644
--- a/match.c
+++ b/match.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 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,
@@ -16,8 +16,7 @@
  * 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -47,9 +46,9 @@ static int32 *hash_table;
 #define SUM2HASH2(s1,s2) (((s1) + (s2)) & 0xFFFF)
 #define SUM2HASH(sum) SUM2HASH2((sum)&0xFFFF,(sum)>>16)
 
-static void build_hash_table(struct sum_struct *s)
+static int32 build_hash_table(struct sum_struct *s, int32 start)
 {
-	int32 i;
+	int32 i, end = s->count;
 
 	if (!hash_table) {
 		hash_table = new_array(int32, TABLESIZE);
@@ -59,11 +58,21 @@ static void build_hash_table(struct sum_struct *s)
 
 	memset(hash_table, 0xFF, TABLESIZE * sizeof hash_table[0]);
 
-	for (i = 0; i < s->count; i++) {
+	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;
 	}
+
+	if (verbose > 2) {
+		rprintf(FINFO, "built hash table for entries %ld - %ld\n",
+			(long)start, (long)end - 1);
+	}
+
+	return end;
 }
 
 
@@ -121,8 +130,8 @@ static void matched(int f, struct sum_struct *s, struct map_struct *buf,
 static void hash_search(int f,struct sum_struct *s,
 			struct map_struct *buf, OFF_T len)
 {
-	OFF_T offset, end;
-	int32 k, want_i, backup;
+	OFF_T offset, end, reset = 0;
+	int32 k, want_i, backup, sum_pos = 0;
 	char sum2[SUM_LENGTH];
 	uint32 s1, s2, sum;
 	int more;
@@ -160,6 +169,14 @@ static void hash_search(int f,struct sum_struct *s,
 		int done_csum2 = 0;
 		int32 i;
 
+		if (offset >= reset) {
+			sum_pos = build_hash_table(s, sum_pos);
+			if (sum_pos == s->count)
+				reset = len;
+			else
+				reset = sum_pos * s->blength;
+		}
+
 		if (verbose > 4) {
 			rprintf(FINFO, "offset=%.0f sum=%04x%04x\n",
 				(double)offset, s2 & 0xFFFF, s1 & 0xFFFF);
@@ -304,7 +321,8 @@ static void hash_search(int f,struct sum_struct *s,
  **/
 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;
@@ -314,32 +332,29 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 
 	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 = (int32)(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 && 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 n = (int32)(s->flength - last_match);
+				if (buf && do_progress)
+					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)
-			rprintf(FINFO,"built hash table\n");
-
-		hash_search(f,s,buf,len);
+		hash_search(f, s, buf, len);
 
 		if (verbose > 2)
 			rprintf(FINFO,"done hash search\n");
@@ -351,14 +366,14 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 		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)
 		rprintf(FINFO,"sending file_sum\n");
-	write_buf(f,file_sum,MD4_SUM_LENGTH);
+	write_buf(f, file_sum, sum_len);
 
 	if (verbose > 2)
 		rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",