Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always use a timeout to select, even if --timeout is not
[rsync/rsync.git]
/
match.c
diff --git
a/match.c
b/match.c
index
719961d
..
845bd35
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-29,7
+29,7
@@
extern int remote_version;
typedef unsigned short tag;
#define TABLESIZE (1<<16)
typedef unsigned short tag;
#define TABLESIZE (1<<16)
-#define NULL_TAG (
(tag)
-1)
+#define NULL_TAG (-1)
static int false_alarms;
static int tag_hits;
static int false_alarms;
static int tag_hits;
@@
-49,7
+49,7
@@
struct target {
static struct target *targets;
static struct target *targets;
-static
tag
*tag_table;
+static
int
*tag_table;
#define gettag2(s1,s2) (((s1) + (s2)) & 0xFFFF)
#define gettag(sum) gettag2((sum)&0xFFFF,(sum)>>16)
#define gettag2(s1,s2) (((s1) + (s2)) & 0xFFFF)
#define gettag(sum) gettag2((sum)&0xFFFF,(sum)>>16)
@@
-65,7
+65,7
@@
static void build_hash_table(struct sum_struct *s)
int i;
if (!tag_table)
int i;
if (!tag_table)
- tag_table = (
tag *)malloc(sizeof(tag
)*TABLESIZE);
+ tag_table = (
int *)malloc(sizeof(tag_table[0]
)*TABLESIZE);
targets = (struct target *)malloc(sizeof(targets[0])*s->count);
if (!tag_table || !targets)
targets = (struct target *)malloc(sizeof(targets[0])*s->count);
if (!tag_table || !targets)
@@
-118,6
+118,11
@@
static void matched(int f,struct sum_struct *s,struct map_struct *buf,
last_match = offset + s->sums[i].len;
else
last_match = offset;
last_match = offset + s->sums[i].len;
else
last_match = offset;
+
+ if (buf)
+ show_progress(last_match, buf->size);
+
+ if (i == -1) end_progress();
}
}
@@
-252,6
+257,12
@@
void match_sums(int f,struct sum_struct *s,struct map_struct *buf,OFF_T len)
if (verbose > 2)
rprintf(FINFO,"done hash search\n");
} else {
if (verbose > 2)
rprintf(FINFO,"done hash search\n");
} else {
+ OFF_T j;
+ /* by doing this in pieces we avoid too many seeks */
+ for (j=0;j<(len-CHUNK_SIZE);j+=CHUNK_SIZE) {
+ int n1 = MIN(CHUNK_SIZE,(len-CHUNK_SIZE)-j);
+ matched(f,s,buf,j+n1,-2);
+ }
matched(f,s,buf,len,-1);
}
matched(f,s,buf,len,-1);
}