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
*** empty log message ***
[rsync/rsync.git]
/
match.c
diff --git
a/match.c
b/match.c
index
ee22ca3
..
d7af159
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-19,6
+19,8
@@
#include "rsync.h"
#include "rsync.h"
+extern int csum_length;
+
extern int verbose;
extern int am_server;
extern int verbose;
extern int am_server;
@@
-83,31
+85,27
@@
static void build_hash_table(struct sum_struct *s)
}
}
-
static off_t last_match;
static off_t last_match;
-static void matched(int f,struct sum_struct *s,char *buf,off_t len,
+static void matched(int f,struct sum_struct *s,struct map_struct *buf,
+ off_t len,
int offset,int i)
{
int n = offset - last_match;
if (verbose > 2)
if (i != -1)
int offset,int i)
{
int n = offset - last_match;
if (verbose > 2)
if (i != -1)
- fprintf(
stderr
,"match at %d last_match=%d j=%d len=%d n=%d\n",
+ fprintf(
FERROR
,"match at %d last_match=%d j=%d len=%d n=%d\n",
(int)offset,(int)last_match,i,(int)s->sums[i].len,n);
(int)offset,(int)last_match,i,(int)s->sums[i].len,n);
- if (n > 0) {
- int l = 0;
- write_int(f,n);
- while (l < n) {
- int n1 = MIN(WRITE_BLOCK_SIZE,n-l);
- write_buf(f,map_ptr(buf,last_match+l,n1),n1);
- l += n1;
- }
- data_transfer += n;
- }
- write_int(f,-(i+1));
+ send_token(f,i,buf,last_match,n);
+
+ data_transfer += n;
+
+ if (i != -1)
+ last_match = offset + s->sums[i].len;
+
if (i != -1)
last_match = offset + s->sums[i].len;
if (n > 0)
if (i != -1)
last_match = offset + s->sums[i].len;
if (n > 0)
@@
-115,7
+113,8
@@
static void matched(int f,struct sum_struct *s,char *buf,off_t len,
}
}
-static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
+static void hash_search(int f,struct sum_struct *s,
+ struct map_struct *buf,off_t len)
{
int offset,j,k;
int end;
{
int offset,j,k;
int end;
@@
-124,7
+123,7
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
char *map;
if (verbose > 2)
char *map;
if (verbose > 2)
- fprintf(
stderr
,"hash search b=%d len=%d\n",s->n,(int)len);
+ fprintf(
FERROR
,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
k = MIN(len, s->n);
@@
-134,21
+133,21
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
- fprintf(
stderr
, "sum=%.8x k=%d\n", sum, k);
+ fprintf(
FERROR
, "sum=%.8x k=%d\n", sum, k);
offset = 0;
end = len + 1 - s->sums[s->count-1].len;
if (verbose > 3)
offset = 0;
end = len + 1 - s->sums[s->count-1].len;
if (verbose > 3)
- fprintf(
stderr
,"hash search s->n=%d len=%d count=%d\n",
+ fprintf(
FERROR
,"hash search s->n=%d len=%d count=%d\n",
s->n,(int)len,s->count);
do {
tag t = gettag2(s1,s2);
j = tag_table[t];
if (verbose > 4)
s->n,(int)len,s->count);
do {
tag t = gettag2(s1,s2);
j = tag_table[t];
if (verbose > 4)
- fprintf(
stderr
,"offset=%d sum=%08x\n",
+ fprintf(
FERROR
,"offset=%d sum=%08x\n",
offset,sum);
if (j != NULL_TAG) {
offset,sum);
if (j != NULL_TAG) {
@@
-161,7
+160,7
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
if (sum == s->sums[i].sum1) {
if (verbose > 3)
if (sum == s->sums[i].sum1) {
if (verbose > 3)
- fprintf(
stderr
,"potential match at %d target=%d %d sum=%08x\n",
+ fprintf(
FERROR
,"potential match at %d target=%d %d sum=%08x\n",
offset,j,i,sum);
if (!done_csum2) {
offset,j,i,sum);
if (!done_csum2) {
@@
-170,7
+169,7
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
get_checksum2(map,l,sum2);
done_csum2 = 1;
}
get_checksum2(map,l,sum2);
done_csum2 = 1;
}
- if (memcmp(sum2,s->sums[i].sum2,
SUM_LENGTH
) == 0) {
+ if (memcmp(sum2,s->sums[i].sum2,
csum_length
) == 0) {
matched(f,s,buf,len,offset,i);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
matched(f,s,buf,len,offset,i);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
@@
-207,7
+206,7
@@
static void hash_search(int f,struct sum_struct *s,char *buf,off_t len)
}
}
-void match_sums(int f,struct sum_struct *s,
char
*buf,off_t len)
+void match_sums(int f,struct sum_struct *s,
struct map_struct
*buf,off_t len)
{
last_match = 0;
false_alarms = 0;
{
last_match = 0;
false_alarms = 0;
@@
-219,12
+218,12
@@
void match_sums(int f,struct sum_struct *s,char *buf,off_t len)
build_hash_table(s);
if (verbose > 2)
build_hash_table(s);
if (verbose > 2)
- fprintf(
stderr
,"built hash table\n");
+ fprintf(
FERROR
,"built hash table\n");
hash_search(f,s,buf,len);
if (verbose > 2)
hash_search(f,s,buf,len);
if (verbose > 2)
- fprintf(
stderr
,"done hash search\n");
+ fprintf(
FERROR
,"done hash search\n");
} else {
matched(f,s,buf,len,len,-1);
}
} else {
matched(f,s,buf,len,len,-1);
}
@@
-235,7
+234,7
@@
void match_sums(int f,struct sum_struct *s,char *buf,off_t len)
}
if (verbose > 2)
}
if (verbose > 2)
- fprintf(
stderr
, "false_alarms=%d tag_hits=%d matches=%d\n",
+ fprintf(
FERROR
, "false_alarms=%d tag_hits=%d matches=%d\n",
false_alarms, tag_hits, matches);
total_tag_hits += tag_hits;
false_alarms, tag_hits, matches);
total_tag_hits += tag_hits;
@@
-249,7
+248,7
@@
void match_report(void)
if (verbose <= 1)
return;
if (verbose <= 1)
return;
- fprintf(
am_server?stderr:stdout
,
+ fprintf(
FINFO
,
"total: matches=%d tag_hits=%d false_alarms=%d data=%d\n",
total_matches,total_tag_hits,
total_false_alarms,total_data_transfer);
"total: matches=%d tag_hits=%d false_alarms=%d data=%d\n",
total_matches,total_tag_hits,
total_false_alarms,total_data_transfer);