Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Added a comment about configure figuring out the default user
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
74990ec
..
b19ecb5
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-20,20
+20,24
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
-extern int d
ry_run
;
+extern int d
o_xfers
;
extern int am_server;
extern int am_daemon;
extern int log_before_transfer;
extern int log_format_has_i;
extern int daemon_log_format_has_i;
extern int csum_length;
extern int am_server;
extern int am_daemon;
extern int log_before_transfer;
extern int log_format_has_i;
extern int daemon_log_format_has_i;
extern int csum_length;
+extern int append_mode;
extern int io_error;
extern int io_error;
+extern int allowed_lull;
extern int protocol_version;
extern int remove_sent_files;
extern int updating_basis_file;
extern int make_backups;
extern int do_progress;
extern int inplace;
extern int protocol_version;
extern int remove_sent_files;
extern int updating_basis_file;
extern int make_backups;
extern int do_progress;
extern int inplace;
+extern int batch_fd;
+extern int write_batch;
extern struct stats stats;
extern struct file_list *the_file_list;
extern char *log_format;
extern struct stats stats;
extern struct file_list *the_file_list;
extern char *log_format;
@@
-54,6
+58,7
@@
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
int32 i;
{
struct sum_struct *s;
int32 i;
+ int lull_mod = allowed_lull * 5;
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
@@
-68,6
+73,13
@@
static struct sum_struct *receive_sums(int f)
(double)s->count, (long)s->blength, (long)s->remainder);
}
(double)s->count, (long)s->blength, (long)s->remainder);
}
+ if (append_mode) {
+ s->flength = (OFF_T)s->count * s->blength;
+ if (s->remainder)
+ s->flength -= s->blength - s->remainder;
+ return s;
+ }
+
if (s->count == 0)
return(s);
if (s->count == 0)
return(s);
@@
-87,6
+99,9
@@
static struct sum_struct *receive_sums(int f)
s->sums[i].len = s->blength;
offset += s->sums[i].len;
s->sums[i].len = s->blength;
offset += s->sums[i].len;
+ if (allowed_lull && !(i % lull_mod))
+ maybe_send_keepalive();
+
if (verbose > 3) {
rprintf(FINFO,
"chunk[%d] len=%d offset=%.0f sum1=%08x\n",
if (verbose > 3) {
rprintf(FINFO,
"chunk[%d] len=%d offset=%.0f sum1=%08x\n",
@@
-146,7
+161,6
@@
int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
uchar fnamecmp_type = FNAMECMP_FNAME;
int iflags = protocol_version >= 29 ? read_shortint(f_in)
: ITEM_TRANSFER | ITEM_MISSING_DATA;
uchar fnamecmp_type = FNAMECMP_FNAME;
int iflags = protocol_version >= 29 ? read_shortint(f_in)
: ITEM_TRANSFER | ITEM_MISSING_DATA;
- int isave = iflags; /* XXX remove soon */
/* Handle the new keep-alive (no-op) packet. */
if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
/* Handle the new keep-alive (no-op) packet. */
if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
@@
-174,13
+188,6
@@
int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
}
*len_ptr = len;
}
*len_ptr = len;
- /* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
- if (protocol_version >= 29 && iflags & ITEM_TRANSFER
- && !S_ISREG(the_file_list->files[ndx]->mode)) {
- iflags &= ~ITEM_TRANSFER;
- iflags |= ITEM_LOCAL_CHANGE;
- }
-
if (iflags & ITEM_TRANSFER) {
if (!S_ISREG(the_file_list->files[ndx]->mode)) {
rprintf(FERROR,
if (iflags & ITEM_TRANSFER) {
if (!S_ISREG(the_file_list->files[ndx]->mode)) {
rprintf(FERROR,
@@
-189,7
+196,7
@@
int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
exit_cleanup(RERR_PROTOCOL);
}
} else if (f_out >= 0) {
exit_cleanup(RERR_PROTOCOL);
}
} else if (f_out >= 0) {
- write_ndx_and_attrs(f_out, ndx, i
save /*XXX iflags */
,
+ write_ndx_and_attrs(f_out, ndx, i
flags
,
fnamecmp_type, buf, len);
}
fnamecmp_type, buf, len);
}
@@
-207,11
+214,12
@@
void send_files(struct file_list *flist, int f_out, int f_in)
uchar fnamecmp_type;
int iflags, xlen;
struct file_struct *file;
uchar fnamecmp_type;
int iflags, xlen;
struct file_struct *file;
- int phase = 0;
+ int phase = 0
, max_phase = protocol_version >= 29 ? 2 : 1
;
struct stats initial_stats;
int save_make_backups = make_backups;
int itemizing = am_daemon ? daemon_log_format_has_i
: !am_server && log_format_has_i;
struct stats initial_stats;
int save_make_backups = make_backups;
int itemizing = am_daemon ? daemon_log_format_has_i
: !am_server && log_format_has_i;
+ int f_xfer = write_batch < 0 ? batch_fd : f_out;
int i, j;
if (verbose > 2)
int i, j;
if (verbose > 2)
@@
-222,18
+230,17
@@
void send_files(struct file_list *flist, int f_out, int f_in)
i = read_int(f_in);
if (i == -1) {
i = read_int(f_in);
if (i == -1) {
- if (phase == 0) {
- phase++;
- csum_length = SUM_LENGTH;
- write_int(f_out, -1);
- if (verbose > 2)
- rprintf(FINFO, "send_files phase=%d\n", phase);
- /* For inplace: redo phase turns off the backup
- * flag so that we do a regular inplace send. */
- make_backups = 0;
- continue;
- }
- break;
+ if (++phase > max_phase)
+ break;
+ csum_length = SUM_LENGTH;
+ if (verbose > 2)
+ rprintf(FINFO, "send_files phase=%d\n", phase);
+ write_int(f_out, -1);
+ /* For inplace: redo phase turns off the backup
+ * flag so that we do a regular inplace send. */
+ make_backups = 0;
+ append_mode = 0;
+ continue;
}
iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type,
}
iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type,
@@
-258,6
+265,12
@@
void send_files(struct file_list *flist, int f_out, int f_in)
maybe_log_item(file, iflags, itemizing, xname);
continue;
}
maybe_log_item(file, iflags, itemizing, xname);
continue;
}
+ if (phase == 2) {
+ rprintf(FERROR,
+ "got transfer request in phase 2 [%s]\n",
+ who_am_i());
+ exit_cleanup(RERR_PROTOCOL);
+ }
updating_basis_file = inplace && (protocol_version >= 29
? fnamecmp_type == FNAMECMP_FNAME : !make_backups);
updating_basis_file = inplace && (protocol_version >= 29
? fnamecmp_type == FNAMECMP_FNAME : !make_backups);
@@
-266,7
+279,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
- if (
dry_run
) { /* log the transfer */
+ if (
!do_xfers
) { /* log the transfer */
if (!am_server && log_format)
log_item(file, &stats, iflags, NULL);
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
if (!am_server && log_format)
log_item(file, &stats, iflags, NULL);
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
@@
-323,7
+336,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
xname, xlen);
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
xname, xlen);
- write_sum_head(f_
out
, s);
+ write_sum_head(f_
xfer
, s);
if (verbose > 2) {
rprintf(FINFO, "calling match_sums %s\n",
if (verbose > 2) {
rprintf(FINFO, "calling match_sums %s\n",
@@
-337,7
+350,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
set_compression(fname);
set_compression(fname);
- match_sums(f_
out
, s, mbuf, st.st_size);
+ match_sums(f_
xfer
, s, mbuf, st.st_size);
if (do_progress)
end_progress(st.st_size);
if (do_progress)
end_progress(st.st_size);