X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1bfbf40bd57f086f69971165feef54c13c6fadfd..32f761755e2cfee243a1513c9ea9871586463fa6:/generator.c diff --git a/generator.c b/generator.c index 950e3150..7a939aff 100644 --- a/generator.c +++ b/generator.c @@ -32,7 +32,6 @@ extern int preserve_devices; extern int preserve_hard_links; extern int update_only; extern int opt_ignore_existing; -extern int whole_file; extern int block_size; extern int csum_length; extern int ignore_times; @@ -127,56 +126,96 @@ static void send_sums(struct sum_struct *s, int f_out) } } -/* - generate a stream of signatures/checksums that describe a buffer - generate approximately one checksum every n bytes - */ -static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n) +/** + * Perhaps we want to just send an empty checksum set for this file, + * which will force the whole thing to be literally transferred. + * + * When do we do this? If the user's explicitly said they + * want the whole thing, or if { they haven't explicitly + * requested a delta, and it's local but not batch mode.} + * + * Whew. */ +static BOOL disable_deltas_p(void) +{ + extern int whole_file, no_whole_file; + extern int local_server; + extern int write_batch; + + assert(whole_file == 0 || whole_file == 1); + + /* whole_file and no_whole_file are never both on at the same time */ + + if (whole_file) + return True; + else if (no_whole_file) + return False; + else if (write_batch) + return False; + else + return local_server; +} + + +/** + * Generate a stream of signatures/checksums that describe a buffer. + * + * Generate approximately one checksum every @p n bytes. + * + * @return Newly-allocated sum_struct + **/ +static struct sum_struct *generate_sums(struct map_struct *buf, OFF_T len, + int n) { int i; struct sum_struct *s; int count; int block_len = n; - int remainder = (len%block_len); + int remainder = (len % block_len); OFF_T offset = 0; - count = (len+(block_len-1))/block_len; + count = (len + (block_len - 1)) / block_len; - s = (struct sum_struct *)malloc(sizeof(*s)); - if (!s) out_of_memory("generate_sums"); + s = (struct sum_struct *) malloc(sizeof(*s)); + if (!s) + out_of_memory("generate_sums"); s->count = count; s->remainder = remainder; s->n = n; s->flength = len; - if (count==0) { + if (count == 0) { s->sums = NULL; return s; } - if (verbose > 3) - rprintf(FINFO,"count=%d rem=%d n=%d flength=%.0f\n", - s->count,s->remainder,s->n,(double)s->flength); + if (verbose > 3) { + rprintf(FINFO, "count=%ld rem=%ld n=%ld flength=%.0f\n", + (long) s->count, (long) s->remainder, + (long) s->n, (double) s->flength); + } - s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count); - if (!s->sums) out_of_memory("generate_sums"); - - for (i=0;isums = (struct sum_buf *) malloc(sizeof(s->sums[0]) * s->count); + if (!s->sums) + out_of_memory("generate_sums"); - s->sums[i].sum1 = get_checksum1(map,n1); - get_checksum2(map,n1,s->sums[i].sum2); + for (i = 0; i < count; i++) { + int n1 = MIN(len, n); + char *map = map_ptr(buf, offset, n1); + + s->sums[i].sum1 = get_checksum1(map, n1); + get_checksum2(map, n1, s->sums[i].sum2); s->sums[i].offset = offset; s->sums[i].len = n1; s->sums[i].i = i; if (verbose > 3) - rprintf(FINFO,"chunk[%d] offset=%.0f len=%d sum1=%08x\n", - i,(double)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1); + rprintf(FINFO, + "chunk[%d] offset=%.0f len=%d sum1=%08x\n", + i, (double) s->sums[i].offset, + s->sums[i].len, s->sums[i].sum1); len -= n1; offset += n1; @@ -187,15 +226,15 @@ static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n) -/* - * Acts on file number I from FLIST, whose name is fname. +/** + * Acts on file number @p i from @p flist, whose name is @p fname. * * First fixes up permissions, then generates checksums for the file. * - * (This comment was added later by mbp who was trying to work it out; - * it might be wrong.) - */ -void recv_generator(char *fname,struct file_list *flist,int i,int f_out) + * @note This comment was added later by mbp who was trying to work it + * out. It might be wrong. + **/ +void recv_generator(char *fname, struct file_list *flist, int i, int f_out) { int fd; STRUCT_STAT st; @@ -209,6 +248,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) extern int list_only; extern int preserve_perms; extern int only_existing; + extern int orig_umask; if (list_only) return; @@ -251,7 +291,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) } if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { if (!(relative_paths && errno==ENOENT && - create_directory_path(fname)==0 && + create_directory_path(fname, orig_umask)==0 && do_mkdir(fname,file->mode)==0)) { rprintf(FERROR, RSYNC_NAME ": recv_generator: mkdir \"%s\": %s (2)\n", fname,strerror(errno)); @@ -332,7 +372,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) if (preserve_hard_links && check_hard_link(file)) { if (verbose > 1) - rprintf(FINFO, "\"%s\" is a hard link\n",f_name(file)); + rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",f_name(file)); return; } @@ -403,9 +443,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) return; } - assert(whole_file == 0 || whole_file == 1); - /* We should have decided by now.* / - if (whole_file) { + if (disable_deltas_p()) { write_int(f_out,i); send_sums(NULL,f_out); return; @@ -456,6 +494,13 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) rprintf(FINFO,"generator starting pid=%d count=%d\n", (int)getpid(),flist->count); + if (verbose >= 2) { + rprintf(FINFO, + disable_deltas_p() + ? "delta-transmission disabled for local transfer or --whole-file\n" + : "delta transmission enabled\n"); + } + /* we expect to just sit around now, so don't exit on a timeout. If we really get a timeout then the other process should exit */