diff options
author | Andrew Tridgell <tridge@samba.org> | 1998-05-22 01:53:02 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1998-05-22 01:53:02 +0000 |
commit | 45f133b9769fb45a329d3d41e121109d430e307d (patch) | |
tree | 4f666d6ebb0e7ea64f63fe397128a29319ed0c54 /match.c | |
parent | c5eb365011581bdf9987b538f0df04a1d6feb723 (diff) | |
download | android_external_rsync-45f133b9769fb45a329d3d41e121109d430e307d.tar.gz android_external_rsync-45f133b9769fb45a329d3d41e121109d430e307d.tar.bz2 android_external_rsync-45f133b9769fb45a329d3d41e121109d430e307d.zip |
this fixes two problems:
1) handle 64 bit file offsets in the token code. I wonder how large
bit files worked up till now?
2) send a null token when we have passed over a large lump of data
without finding a token match. This reduces the number of IOs
considerably as it removes the need for seeks/reads on the checksum
calculation and literal send code. This is not enabled yet for the
compressed case as the deflate token code can't handle it yet.
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 21 |
1 files changed, 19 insertions, 2 deletions
@@ -100,7 +100,7 @@ static void matched(int f,struct sum_struct *s,struct map_struct *buf, rprintf(FINFO,"match at %d last_match=%d j=%d len=%d n=%d\n", (int)offset,(int)last_match,i,(int)s->sums[i].len,(int)n); - send_token(f,i,buf,last_match,n,i==-1?0:s->sums[i].len); + send_token(f,i,buf,last_match,n,i<0?0:s->sums[i].len); data_transfer += n; if (n > 0) @@ -131,6 +131,7 @@ static void hash_search(int f,struct sum_struct *s, char sum2[SUM_LENGTH]; uint32 s1, s2, sum; schar *map; + extern int do_compression; if (verbose > 2) rprintf(FINFO,"hash search b=%d len=%d\n",s->n,(int)len); @@ -212,7 +213,23 @@ static void hash_search(int f,struct sum_struct *s, } else { --k; } - + + if (!do_compression) { + /* By matching early we avoid re-reading the + data 3 times in the case where a token + match comes a long way after last + match. The 3 reads are caused by the + running match, the checksum update and the + literal send. + + we don't enable this for the compressed + case yet as the deflated token code can't + handle it. Paul is working on it */ + if (offset-last_match >= CHUNK_SIZE+s->n && + (end-offset > CHUNK_SIZE)) { + matched(f,s,buf,offset - s->n, -2); + } + } } while (++offset < end); matched(f,s,buf,len,-1); |