* 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 version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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"
#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);
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;
}
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;
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);
sum_init(checksum_seed);
if (append_mode > 0) {
- 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;
+ 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);
if (verbose > 2)