#include "rsync.h"
time_t starttime = 0;
-int64 total_size = 0;
+
+struct stats stats;
extern int csum_length;
static void report(int f)
{
- int64 in,out,tsize;
time_t t = time(NULL);
extern int am_server;
extern int am_sender;
extern int am_daemon;
+ extern int do_stats;
if (am_daemon) {
syslog(LOG_INFO,"wrote %.0f bytes read %.0f bytes total size %.0f\n",
- (double)write_total(),(double)read_total(),
- (double)total_size);
+ (double)stats.total_written,
+ (double)stats.total_read,
+ (double)stats.total_size);
if (f == -1 || !am_sender) return;
}
if (am_server && !am_sender) return;
if (am_server && am_sender) {
- write_longint(f,read_total());
- write_longint(f,write_total());
- write_longint(f,total_size);
+ write_longint(f,stats.total_read);
+ write_longint(f,stats.total_written);
+ write_longint(f,stats.total_size);
return;
}
- if (am_sender) {
- in = read_total();
- out = write_total();
- tsize = total_size;
- } else {
- out = read_longint(f);
- in = read_longint(f);
- tsize = read_longint(f);
+ if (!am_sender) {
+ int64 r;
+ stats.total_written = read_longint(f);
+ r = read_longint(f);
+ stats.total_size = read_longint(f);
+ stats.total_read = r;
+ }
+
+ if (do_stats) {
+ printf("\nNumber of files: %d\n", stats.num_files);
+ printf("Number of files transferred: %d\n",
+ stats.num_transferred_files);
+ printf("Total file size: %.0f bytes\n",
+ (double)stats.total_size);
+ printf("Total transferred file size: %.0f bytes\n",
+ (double)stats.total_transferred_size);
+ printf("Literal data: %.0f bytes\n",
+ (double)stats.literal_data);
+ printf("Matched data: %.0f bytes\n",
+ (double)stats.matched_data);
+ printf("File list size: %d\n", stats.flist_size);
+ printf("Total bytes written: %.0f\n",
+ (double)stats.total_written);
+ printf("Total bytes read: %.0f\n\n",
+ (double)stats.total_read);
}
printf("wrote %.0f bytes read %.0f bytes %.2f bytes/sec\n",
- (double)out,(double)in,(in+out)/(0.5 + (t-starttime)));
+ (double)stats.total_written,
+ (double)stats.total_read,
+ (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
printf("total size is %.0f speedup is %.2f\n",
- (double)tsize,(1.0*tsize)/(in+out));
+ (double)stats.total_size,
+ (1.0*stats.total_size)/(stats.total_written+stats.total_read));
}
starttime = time(NULL);
am_root = (getuid() == 0);
+ memset(&stats, 0, sizeof(stats));
+
if (argc < 2) {
usage(FERROR);
exit_cleanup(1);
extern int relative_paths;
extern int io_timeout;
extern int io_error;
+extern struct stats stats;
/*
free a sums struct
if (verbose > 3)
rprintf(FINFO,"data recv %d at %d\n",i,(int)offset);
+ stats.literal_data += i;
sum_update(data,i);
if (fd != -1 && write_file(fd,data,i) != i) {
if (i == count-1 && remainder != 0)
len = remainder;
+ stats.matched_data += len;
+
if (verbose > 3)
rprintf(FINFO,"chunk[%d] of size %d at %d offset=%d\n",
i,len,(int)offset2,(int)offset);
}
-int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
-{
- int fd1,fd2;
- STRUCT_STAT st;
- char *fname;
- char fnametmp[MAXPATHLEN];
- struct map_struct *buf;
- int i;
- struct file_struct *file;
- int phase=0;
- int recv_ok;
- if (verbose > 2) {
- rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
- }
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
- }
+static int get_tmpname(char *fnametmp, char *fname)
+{
+ char *f;
+
+ /* open tmp file */
+ if (tmpdir) {
+ f = strrchr(fname,'/');
+ if (f == NULL)
+ f = fname;
+ else
+ f++;
+ if (strlen(tmpdir)+strlen(f)+10 > MAXPATHLEN) {
+ rprintf(FERROR,"filename too long\n");
+ return 0;
+ }
+ slprintf(fnametmp,MAXPATHLEN-1, "%s/.%s.XXXXXX",tmpdir,f);
+ return 1;
+ }
- while (1)
- {
- i = read_int(f_in);
- if (i == -1) {
- if (phase==0 && remote_version >= 13) {
- phase++;
- csum_length = SUM_LENGTH;
- if (verbose > 2)
- rprintf(FINFO,"recv_files phase=%d\n",phase);
- write_int(f_gen,-1);
- continue;
+ f = strrchr(fname,'/');
+
+ if (strlen(fname)+9 > MAXPATHLEN) {
+ rprintf(FERROR,"filename too long\n");
+ return 0;
}
- break;
- }
- file = flist->files[i];
- fname = f_name(file);
+ if (f) {
+ *f = 0;
+ slprintf(fnametmp,MAXPATHLEN-1,"%s/.%s.XXXXXX",
+ fname,f+1);
+ *f = '/';
+ } else {
+ slprintf(fnametmp,MAXPATHLEN-1,".%s.XXXXXX",fname);
+ }
- if (local_name)
- fname = local_name;
+ return 1;
+}
- if (dry_run) {
- if (!am_server && verbose)
- printf("%s\n",fname);
- continue;
- }
+int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
+{
+ int fd1,fd2;
+ STRUCT_STAT st;
+ char *fname;
+ char fnametmp[MAXPATHLEN];
+ struct map_struct *buf;
+ int i;
+ struct file_struct *file;
+ int phase=0;
+ int recv_ok;
+
+ if (verbose > 2) {
+ rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
+ }
- if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
- /* open the file */
- fd1 = open(fname,O_RDONLY);
+ while (1) {
+ i = read_int(f_in);
+ if (i == -1) {
+ if (phase==0 && remote_version >= 13) {
+ phase++;
+ csum_length = SUM_LENGTH;
+ if (verbose > 2)
+ rprintf(FINFO,"recv_files phase=%d\n",phase);
+ write_int(f_gen,-1);
+ continue;
+ }
+ break;
+ }
- if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
- receive_data(f_in,NULL,-1,NULL);
- close(fd1);
- continue;
- }
+ if (i < 0 || i >= flist->count) {
+ rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
+ i, flist->count);
+ exit_cleanup(1);
+ }
- if (fd1 != -1 && !S_ISREG(st.st_mode)) {
- rprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
- receive_data(f_in,NULL,-1,NULL);
- close(fd1);
- continue;
- }
+ file = flist->files[i];
+ fname = f_name(file);
- if (fd1 != -1 && st.st_size > 0) {
- buf = map_file(fd1,st.st_size);
- if (verbose > 2)
- rprintf(FINFO,"recv mapped %s of size %d\n",fname,(int)st.st_size);
- } else {
- buf = NULL;
- }
+ stats.num_transferred_files++;
+ stats.total_transferred_size += file->length;
- /* open tmp file */
- if (tmpdir) {
- char *f;
- f = strrchr(fname,'/');
- if (f == NULL)
- f = fname;
- else
- f++;
- if (strlen(tmpdir)+strlen(f)+10 > MAXPATHLEN) {
- rprintf(FERROR,"filename too long\n");
- if (buf) unmap_file(buf);
- close(fd1);
- continue;
- }
- slprintf(fnametmp,sizeof(fnametmp)-1, "%s/.%s.XXXXXX",tmpdir,f);
- } else {
- char *f = strrchr(fname,'/');
-
- if (strlen(fname)+9 > MAXPATHLEN) {
- rprintf(FERROR,"filename too long\n");
- if (buf) unmap_file(buf);
- close(fd1);
- continue;
- }
-
- if (f) {
- *f = 0;
- slprintf(fnametmp,sizeof(fnametmp)-1,"%s/.%s.XXXXXX",fname,f+1);
- *f = '/';
- } else {
- slprintf(fnametmp,sizeof(fnametmp)-1,".%s.XXXXXX",fname);
- }
- }
- if (NULL == do_mktemp(fnametmp)) {
- rprintf(FERROR,"mktemp %s failed\n",fnametmp);
- receive_data(f_in,buf,-1,NULL);
- if (buf) unmap_file(buf);
- close(fd1);
- continue;
- }
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
- if (fd2 == -1 && relative_paths && errno == ENOENT &&
- create_directory_path(fnametmp) == 0) {
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
- }
- if (fd2 == -1) {
- rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
- receive_data(f_in,buf,-1,NULL);
- if (buf) unmap_file(buf);
- close(fd1);
- continue;
- }
-
- cleanup_fname = fnametmp;
+ if (local_name)
+ fname = local_name;
- if (!am_server && verbose)
- printf("%s\n",fname);
+ if (dry_run) {
+ if (!am_server && verbose)
+ printf("%s\n",fname);
+ continue;
+ }
- /* recv file data */
- recv_ok = receive_data(f_in,buf,fd2,fname);
+ if (verbose > 2)
+ rprintf(FINFO,"recv_files(%s)\n",fname);
- if (buf) unmap_file(buf);
- if (fd1 != -1) {
- close(fd1);
- }
- close(fd2);
+ /* open the file */
+ fd1 = open(fname,O_RDONLY);
- if (verbose > 2)
- rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
+ if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+ rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
+ receive_data(f_in,NULL,-1,NULL);
+ close(fd1);
+ continue;
+ }
- if (make_backups) {
- char fnamebak[MAXPATHLEN];
- if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
- rprintf(FERROR,"backup filename too long\n");
- continue;
- }
- slprintf(fnamebak,sizeof(fnamebak)-1,"%s%s",fname,backup_suffix);
- if (do_rename(fname,fnamebak) != 0 && errno != ENOENT) {
- rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
- continue;
- }
- }
+ if (fd1 != -1 && !S_ISREG(st.st_mode)) {
+ rprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
+ receive_data(f_in,NULL,-1,NULL);
+ close(fd1);
+ continue;
+ }
- /* move tmp file over real file */
- if (do_rename(fnametmp,fname) != 0) {
- if (errno == EXDEV) {
- /* rename failed on cross-filesystem link.
- Copy the file instead. */
- if (copy_file(fnametmp,fname, file->mode)) {
- rprintf(FERROR,"copy %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
- } else {
- set_perms(fname,file,NULL,0);
- }
- do_unlink(fnametmp);
- } else {
- rprintf(FERROR,"rename %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
- do_unlink(fnametmp);
- }
- } else {
- set_perms(fname,file,NULL,0);
- }
+ if (fd1 != -1 && st.st_size > 0) {
+ buf = map_file(fd1,st.st_size);
+ if (verbose > 2)
+ rprintf(FINFO,"recv mapped %s of size %d\n",fname,(int)st.st_size);
+ } else {
+ buf = NULL;
+ }
- cleanup_fname = NULL;
+ if (!get_tmpname(fnametmp,fname)) {
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
+ if (NULL == do_mktemp(fnametmp)) {
+ rprintf(FERROR,"mktemp %s failed\n",fnametmp);
+ receive_data(f_in,buf,-1,NULL);
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
- if (!recv_ok) {
- if (csum_length == SUM_LENGTH) {
- rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- fname);
- } else {
- if (verbose > 1)
- rprintf(FINFO,"redoing %s(%d)\n",fname,i);
- write_int(f_gen,i);
- }
- }
- }
+ fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+ if (fd2 == -1 && relative_paths && errno == ENOENT &&
+ create_directory_path(fnametmp) == 0) {
+ fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+ }
+ if (fd2 == -1) {
+ rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
+ receive_data(f_in,buf,-1,NULL);
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
+
+ cleanup_fname = fnametmp;
+
+ if (!am_server && verbose)
+ printf("%s\n",fname);
+
+ /* recv file data */
+ recv_ok = receive_data(f_in,buf,fd2,fname);
+
+ if (buf) unmap_file(buf);
+ if (fd1 != -1) {
+ close(fd1);
+ }
+ close(fd2);
+
+ if (verbose > 2)
+ rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
+
+ if (make_backups) {
+ char fnamebak[MAXPATHLEN];
+ if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
+ rprintf(FERROR,"backup filename too long\n");
+ continue;
+ }
+ slprintf(fnamebak,sizeof(fnamebak)-1,"%s%s",fname,backup_suffix);
+ if (do_rename(fname,fnamebak) != 0 && errno != ENOENT) {
+ rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
+ continue;
+ }
+ }
- if (preserve_hard_links)
- do_hard_links(flist);
+ /* move tmp file over real file */
+ if (do_rename(fnametmp,fname) != 0) {
+ if (errno == EXDEV) {
+ /* rename failed on cross-filesystem link.
+ Copy the file instead. */
+ if (copy_file(fnametmp,fname, file->mode)) {
+ rprintf(FERROR,"copy %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
+ do_unlink(fnametmp);
+ } else {
+ rprintf(FERROR,"rename %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ do_unlink(fnametmp);
+ }
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
- /* now we need to fix any directory permissions that were
- modified during the transfer */
- for (i = 0; i < flist->count; i++) {
- file = flist->files[i];
- if (!file->basename || !S_ISDIR(file->mode)) continue;
- recv_generator(f_name(file),flist,i,-1);
- }
+ cleanup_fname = NULL;
+
+
+ if (!recv_ok) {
+ if (csum_length == SUM_LENGTH) {
+ rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
+ fname);
+ } else {
+ if (verbose > 1)
+ rprintf(FINFO,"redoing %s(%d)\n",fname,i);
+ write_int(f_gen,i);
+ }
+ }
+ }
- if (verbose > 2)
- rprintf(FINFO,"recv_files finished\n");
-
- return 0;
+ if (preserve_hard_links)
+ do_hard_links(flist);
+
+ /* now we need to fix any directory permissions that were
+ modified during the transfer */
+ for (i = 0; i < flist->count; i++) {
+ file = flist->files[i];
+ if (!file->basename || !S_ISDIR(file->mode)) continue;
+ recv_generator(f_name(file),flist,i,-1);
+ }
+
+ if (verbose > 2)
+ rprintf(FINFO,"recv_files finished\n");
+
+ return 0;
}
break;
}
+ if (i < 0 || i >= flist->count) {
+ rprintf(FERROR,"Invalid file index %d (count=%d)\n",
+ i, flist->count);
+ exit_cleanup(1);
+ }
+
file = flist->files[i];
+ stats.num_transferred_files++;
+ stats.total_transferred_size += file->length;
+
fname[0] = 0;
if (file->basedir) {
strlcpy(fname,file->basedir,MAXPATHLEN-1);
write_int(f,-1);
}
-
-
- if (verbose > 2)
- rprintf(FINFO,"generator wrote %ld\n",(long)write_total());
}
Matt McCutchen's Web Site / rsync / rsync.git / commitdiff