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
- The variable allowed_lull is now our global.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
2b207be
..
c0196d2
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-20,8
+20,9
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
-
-time_t starttime = 0;
+#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
+#include <locale.h>
+#endif
extern int verbose;
extern int dry_run;
extern int verbose;
extern int dry_run;
@@
-66,6
+67,7
@@
extern char *shell_cmd;
extern char *batch_name;
int local_server = 0;
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. */
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
@@
-76,6
+78,9
@@
struct pid_status {
int status;
} pid_stat_table[MAXCHILDPROCS];
int status;
} pid_stat_table[MAXCHILDPROCS];
+static time_t starttime, endtime;
+static int64 total_read, total_written;
+
static void show_malloc_stats(void);
/****************************************************************************
static void show_malloc_stats(void);
/****************************************************************************
@@
-120,12
+125,13
@@
void wait_process(pid_t pid, int *status)
* 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). */
* 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. */
/* 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 */
if (do_stats && verbose > 1) {
/* These come out from every process */
@@
-157,7
+163,9
@@
static void report(int f)
/* this is the client */
/* this is the client */
- if (!am_sender) {
+ if (f < 0 && !am_sender) /* e.g. when we got an empty file list. */
+ ;
+ else if (!am_sender) {
/* Read the first two in opposite order because the meaning of
* read/write swaps when switching from sender to receiver. */
total_written = read_longint(f);
/* Read the first two in opposite order because the meaning of
* read/write swaps when switching from sender to receiver. */
total_written = read_longint(f);
@@
-178,7
+186,10
@@
static void report(int f)
write_longint(batch_fd, stats.flist_xfertime);
}
}
write_longint(batch_fd, stats.flist_xfertime);
}
}
+}
+static void output_summary(void)
+{
if (do_stats) {
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
if (do_stats) {
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
@@
-210,7
+221,7
@@
static void report(int f)
rprintf(FINFO,
"\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n",
(double)total_written, (double)total_read,
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));
rprintf(FINFO, "total size is %.0f speedup is %.2f\n",
(double)stats.total_size,
(double)stats.total_size / (total_written+total_read));
@@
-282,7
+293,7
@@
static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
/* Comparison leaves rooms for server_options(). */
for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
/* Comparison leaves rooms for server_options(). */
- if (argc >= MAX_ARGS -
100
) {
+ if (argc >= MAX_ARGS -
MAX_SERVER_ARGS
) {
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
@@
-429,23
+440,24
@@
static char *get_local_name(struct file_list *flist,char *name)
/* This is only called by the sender. */
/* 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 {
{
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. */
&& 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) {
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);
}
}
exit_cleanup(RERR_PROTOCOL);
}
}
@@
-500,15
+512,16
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
if (!flist || flist->count == 0) {
exit_cleanup(0);
}
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);
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)
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);
}
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
@@
-518,19
+531,16
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
int status = 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)
/* 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);
}
rsyserr(FERROR, errno, "pipe failed in do_recv");
exit_cleanup(RERR_IPC);
}
@@
-544,11
+554,6
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
if (pid == 0) {
close(error_pipe[0]);
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);
if (f_in != f_out)
close(f_out);
@@
-558,9
+563,9
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
/* 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);
io_flush(FULL_FLUSH);
-
report
(f_in);
+
handle_stats
(f_in);
send_msg(MSG_DONE, "", 0);
io_flush(FULL_FLUSH);
send_msg(MSG_DONE, "", 0);
io_flush(FULL_FLUSH);
@@
-574,7
+579,8
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
while (read_int(f_in) == flist->count
&& read_shortint(f_in) == ITEM_IS_NEW) {}
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);
}
exit_cleanup(RERR_PROTOCOL);
}
@@
-587,15
+593,10
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
am_generator = 1;
close_multiplexing_in();
am_generator = 1;
close_multiplexing_in();
- if (write_batch)
+ if (write_batch
&& !am_server
)
stop_write_batch();
close(error_pipe[1]);
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);
if (f_in != f_out)
close(f_in);
@@
-603,9
+604,9
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
set_msg_fd_in(error_pipe[0]);
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 */
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
@@
-676,6
+677,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
+ the_file_list = flist;
if (argc > 0) {
if (strcmp(dir,".")) {
if (argc > 0) {
if (strcmp(dir,".")) {
@@
-764,26
+766,27
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (filesfrom_host)
filesfrom_fd = f_in;
if (filesfrom_host)
filesfrom_fd = f_in;
- if (write_batch)
+ if (write_batch
&& !am_server
)
start_write_batch(f_out);
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");
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);
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
+ handle_stats(-1);
if (protocol_version >= 24)
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);
}
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);
}
io_flush(FULL_FLUSH);
exit_cleanup(status);
}
@@
-801,19
+804,19
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}
- if (write_batch)
+ if (write_batch
&& !am_server
)
start_write_batch(f_in);
flist = recv_file_list(f_in);
start_write_batch(f_in);
flist = recv_file_list(f_in);
- if (!flist || flist->count == 0) {
- rprintf(FINFO, "client: nothing to do: "
- "perhaps you need to specify some filenames or "
- "the --recursive option?\n");
- exit_cleanup(0);
- }
+ the_file_list = flist;
- local_name = get_local_name(flist,argv[0]);
+ if (flist && flist->count > 0) {
+ local_name = get_local_name(flist, argv[0]);
- status2 = do_recv(f_in,f_out,flist,local_name);
+ status2 = do_recv(f_in, f_out, flist, local_name);
+ } else {
+ handle_stats(-1);
+ output_summary();
+ }
if (pid != -1) {
if (verbose > 3)
if (pid != -1) {
if (verbose > 3)
@@
-866,8
+869,10
@@
static int start_client(int argc, char *argv[])
return rc;
if (!read_batch) { /* for read_batch, NO source is specified */
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 */
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 (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
@@
-878,22
+883,21
@@
static int start_client(int argc, char *argv[])
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
- argc
-1, argv+1
);
+ argc
, argv
);
}
daemon_over_rsh = 1;
}
}
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);
}
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,
if (shell_path && filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
@@
-908,22
+912,16
@@
static int start_client(int argc, char *argv[])
exit_cleanup(RERR_SYNTAX);
}
shell_machine = NULL;
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,
} else if (rsync_port) {
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
- argc
-1
, argv);
+ argc, argv);
}
daemon_over_rsh = 1;
}
}
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];
} else { /* read_batch */
local_server = 1;
shell_path = argv[argc-1];
@@
-989,8
+987,11
@@
static RETSIGTYPE sigusr1_handler(UNUSED(int val))
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
+ if (!am_server)
+ output_summary();
close_all();
close_all();
- if (log_got_error) _exit(RERR_PARTIAL);
+ if (log_got_error)
+ _exit(RERR_PARTIAL);
_exit(0);
}
_exit(0);
}
@@
-1115,6
+1116,10
@@
int main(int argc,char *argv[])
* see the EPIPE. */
signal(SIGPIPE, SIG_IGN);
* see the EPIPE. */
signal(SIGPIPE, SIG_IGN);
+#if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
+ setlocale(LC_CTYPE, "");
+#endif
+
/* Initialize push_dir here because on some old systems getcwd
* (implemented by forking "pwd" and reading its output) doesn't
* work when there are other child processes. Also, on all systems
/* Initialize push_dir here because on some old systems getcwd
* (implemented by forking "pwd" and reading its output) doesn't
* work when there are other child processes. Also, on all systems
@@
-1123,7
+1128,7
@@
int main(int argc,char *argv[])
init_flist();
init_flist();
- if (
write_batch || read_batch
) {
+ if (
(write_batch || read_batch) && !am_server
) {
if (write_batch)
write_batch_shell_file(orig_argc, orig_argv, argc);
if (write_batch)
write_batch_shell_file(orig_argc, orig_argv, argc);
@@
-1142,6
+1147,8
@@
int main(int argc,char *argv[])
if (read_batch)
read_stream_flags(batch_fd);
}
if (read_batch)
read_stream_flags(batch_fd);
}
+ if (write_batch < 0)
+ dry_run = 1;
if (am_daemon && !am_server)
return daemon_main();
if (am_daemon && !am_server)
return daemon_main();