Moved a call to output_summary() up a line.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index b8be0d4..b7e6c3a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -21,8 +21,6 @@
 
 #include "rsync.h"
 
-time_t starttime = 0;
-
 extern int verbose;
 extern int dry_run;
 extern int list_only;
@@ -77,6 +75,9 @@ struct pid_status {
        int   status;
 } pid_stat_table[MAXCHILDPROCS];
 
+static time_t starttime, endtime;
+static int64 total_read, total_written;
+
 static void show_malloc_stats(void);
 
 /****************************************************************************
@@ -121,12 +122,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). */
-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 */
@@ -207,11 +209,17 @@ static void report(int f)
                        (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));
@@ -430,23 +438,24 @@ static char *get_local_name(struct file_list *flist,char *name)
 
 
 /* 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);
        }
 }
@@ -508,9 +517,9 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 
        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);
 }
@@ -520,19 +529,16 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 {
        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);
        }
@@ -546,11 +552,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 (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);
 
@@ -560,9 +561,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]);
 
-               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);
@@ -576,7 +577,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) {}
 
-                       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);
                }
 
@@ -593,11 +595,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
                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);
 
@@ -605,9 +602,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]);
 
-       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 */
@@ -778,15 +775,16 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                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);
        }
@@ -988,8 +986,11 @@ static RETSIGTYPE sigusr1_handler(UNUSED(int val))
 
 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);
 }