Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
Copyright (C) Paul Mackerras 1996
+ Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
extern int verbose;
+static void show_malloc_stats(void);
/****************************************************************************
wait for a process to exit, calling io_flush while waiting
extern int remote_version;
int send_stats;
+ if (do_stats) {
+ /* These come out from every process */
+ show_malloc_stats();
+ show_flist_stats();
+ }
+
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender) return;
}
+/**
+ * If our C library can get malloc statistics, then show them to FINFO
+ **/
+static void show_malloc_stats(void)
+{
+#ifdef HAVE_MALLINFO
+ struct mallinfo mi;
+ extern int am_server;
+ extern int am_sender;
+ extern int am_daemon;
+
+ mi = mallinfo();
+
+ rprintf(FINFO, RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
+ getpid(),
+ am_server ? "server " : "",
+ am_daemon ? "daemon " : "",
+ am_sender ? "sender" : "receiver");
+ rprintf(FINFO, " arena: %10d (bytes from sbrk)\n", mi.arena);
+ rprintf(FINFO, " ordblks: %10d (chunks not in use)\n", mi.ordblks);
+ rprintf(FINFO, " smblks: %10d\n", mi.smblks);
+ rprintf(FINFO, " hblks: %10d (chunks from mmap)\n", mi.hblks);
+ rprintf(FINFO, " hblkhd: %10d (bytes from mmap)\n", mi.hblkhd);
+ rprintf(FINFO, " usmblks: %10d\n", mi.usmblks);
+ rprintf(FINFO, " fsmblks: %10d\n", mi.fsmblks);
+ rprintf(FINFO, " uordblks: %10d (bytes used)\n", mi.uordblks);
+ rprintf(FINFO, " fordblks: %10d (bytes free)\n", mi.fordblks);
+ rprintf(FINFO, " keepcost: %10d (bytes in releasable chunk)\n", mi.keepcost);
+#endif /* HAVE_MALLINFO */
+}
+
+
/* Start the remote shell. cmd may be NULL to use the default. */
static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
{
extern int blocking_io;
extern int read_batch;
- if (!read_batch && !local_server) { /* dw -- added read_batch */
+ if (!read_batch && !local_server) {
if (!cmd)
cmd = getenv(RSYNC_RSH_ENV);
if (!cmd)
args[argc++] = rsync_path;
- server_options(args,&argc);
+ if ((blocking_io == -1) && (strcmp(cmd, RSYNC_RSH) == 0))
+ blocking_io = 1;
+ server_options(args,&argc);
- if (strcmp(cmd, RSYNC_RSH) == 0) blocking_io = 1;
}
args[argc++] = ".";
if (local_server) {
if (read_batch)
- create_flist_from_batch();
+ create_flist_from_batch(); /* sets batch_flist */
ret = local_child(argc, args, f_in, f_out);
} else {
ret = piped_child(args,f_in,f_out);
extern int am_daemon;
extern int module_id;
extern int am_sender;
- extern int read_batch; /* dw */
- extern struct file_list *batch_flist; /* dw */
+ extern int read_batch;
+ extern struct file_list *batch_flist;
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
if (delete_mode && !delete_excluded)
recv_exclude_list(f_in);
- if (read_batch) /* dw */
+ if (read_batch)
flist = batch_flist;
else
flist = recv_file_list(f_in);
extern int cvs_exclude;
extern int am_sender;
extern int remote_version;
- extern int read_batch; /* dw */
+ extern int read_batch;
setup_protocol(f_out, f_in);
io_start_multiplex_out(f_out);
if (am_sender) {
- if (!read_batch) { /* dw */
+ if (!read_batch) {
recv_exclude_list(f_in);
if (cvs_exclude)
add_cvs_excludes();
*/
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
{
- struct file_list *flist;
+ struct file_list *flist = NULL;
int status = 0, status2 = 0;
char *local_name = NULL;
extern int am_sender;
extern int remote_version;
extern pid_t cleanup_child_pid;
- extern int write_batch; /* dw */
- extern int read_batch; /* dw */
- extern struct file_list *batch_flist; /* dw */
+ extern int write_batch;
+ extern int read_batch;
+ extern struct file_list *batch_flist;
cleanup_child_pid = pid;
if (read_batch)
- flist = batch_flist; /* dw */
+ flist = batch_flist;
set_nonblocking(f_in);
set_nonblocking(f_out);
}
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run waiting on %d\n",pid);
+ rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
io_flush();
wait_process(pid, &status);
}
list_only = 1;
}
- if (!write_batch) /* dw */
+ if (!write_batch)
send_exclude_list(f_out);
flist = recv_file_list(f_in);
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+ rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid);
io_flush();
wait_process(pid, &status);
}
}
+static int copy_argv (char *argv[])
+{
+ int i;
+
+ for (i = 0; argv[i]; i++) {
+ if (!(argv[i] = strdup(argv[i]))) {
+ rprintf (FERROR, "out of memory at %s(%d)\n",
+ __FILE__, __LINE__);
+ return RERR_MALLOC;
+ }
+ }
+
+ return 0;
+}
+
+
/*
* Start a client for either type of remote connection. Work out
* whether the arguments request a remote shell or rsyncd connection,
extern char *shell_cmd;
extern int rsync_port;
extern int whole_file;
- char *argv0 = strdup(argv[0]);
+ extern int write_batch;
extern int read_batch;
+ int rc;
- if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
+ /* Don't clobber argv[] so that ps(1) can still show the right
+ command line. */
+ if ((rc = copy_argv (argv)))
+ return rc;
+
+ if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
char *host, *path;
- host = argv0 + strlen(URL_PREFIX);
+ host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
*p = 0;
return start_socket_client(host, path, argc-1, argv+1);
}
- if (!read_batch) { /* dw */
+ if (!read_batch) {
p = find_colon(argv[0]);
if (p) {
if (p[1] == ':') {
*p = 0;
- return start_socket_client(argv0, p+2, argc-1, argv+1);
+ return start_socket_client(argv[0], p+2, argc-1, argv+1);
}
if (argc < 1) {
am_sender = 0;
*p = 0;
- shell_machine = argv0;
+ shell_machine = argv[0];
shell_path = p+1;
argc--;
argv++;
p = find_colon(argv[argc-1]);
if (!p) {
local_server = 1;
- /* disable "rsync algorithm" when both sides local */
- whole_file = 1;
+ /*
+ * disable "rsync algorithm" when both sides local,
+ * except when creating a batch update
+ */
+ if (!write_batch && whole_file == -1)
+ whole_file = 1;
} else if (p[1] == ':') {
*p = 0;
return start_socket_client(argv[argc-1], p+2, argc-1, argv);
argc--;
}
} else {
- am_sender = 1; /* dw */
- local_server = 1; /* dw */
- shell_path = argv[argc-1]; /* dw */
+ am_sender = 1;
+ local_server = 1;
+ shell_path = argv[argc-1];
}
if (shell_machine) {
extern int am_daemon;
extern int am_server;
int ret;
- extern int read_batch; /* dw */
- extern int write_batch; /* dw */
- extern char *batch_ext; /* dw */
- int orig_argc; /* dw */
+ extern int write_batch;
+ int orig_argc;
+ char **orig_argv;
- orig_argc = argc; /* dw */
+ orig_argc = argc;
+ orig_argv = argv;
signal(SIGUSR1, sigusr1_handler);
signal(SIGUSR2, sigusr2_handler);
}
signal(SIGINT,SIGNAL_CAST sig_int);
- signal(SIGPIPE,SIGNAL_CAST sig_int);
signal(SIGHUP,SIGNAL_CAST sig_int);
signal(SIGTERM,SIGNAL_CAST sig_int);
+ /* Ignore SIGPIPE; we consistently check error codes and will
+ * see the EPIPE. */
+ signal(SIGPIPE, SIG_IGN);
+
/* 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
that implement getcwd that way "pwd" can't be found after chroot. */
push_dir(NULL,0);
- if (write_batch) { /* dw */
- create_batch_file_ext();
- write_batch_argvs_file(orig_argc, argc, argv);
- }
-
- if (read_batch) { /* dw */
- set_batch_file_ext(batch_ext);
+ if (write_batch && !am_server) {
+ write_batch_argvs_file(orig_argc, orig_argv);
}
if (am_daemon) {
}
ret = start_client(argc, argv);
- exit_cleanup(ret);
+ if (ret == -1)
+ exit_cleanup(RERR_STARTCLIENT);
+ else
+ exit_cleanup(ret);
return ret;
}
-