#include "rsync.h"
-time_t starttime = 0;
-
extern int verbose;
extern int dry_run;
extern int list_only;
extern char *batch_name;
int local_server = 0;
+struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
int status;
} pid_stat_table[MAXCHILDPROCS];
+static time_t starttime, endtime;
+static int64 total_read, total_written;
+
static void show_malloc_stats(void);
/****************************************************************************
* the report. All processes might also generate a set of debug stats, if
* the verbose level is high enough (this is the only thing that the
* generator process and the server receiver ever do here). */
-static void report(int f)
+static void handle_stats(int f)
{
+ endtime = time(NULL);
+
/* Cache two stats because the read/write code can change it. */
- int64 total_read = stats.total_read;
- int64 total_written = stats.total_written;
- time_t t = time(NULL);
+ total_read = stats.total_read;
+ total_written = stats.total_written;
if (do_stats && verbose > 1) {
/* These come out from every process */
(double)total_read);
}
+ fflush(stdout);
+ fflush(stderr);
+}
+
+static void output_summary(void)
+{
if (verbose || do_stats) {
rprintf(FINFO,
"\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n",
(double)total_written, (double)total_read,
- (total_written + total_read)/(0.5 + (t - starttime)));
+ (total_written + total_read)/(0.5 + (endtime - starttime)));
rprintf(FINFO, "total size is %.0f speedup is %.2f\n",
(double)stats.total_size,
(double)stats.total_size / (total_written+total_read));
/* This is only called by the sender. */
-static void read_final_goodbye(int f_in, int f_out, int flist_count)
+static void read_final_goodbye(int f_in, int f_out)
{
int i;
if (protocol_version < 29)
i = read_int(f_in);
else {
- while ((i = read_int(f_in)) == flist_count
+ while ((i = read_int(f_in)) == the_file_list->count
&& read_shortint(f_in) == ITEM_IS_NEW) {
/* Forward the keep-alive (no-op) to the receiver. */
- write_int(f_out, flist_count);
+ write_int(f_out, the_file_list->count);
write_shortint(f_out, ITEM_IS_NEW);
}
}
if (i != -1) {
- rprintf(FERROR, "Invalid packet from generator at end of run.\n");
+ rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
+ i, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
}
if (!flist || flist->count == 0) {
exit_cleanup(0);
}
+ the_file_list = flist;
io_start_buffering_in();
io_start_buffering_out();
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
- report(f_out);
+ handle_stats(f_out);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out, flist->count);
+ read_final_goodbye(f_in, f_out);
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
{
int pid;
int status = 0;
- int error_pipe[2], name_pipe[2];
- BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis
- || (inplace && make_backups)) && !dry_run;
+ int error_pipe[2];
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
copy_links = 0;
if (preserve_hard_links)
- init_hard_links(flist);
+ init_hard_links();
- if (fd_pair(error_pipe) < 0
- || (need_name_pipe && fd_pair(name_pipe) < 0)) {
+ if (fd_pair(error_pipe) < 0) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
exit_cleanup(RERR_IPC);
}
if (pid == 0) {
close(error_pipe[0]);
- if (need_name_pipe) {
- close(name_pipe[1]);
- set_blocking(name_pipe[0]);
- } else
- name_pipe[0] = -1;
if (f_in != f_out)
close(f_out);
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
- recv_files(f_in, flist, local_name, name_pipe[0]);
+ recv_files(f_in, flist, local_name);
io_flush(FULL_FLUSH);
- report(f_in);
+ handle_stats(f_in);
send_msg(MSG_DONE, "", 0);
io_flush(FULL_FLUSH);
while (read_int(f_in) == flist->count
&& read_shortint(f_in) == ITEM_IS_NEW) {}
- rprintf(FERROR, "Invalid packet from server at end of run.\n");
+ rprintf(FERROR, "Invalid packet at end of run [%s]\n",
+ who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
stop_write_batch();
close(error_pipe[1]);
- if (need_name_pipe) {
- close(name_pipe[0]);
- set_nonblocking(name_pipe[1]);
- } else
- name_pipe[1] = -1;
if (f_in != f_out)
close(f_in);
set_msg_fd_in(error_pipe[0]);
- generate_files(f_out, flist, local_name, name_pipe[1]);
+ generate_files(f_out, flist, local_name);
- report(-1);
+ handle_stats(-1);
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
+ the_file_list = flist;
if (argc > 0) {
if (strcmp(dir,".")) {
if (write_batch)
start_write_batch(f_out);
- if (!read_batch) /* don't write to pipe */
- flist = send_file_list(f_out,argc,argv);
+ flist = send_file_list(f_out, argc, argv);
set_msg_fd_in(-1);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
+ the_file_list = flist;
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
+ handle_stats(-1);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out, flist->count);
+ read_final_goodbye(f_in, f_out);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
io_flush(FULL_FLUSH);
wait_process(pid, &status);
}
- report(-1);
+ output_summary();
io_flush(FULL_FLUSH);
exit_cleanup(status);
}
"the --recursive option?\n");
exit_cleanup(0);
}
+ the_file_list = flist;
local_name = get_local_name(flist,argv[0]);
return rc;
if (!read_batch) { /* for read_batch, NO source is specified */
+ argc--;
shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
if (shell_path) { /* source is remote */
+ argv++;
if (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
- argc-1, argv+1);
+ argc, argv);
}
daemon_over_rsh = 1;
}
+ am_sender = 0;
+ } else { /* source is local, check dest arg */
+ am_sender = 1;
+
if (argc < 1) { /* destination required */
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
- am_sender = 0;
- argv++;
- } else { /* source is local, check dest arg */
- am_sender = 1;
-
- shell_path = check_for_hostspec(argv[argc-1], &shell_machine, &rsync_port);
+ shell_path = check_for_hostspec(argv[argc], &shell_machine, &rsync_port);
if (shell_path && filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
exit_cleanup(RERR_SYNTAX);
}
shell_machine = NULL;
- shell_path = argv[argc-1];
+ shell_path = argv[argc];
} else if (rsync_port) {
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
- argc-1, argv);
+ argc, argv);
}
daemon_over_rsh = 1;
}
-
- if (argc < 2) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
- }
}
- argc--;
} else { /* read_batch */
local_server = 1;
shell_path = argv[argc-1];
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
+ if (!am_server)
+ output_summary();
close_all();
- if (log_got_error) _exit(RERR_PARTIAL);
+ if (log_got_error)
+ _exit(RERR_PARTIAL);
_exit(0);
}