X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e366e5303fa25e3d007691109293901ad7a7b6f6..554dc122f271fc361b963067fa3d80084fd7ca91:/sender.c diff --git a/sender.c b/sender.c index ed6a7368..600ad847 100644 --- a/sender.c +++ b/sender.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 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 @@ -22,7 +22,6 @@ #include "rsync.h" #include "inums.h" -extern int dry_run; extern int do_xfers; extern int am_server; extern int am_daemon; @@ -33,6 +32,7 @@ extern int logfile_format_has_i; extern int csum_length; extern int append_mode; extern int io_error; +extern int flist_eof; extern int allowed_lull; extern int preserve_xattrs; extern int protocol_version; @@ -42,9 +42,12 @@ extern int make_backups; extern int inplace; extern int batch_fd; extern int write_batch; +extern int file_old_total; extern struct stats stats; extern struct file_list *cur_flist, *first_flist, *dir_flist; +BOOL extra_flist_sending_enabled; + /** * @file * @@ -60,7 +63,7 @@ static struct sum_struct *receive_sums(int f) { struct sum_struct *s; int32 i; - int lull_mod = allowed_lull * 5; + int lull_mod = protocol_version >= 31 ? 0 : allowed_lull * 5; OFF_T offset = 0; if (!(s = new(struct sum_struct))) @@ -101,8 +104,8 @@ static struct sum_struct *receive_sums(int f) s->sums[i].len = s->blength; offset += s->sums[i].len; - if (allowed_lull && !(i % lull_mod)) - maybe_send_keepalive(); + if (lull_mod && !(i % lull_mod)) + maybe_send_keepalive(time(NULL), True); if (DEBUG_GTE(DELTASUM, 3)) { rprintf(FINFO, @@ -152,7 +155,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags, if (iflags & ITEM_XNAME_FOLLOWS) write_vstring(f_out, buf, len); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) send_xattr_request(fname, file, f_out); #endif } @@ -169,30 +172,37 @@ void send_files(int f_in, int f_out) int iflags, xlen; struct file_struct *file; int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1; - struct stats initial_stats; int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i; enum logcode log_code = log_before_transfer ? FLOG : FINFO; int f_xfer = write_batch < 0 ? batch_fd : f_out; + int save_io_error = io_error; int ndx, j; if (DEBUG_GTE(SEND, 1)) rprintf(FINFO, "send_files starting\n"); while (1) { - if (inc_recurse) - send_extra_file_list(f_out, FILECNT_LOOKAHEAD); + if (inc_recurse) { + send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD); + extra_flist_sending_enabled = !flist_eof; + } /* This call also sets cur_flist. */ - ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type, + ndx = read_ndx_and_attrs(f_in, f_out, &iflags, &fnamecmp_type, xname, &xlen); + extra_flist_sending_enabled = False; + if (ndx == NDX_DONE) { if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) { set_current_file_index(NULL, 0); end_progress(0); } if (inc_recurse && first_flist) { + file_old_total -= first_flist->used; flist_free(first_flist); if (first_flist) { + if (first_flist == cur_flist) + file_old_total = cur_flist->used; write_ndx(f_out, NDX_DONE); continue; } @@ -201,14 +211,12 @@ void send_files(int f_in, int f_out) break; if (DEBUG_GTE(SEND, 1)) rprintf(FINFO, "send_files phase=%d\n", phase); - if (phase == 2) - read_del_stats(f_in); write_ndx(f_out, NDX_DONE); continue; } if (inc_recurse) - send_extra_file_list(f_out, FILECNT_LOOKAHEAD); + send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD); if (ndx - cur_flist->ndx_start >= 0) file = cur_flist->files[ndx - cur_flist->ndx_start]; @@ -228,7 +236,7 @@ void send_files(int f_in, int f_out) rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) recv_xattr_request(file, f_in); #endif @@ -286,15 +294,16 @@ void send_files(int f_in, int f_out) stats.xferred_files++; stats.total_transferred_size += F_LENGTH(file); + if (!log_before_transfer) + remember_initial_stats(); + if (!do_xfers) { /* log the transfer */ - log_item(FCLIENT, file, &stats, iflags, NULL); + log_item(FCLIENT, file, iflags, NULL); write_ndx_and_attrs(f_out, ndx, iflags, fname, file, fnamecmp_type, xname, xlen); continue; } - initial_stats = stats; - if (!(s = receive_sums(f_in))) { io_error |= IOERR_GENERAL; rprintf(FERROR_XFER, "receive_sums failed\n"); @@ -328,7 +337,7 @@ void send_files(int f_in, int f_out) rsyserr(FERROR_XFER, errno, "fstat failed"); free_sums(s); close(fd); - exit_cleanup(RERR_PROTOCOL); + exit_cleanup(RERR_FILEIO); } if (st.st_size) { @@ -350,7 +359,7 @@ void send_files(int f_in, int f_out) rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname); if (log_before_transfer) - log_item(FCLIENT, file, &initial_stats, iflags, NULL); + log_item(FCLIENT, file, iflags, NULL); else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1)) rprintf(FCLIENT, "%s\n", fname); @@ -360,7 +369,7 @@ void send_files(int f_in, int f_out) if (INFO_GTE(PROGRESS, 1)) end_progress(st.st_size); - log_item(log_code, file, &initial_stats, iflags, NULL); + log_item(log_code, file, iflags, NULL); if (mbuf) { j = unmap_file(mbuf); @@ -384,6 +393,9 @@ void send_files(int f_in, int f_out) if (make_backups < 0) make_backups = -make_backups; + if (io_error != save_io_error && protocol_version >= 30) + send_msg_int(MSG_IO_ERROR, io_error); + if (DEBUG_GTE(SEND, 1)) rprintf(FINFO, "send files finished\n");