*/
#include "rsync.h"
-#include "ifuncs.h"
+#include "inums.h"
extern int dry_run;
extern int do_xfers;
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;
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))
}
}
-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;
}
/**
* 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;
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))
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) {
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;
}
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;
cleanup_disable();
+ if (read_batch)
+ file->flags |= FLAG_FILE_SENT;
+
switch (recv_ok) {
case 2:
break;
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)
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");
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff