--- old/match.c
+++ new/match.c
-@@ -39,29 +39,50 @@ static int total_matches;
+@@ -39,40 +39,51 @@ static int total_matches;
extern struct stats stats;
#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)
+#define BIG_SUM2HASH(sum) ((sum)%tablesize)
+
- static void build_hash_table(struct sum_struct *s)
++static void build_hash_table(struct sum_struct *s)
{
+- int32 i, end = s->count;
+ static uint32 alloc_size;
- int32 i;
++ int32 i;
- if (!hash_table) {
- hash_table = new_array(int32, 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++) {
+-
+- 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);
+ hash_table[t] = i;
+ }
}
+-
+- return end;
}
-@@ -164,11 +185,16 @@ static void hash_search(int f,struct sum
+
+@@ -130,8 +141,8 @@ static void matched(int f, struct sum_st
+ 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;
+@@ -169,24 +180,21 @@ static void hash_search(int f,struct sum
+ 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);
}
hash_hits++;
do {
int32 l;
+@@ -354,6 +362,11 @@ void match_sums(int f, struct sum_struct
+ }
+
+ 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)