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
Got rid of unused function u_strcmp().
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
3afc48d
..
76546f1
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",
@@
-118,11
+133,9
@@
void successful_send(int ndx)
file->dir.root, "/", NULL);
} else
offset = 0;
file->dir.root, "/", NULL);
} else
offset = 0;
- f_name_to(file, fname + offset);
- if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) {
- rprintf(FINFO, "sender removed %s\n",
- safe_fname(fname + offset));
- }
+ f_name(file, fname + offset);
+ if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1)
+ rprintf(FINFO, "sender removed %s\n", fname + offset);
}
static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
}
static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
@@
-204,6
+217,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
int save_make_backups = make_backups;
int itemizing = am_daemon ? daemon_log_format_has_i
: !am_server && log_format_has_i;
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)
@@
-223,6
+237,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
/* For inplace: redo phase turns off the backup
* flag so that we do a regular inplace send. */
make_backups = 0;
/* For inplace: redo phase turns off the backup
* flag so that we do a regular inplace send. */
make_backups = 0;
+ append_mode = 0;
continue;
}
continue;
}
@@
-239,7
+254,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
fname[offset++] = '/';
} else
offset = 0;
fname[offset++] = '/';
} else
offset = 0;
- fname2 = f_name
_to
(file, fname + offset);
+ fname2 = f_name(file, fname + offset);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
@@
-262,7
+277,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,
@@
-314,26
+329,24
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (verbose > 2) {
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
if (verbose > 2) {
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
-
safe_fname(fname)
, (double)st.st_size);
+
fname
, (double)st.st_size);
}
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",
- safe_fname(fname));
- }
+ if (verbose > 2)
+ rprintf(FINFO, "calling match_sums %s\n", fname);
if (log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
if (log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
- rprintf(FINFO, "%s\n",
safe_fname(fname2)
);
+ rprintf(FINFO, "%s\n",
fname2
);
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);
@@
-353,10
+366,8
@@
void send_files(struct file_list *flist, int f_out, int f_in)
free_sums(s);
free_sums(s);
- if (verbose > 2) {
- rprintf(FINFO, "sender finished %s\n",
- safe_fname(fname));
- }
+ if (verbose > 2)
+ rprintf(FINFO, "sender finished %s\n", fname);
/* Flag that we actually sent this entry. */
file->flags |= FLAG_SENT;
/* Flag that we actually sent this entry. */
file->flags |= FLAG_SENT;