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
Chris added a missing "not" to a comment.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
b896892
..
728bcb7
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-47,6
+47,7
@@
extern int link_dest;
extern int whole_file;
extern int local_server;
extern int list_only;
extern int whole_file;
extern int local_server;
extern int list_only;
+extern int read_batch;
extern int only_existing;
extern int orig_umask;
extern int safe_symlinks;
extern int only_existing;
extern int orig_umask;
extern int safe_symlinks;
@@
-161,6
+162,7
@@
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
+ blength = MIN(blength, MAX_MAP_SIZE);
}
if (protocol_version < 27) {
}
if (protocol_version < 27) {
@@
-205,19
+207,25
@@
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
*
* Generate approximately one checksum every block_len bytes.
*/
*
* Generate approximately one checksum every block_len bytes.
*/
-static void generate_and_send_sums(
struct map_struct *buf, size_t
len, int f_out)
+static void generate_and_send_sums(
int fd, OFF_T
len, int f_out)
{
size_t i;
{
size_t i;
+ struct map_struct *mapbuf;
struct sum_struct sum;
OFF_T offset = 0;
sum_sizes_sqroot(&sum, len);
struct sum_struct sum;
OFF_T offset = 0;
sum_sizes_sqroot(&sum, len);
+ if (len > 0)
+ mapbuf = map_file(fd, len, sum.blength);
+ else
+ mapbuf = NULL;
+
write_sum_head(f_out, &sum);
for (i = 0; i < sum.count; i++) {
unsigned int n1 = MIN(len, sum.blength);
write_sum_head(f_out, &sum);
for (i = 0; i < sum.count; i++) {
unsigned int n1 = MIN(len, sum.blength);
- char *map = map_ptr(buf, offset, n1);
+ char *map = map_ptr(
map
buf, offset, n1);
uint32 sum1 = get_checksum1(map, n1);
char sum2[SUM_LENGTH];
uint32 sum1 = get_checksum1(map, n1);
char sum2[SUM_LENGTH];
@@
-234,6
+242,9
@@
static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out
len -= n1;
offset += n1;
}
len -= n1;
offset += n1;
}
+
+ if (mapbuf)
+ unmap_file(mapbuf);
}
}
@@
-251,7
+262,6
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
{
int fd;
STRUCT_STAT st;
{
int fd;
STRUCT_STAT st;
- struct map_struct *mapbuf;
int statret;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
int statret;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
@@
-433,7
+443,7
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
if (errno == ENOENT) {
write_int(f_out,i);
return;
if (errno == ENOENT) {
write_int(f_out,i);
- if (!dry_run)
+ if (!dry_run
&& !read_batch
)
write_sum_head(f_out, NULL);
} else if (verbose > 1) {
rsyserr(FERROR, errno,
write_sum_head(f_out, NULL);
} else if (verbose > 1) {
rsyserr(FERROR, errno,
@@
-452,7
+462,7
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
write_int(f_out,i);
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
write_int(f_out,i);
- if (!dry_run)
+ if (!dry_run
&& !read_batch
)
write_sum_head(f_out, NULL);
return;
}
write_sum_head(f_out, NULL);
return;
}
@@
-476,7
+486,7
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
return;
}
- if (dry_run) {
+ if (dry_run
|| read_batch
) {
write_int(f_out,i);
return;
}
write_int(f_out,i);
return;
}
@@
-501,11
+511,6
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
return;
}
- if (st.st_size > 0)
- mapbuf = map_file(fd,st.st_size);
- else
- mapbuf = NULL;
-
if (verbose > 3) {
rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp,
(double)st.st_size);
if (verbose > 3) {
rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp,
(double)st.st_size);
@@
-515,11
+520,9
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
- generate_and_send_sums(
mapbuf
, st.st_size, f_out);
+ generate_and_send_sums(
fd
, st.st_size, f_out);
close(fd);
close(fd);
- if (mapbuf)
- unmap_file(mapbuf);
}
}