X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6d56efa6ea66afa2e6f4eb79d9dd5f3b54b723c3..9411292489496984c8d5d9a446bf071afac3866d:/receiver.c diff --git a/receiver.c b/receiver.c index 05ac184c..7efd3d27 100644 --- a/receiver.c +++ b/receiver.c @@ -20,6 +20,7 @@ */ #include "rsync.h" +#include "inums.h" extern int dry_run; extern int do_xfers; @@ -44,6 +45,7 @@ extern int remove_source_files; extern int append_mode; extern int sparse_files; extern int keep_partial; +extern int checksum_len; extern int checksum_seed; extern int inplace; extern int delay_updates; @@ -51,12 +53,14 @@ extern mode_t orig_umask; extern struct stats stats; extern char *tmpdir; extern char *partial_dir; -extern char *basis_dir[]; +extern char *basis_dir[MAX_BASIS_DIRS+1]; +extern char sender_file_sum[MAX_DIGEST_LEN]; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct daemon_filter_list; static struct bitbag *delayed_bits = NULL; static int phase = 0, redoing = 0; +static flist_ndx_list batch_redo_list; /* We're either updating the basis file or an identical copy: */ static int updating_basis_or_equiv; @@ -163,10 +167,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, const char *fname, int fd, OFF_T total_size) { static char file_sum1[MAX_DIGEST_LEN]; - static char file_sum2[MAX_DIGEST_LEN]; struct map_struct *mapbuf; struct sum_struct sum; - int32 len, sum_len; + int32 len; OFF_T offset = 0; OFF_T offset2; char *data; @@ -178,9 +181,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, if (fd_r >= 0 && size_r > 0) { int32 read_size = MAX(sum.blength * 2, 16*1024); mapbuf = map_file(fd_r, size_r, read_size, sum.blength); - if (DEBUG_GTE(CHKSUM, 2)) { + if (DEBUG_GTE(DELTASUM, 2)) { rprintf(FINFO, "recv mapped %s of size %s\n", - fname_r, big_num(size_r, 0)); + fname_r, big_num(size_r)); } } else mapbuf = NULL; @@ -210,7 +213,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, offset = sum.flength; if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) { rsyserr(FERROR_XFER, errno, "lseek of %s returned %s, not %s", - full_fname(fname), big_num(j, 0), big_num(offset, 0)); + full_fname(fname), big_num(j), big_num(offset)); exit_cleanup(RERR_FILEIO); } } @@ -220,9 +223,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, show_progress(offset, total_size); if (i > 0) { - if (DEBUG_GTE(CHKSUM, 3)) { + if (DEBUG_GTE(DELTASUM, 3)) { rprintf(FINFO,"data recv %d at %s\n", - i, big_num(offset, 0)); + i, big_num(offset)); } stats.literal_data += i; @@ -244,10 +247,10 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, stats.matched_data += len; - if (DEBUG_GTE(CHKSUM, 3)) { + if (DEBUG_GTE(DELTASUM, 3)) { rprintf(FINFO, "chunk[%d] of size %ld at %s offset=%s\n", - i, (long)len, big_num(offset2, 0), big_num(offset, 0)); + i, (long)len, big_num(offset2), big_num(offset)); } if (mapbuf) { @@ -267,7 +270,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, rsyserr(FERROR_XFER, errno, "lseek of %s returned %s, not %s", full_fname(fname), - big_num(pos, 0), big_num(offset, 0)); + big_num(pos), big_num(offset)); exit_cleanup(RERR_FILEIO); } continue; @@ -282,8 +285,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, goto report_write_error; #ifdef HAVE_FTRUNCATE - if (inplace && fd != -1) - ftruncate(fd, offset); + if (inplace && fd != -1) { + if (ftruncate(fd, offset) < 0) { + rsyserr(FWARNING, errno, "ftruncate failed on %s", + full_fname(fname)); + } + } #endif if (INFO_GTE(PROGRESS, 1)) @@ -296,15 +303,16 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, exit_cleanup(RERR_FILEIO); } - sum_len = sum_end(file_sum1); + if (sum_end(file_sum1) != checksum_len) + overflow_exit("checksum_len"); /* Impossible... */ if (mapbuf) unmap_file(mapbuf); - read_buf(f_in, file_sum2, sum_len); - if (DEBUG_GTE(CHKSUM, 2)) + read_buf(f_in, sender_file_sum, checksum_len); + if (DEBUG_GTE(DELTASUM, 2)) rprintf(FINFO,"got file_sum\n"); - if (fd != -1 && memcmp(file_sum1, file_sum2, sum_len) != 0) + if (fd != -1 && memcmp(file_sum1, sender_file_sum, checksum_len) != 0) return 0; return 1; } @@ -346,25 +354,60 @@ static void handle_delayed_updates(char *local_name) } } -static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx) +static void no_batched_update(int ndx, BOOL is_redo) { - while (next_gen_ndx < desired_ndx) { - if (next_gen_ndx >= 0) { - struct file_struct *file = cur_flist->files[next_gen_ndx]; - rprintf(FERROR_XFER, - "(No batched update for%s \"%s\")\n", - file->flags & FLAG_FILE_SENT ? " resend of" : "", - f_name(file, NULL)); - } - next_gen_ndx = read_int(fd); - if (next_gen_ndx == -1) { - if (inc_recurse) - next_gen_ndx = first_flist->prev->used + first_flist->prev->ndx_start; - else - next_gen_ndx = cur_flist->used; + struct file_list *flist = flist_for_ndx(ndx, "no_batched_update"); + struct file_struct *file = flist->files[ndx - flist->ndx_start]; + + rprintf(FERROR_XFER, "(No batched update for%s \"%s\")\n", + is_redo ? " resend of" : "", f_name(file, NULL)); + + if (inc_recurse) + send_msg_int(MSG_NO_SEND, ndx); +} + +static int we_want_redo(int desired_ndx) +{ + static int redo_ndx = -1; + + while (redo_ndx < desired_ndx) { + if (redo_ndx >= 0) + no_batched_update(redo_ndx, True); + if ((redo_ndx = flist_ndx_pop(&batch_redo_list)) < 0) + return 0; + } + + if (redo_ndx == desired_ndx) { + redo_ndx = -1; + return 1; + } + + return 0; +} + +static int gen_wants_ndx(int desired_ndx) +{ + static int next_ndx = -1; + static BOOL got_eof = 0; + + if (got_eof) + return 0; + + while (next_ndx < desired_ndx) { + if (next_ndx >= 0) + no_batched_update(next_ndx, False); + if ((next_ndx = read_int(batch_gen_fd)) < 0) { + got_eof = True; + return 0; } } - return next_gen_ndx; + + if (next_ndx == desired_ndx) { + next_ndx = -1; + return 1; + } + + return 0; } /** @@ -373,7 +416,6 @@ static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx) * Receiver process runs on the same host as the generator process. */ int recv_files(int f_in, char *local_name) { - int next_gen_ndx = -1; int fd1,fd2; STRUCT_STAT st; int iflags, xlen; @@ -412,17 +454,13 @@ int recv_files(int f_in, char *local_name) end_progress(0); } if (inc_recurse && first_flist) { + if (read_batch) + gen_wants_ndx(first_flist->used + first_flist->ndx_start); flist_free(first_flist); if (first_flist) continue; - } - if (read_batch && cur_flist) { - int high = inc_recurse - ? first_flist->prev->used + first_flist->prev->ndx_start - : cur_flist->used; - get_next_gen_ndx(batch_gen_fd, next_gen_ndx, high); - next_gen_ndx = -1; - } + } else if (read_batch && first_flist) + gen_wants_ndx(first_flist->used); if (++phase > max_phase) break; if (DEBUG_GTE(RECV, 1)) @@ -453,6 +491,21 @@ int recv_files(int f_in, char *local_name) if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) set_file_attrs(fname, file, NULL, fname, 0); #endif + if (iflags & ITEM_IS_NEW) { + stats.created_files++; + if (S_ISREG(file->mode)) { + /* Nothing further to count. */ + } else if (S_ISDIR(file->mode)) + stats.created_dirs++; +#ifdef SUPPORT_LINKS + else if (S_ISLNK(file->mode)) + stats.created_symlinks++; +#endif + else if (IS_DEVICE(file->mode)) + stats.created_devices++; + else + stats.created_specials++; + } continue; } if (phase == 2) { @@ -482,11 +535,13 @@ int recv_files(int f_in, char *local_name) csum_length = SHORT_SUM_LENGTH; redoing = 0; } + if (iflags & ITEM_IS_NEW) + stats.created_files++; } if (!am_server && INFO_GTE(PROGRESS, 1)) set_current_file_index(file, ndx); - stats.num_transferred_files++; + stats.xferred_files++; stats.total_transferred_size += F_LENGTH(file); cleanup_got_literal = 0; @@ -511,17 +566,15 @@ int recv_files(int f_in, char *local_name) } if (read_batch) { - next_gen_ndx = get_next_gen_ndx(batch_gen_fd, next_gen_ndx, ndx); - if (ndx < next_gen_ndx) { + if (!(redoing ? we_want_redo(ndx) : gen_wants_ndx(ndx))) { rprintf(FINFO, - "(Skipping batched update for \"%s\")\n", + "(Skipping batched update for%s \"%s\")\n", + redoing ? " resend of" : "", fname); discard_receive_data(f_in, F_LENGTH(file)); - if (inc_recurse) - send_msg_int(MSG_NO_SEND, ndx); + file->flags |= FLAG_FILE_SENT; continue; } - next_gen_ndx = -1; } partialptr = partial_dir ? partial_dir_fname(fname) : fname; @@ -700,23 +753,33 @@ int recv_files(int f_in, char *local_name) do_unlink(partialptr); handle_partial_dir(partialptr, PDIR_DELETE); } - } else if (keep_partial && partialptr - && handle_partial_dir(partialptr, PDIR_CREATE)) { - if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL, - file, recv_ok, !partial_dir)) + } else if (keep_partial && partialptr) { + if (!handle_partial_dir(partialptr, PDIR_CREATE)) { + rprintf(FERROR, + "Unable to create partial-dir for %s -- discarding %s.\n", + local_name ? local_name : f_name(file, NULL), + recv_ok ? "completed file" : "partial file"); + do_unlink(fnametmp); + recv_ok = -1; + } else if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL, + file, recv_ok, !partial_dir)) recv_ok = -1; else if (delay_updates && recv_ok) { bitbag_set_bit(delayed_bits, ndx); recv_ok = 2; - } - } else { - partialptr = NULL; + } else + partialptr = NULL; + } else do_unlink(fnametmp); - } cleanup_disable(); + if (read_batch) + file->flags |= FLAG_FILE_SENT; + switch (recv_ok) { + case 2: + break; case 1: if (remove_source_files || inc_recurse || (preserve_hard_links && F_IS_HLINKED(file))) @@ -746,6 +809,8 @@ int recv_files(int f_in, char *local_name) keptstr, redostr); } if (!redoing) { + if (read_batch) + flist_ndx_push(&batch_redo_list, ndx); send_msg_int(MSG_REDO, ndx); file->flags |= FLAG_FILE_SENT; } else if (inc_recurse) @@ -764,6 +829,11 @@ int recv_files(int f_in, char *local_name) if (phase == 2 && delay_updates) /* for protocol_version < 29 */ handle_delayed_updates(local_name); + if (read_batch) { + read_int(batch_gen_fd); /* Discard -1 */ + read_del_stats(batch_gen_fd); + } + if (DEBUG_GTE(RECV, 1)) rprintf(FINFO,"recv_files finished\n");