X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fa181223d82bcc3845241bf2b4df03ab3f9159aa..bbef6566cd2fb9f12a52f6c61d27efe84695f2c6:/receiver.c diff --git a/receiver.c b/receiver.c index 1ff029d4..39c5e490 100644 --- a/receiver.c +++ b/receiver.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras - * Copyright (C) 2003-2008 Wayne Davison + * Copyright (C) 2003-2009 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,6 +59,7 @@ 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; @@ -284,8 +285,11 @@ 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 + && ftruncate(fd, offset) < 0) { + rsyserr(FERROR_XFER, errno, "ftruncate failed on %s", + full_fname(fname)); + } #endif if (do_progress) @@ -348,25 +352,68 @@ 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 && !dry_run) + 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 int done_cnt = 0; + static BOOL got_eof = False; + int flist_num = first_flist->flist_num; + + if (got_eof) + return 0; + + while (next_ndx < desired_ndx) { + if (inc_recurse && flist_num <= done_cnt) + return 0; + if (next_ndx >= 0) + no_batched_update(next_ndx, False); + if ((next_ndx = read_int(batch_gen_fd)) < 0) { + if (inc_recurse) { + done_cnt++; + continue; + } + got_eof = True; + return 0; } } - return next_gen_ndx; + + if (next_ndx == desired_ndx) { + next_ndx = -1; + return 1; + } + + return 0; } /** @@ -375,7 +422,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; @@ -410,17 +456,13 @@ int recv_files(int f_in, char *local_name) xname, &xlen); if (ndx == NDX_DONE) { 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 (verbose > 2) @@ -441,14 +483,14 @@ int recv_files(int f_in, char *local_name) rprintf(FINFO, "recv_files(%s)\n", fname); #ifdef SUPPORT_XATTRS - if (iflags & ITEM_REPORT_XATTR && !dry_run) + if (iflags & ITEM_REPORT_XATTR && do_xfers) recv_xattr_request(file, f_in); #endif if (!(iflags & ITEM_TRANSFER)) { maybe_log_item(file, iflags, itemizing, xname); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) set_file_attrs(fname, file, NULL, fname, 0); #endif continue; @@ -495,6 +537,21 @@ int recv_files(int f_in, char *local_name) exit_cleanup(RERR_PROTOCOL); } + if (read_batch) { + int wanted = redoing + ? we_want_redo(ndx) + : gen_wants_ndx(ndx); + if (!wanted) { + rprintf(FINFO, + "(Skipping batched update for%s \"%s\")\n", + redoing ? " resend of" : "", + fname); + discard_receive_data(f_in, F_LENGTH(file)); + file->flags |= FLAG_FILE_SENT; + continue; + } + } + if (!do_xfers) { /* log the transfer */ log_item(FCLIENT, file, &stats, iflags, NULL); if (read_batch) @@ -508,20 +565,6 @@ int recv_files(int f_in, char *local_name) continue; } - if (read_batch) { - next_gen_ndx = get_next_gen_ndx(batch_gen_fd, next_gen_ndx, ndx); - if (ndx < next_gen_ndx) { - rprintf(FINFO, - "(Skipping batched update for \"%s\")\n", - fname); - discard_receive_data(f_in, F_LENGTH(file)); - if (inc_recurse) - send_msg_int(MSG_NO_SEND, ndx); - continue; - } - next_gen_ndx = -1; - } - partialptr = partial_dir ? partial_dir_fname(fname) : fname; if (protocol_version >= 29) { @@ -719,6 +762,9 @@ int recv_files(int f_in, char *local_name) cleanup_disable(); + if (read_batch) + file->flags |= FLAG_FILE_SENT; + switch (recv_ok) { case 2: break; @@ -751,6 +797,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)