if (f == -1 || !am_sender) return;
}
- if (!verbose) return;
-
- if (am_server && !am_sender) return;
-
- if (am_server && am_sender) {
- write_longint(f,stats.total_read);
- write_longint(f,stats.total_written);
- write_longint(f,stats.total_size);
+ if (am_server) {
+ if (verbose && am_sender) {
+ int64 w;
+ /* store total_written in a temporary
+ because write_longint changes it */
+ w = stats.total_written;
+ write_longint(f,stats.total_read);
+ write_longint(f,w);
+ write_longint(f,stats.total_size);
+ }
return;
}
-
- if (!am_sender) {
+
+ /* this is the client */
+
+ if (!am_sender && verbose) {
+ /* note that if (!verbose && do_stats) then these values will
+ be taken from the receiver side's copy. The total size
+ is identical but the bytes read and written are slightly
+ different. It's done this way to avoid modifying the
+ protocol to support --stats without -v. */
int64 r;
stats.total_written = read_longint(f);
+ /* store total_read in a temporary, read_longint changes it */
r = read_longint(f);
stats.total_size = read_longint(f);
stats.total_read = r;
(double)stats.total_read);
}
- rprintf(FINFO,"wrote %.0f bytes read %.0f bytes %.2f bytes/sec\n",
- (double)stats.total_written,
- (double)stats.total_read,
- (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
- rprintf(FINFO,"total size is %.0f speedup is %.2f\n",
- (double)stats.total_size,
- (1.0*stats.total_size)/(stats.total_written+stats.total_read));
+ if (verbose || do_stats) {
+ rprintf(FINFO,"wrote %.0f bytes read %.0f bytes %.2f bytes/sec\n",
+ (double)stats.total_written,
+ (double)stats.total_read,
+ (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
+ rprintf(FINFO,"total size is %.0f speedup is %.2f\n",
+ (double)stats.total_size,
+ (1.0*stats.total_size)/(stats.total_written+stats.total_read));
+ }
fflush(stdout);
fflush(stderr);
carried across */
orig_umask = (int)umask(0);
- if (!parse_arguments(argc, argv)) {
+ if (!parse_arguments(argc, argv, 1)) {
exit_cleanup(RERR_SYNTAX);
}