I have benchmarked this a little, and it appears to slow things down
for a local copy, so the old algorithm is used for local copies.
---- orig/flist.c 2005-11-07 04:29:01
-+++ flist.c 2005-09-16 16:41:25
-@@ -36,6 +36,7 @@ extern int am_daemon;
+--- old/flist.c
++++ new/flist.c
+@@ -31,6 +31,7 @@ extern int am_daemon;
extern int am_sender;
extern int do_progress;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -707,6 +708,16 @@ static struct file_struct *receive_file_
+@@ -701,6 +702,16 @@ static struct file_struct *receive_file_
sum = empty_sum;
}
- read_buf(f, sum, slen);
+ read_buf(f, sum, checksum_len);
+ if (pre_checksum) {
+ char sum2[MD4_SUM_LENGTH];
+ STRUCT_STAT st;
-+ char *fname = f_name(file);
++ char *fname = f_name(file, NULL);
+ if (stat(fname, &st) == 0 && st.st_size == file_length) {
+ file_checksum(fname, sum2, st.st_size);
-+ if (memcmp(sum, sum2, slen) != 0)
++ if (memcmp(sum, sum2, checksum_len) != 0)
+ file->flags |= FLAG_SUM_DIFFERS;
+ }
+ }
}
- if (!preserve_perms) {
---- orig/generator.c 2005-10-30 22:30:28
-+++ generator.c 2005-09-16 16:41:25
-@@ -69,6 +69,7 @@ extern int ignore_timeout;
+ return file;
+--- old/generator.c
++++ new/generator.c
+@@ -71,6 +71,7 @@ extern int ignore_timeout;
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
+extern int pre_checksum;
+ extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
- extern int compare_dest;
-@@ -359,7 +360,8 @@ void itemize(struct file_struct *file, i
+@@ -374,7 +375,8 @@ void itemize(struct file_struct *file, i
/* Perform our quick-check heuristic for determining if a file is unchanged. */
--static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
-+static int unchanged_file(char *fn, int fnamecmp_type, struct file_struct *file,
-+ STRUCT_STAT *st)
+-int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
++int unchanged_file(char *fn, int fnamecmp_type, struct file_struct *file,
++ STRUCT_STAT *st)
{
if (st->st_size != file->length)
return 0;
-@@ -368,6 +370,8 @@ static int unchanged_file(char *fn, stru
+@@ -383,6 +385,8 @@ int unchanged_file(char *fn, struct file
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
+ if (pre_checksum && fnamecmp_type == FNAMECMP_FNAME)
+ return !(file->flags & FLAG_SUM_DIFFERS);
file_checksum(fn, sum, st->st_size);
- return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
- : MD4_SUM_LENGTH) == 0;
-@@ -923,7 +927,7 @@ static void recv_generator(char *fname,
- match_level = 1;
- /* FALL THROUGH */
- case 1:
-- if (!unchanged_file(fnamecmpbuf, file, &st))
-+ if (!unchanged_file(fnamecmpbuf, 0, file, &st))
- continue;
- best_match = i;
- match_level = 2;
-@@ -1051,7 +1055,7 @@ static void recv_generator(char *fname,
+ return memcmp(sum, file->u.sum, checksum_len) == 0;
+ }
+@@ -620,7 +624,7 @@ static int try_dests_reg(struct file_str
+ match_level = 1;
+ /* FALL THROUGH */
+ case 1:
+- if (!unchanged_file(cmpbuf, file, stp))
++ if (!unchanged_file(cmpbuf, 0, file, stp))
+ continue;
+ best_match = j;
+ match_level = 2;
+@@ -1182,7 +1186,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
- else if (unchanged_file(fnamecmp, file, &st)) {
+ else if (unchanged_file(fnamecmp, fnamecmp_type, file, &st)) {
- if (fnamecmp_type == FNAMECMP_FNAME) {
- if (itemizing) {
- itemize(file, ndx, real_ret, &real_st,
---- orig/main.c 2005-11-02 07:22:12
-+++ main.c 2005-11-07 05:00:49
-@@ -45,6 +45,7 @@ extern int copy_links;
+ if (partialptr) {
+ do_unlink(partialptr);
+ handle_partial_dir(partialptr, PDIR_DELETE);
+--- old/hlink.c
++++ new/hlink.c
+@@ -212,7 +212,7 @@ int hard_link_check(struct file_struct *
+ itemizing = code = 0;
+ break;
+ }
+- if (!unchanged_file(cmpbuf, file, &st3))
++ if (!unchanged_file(cmpbuf, 0, file, &st3))
+ continue;
+ statret = 1;
+ st = &st3;
+--- old/main.c
++++ new/main.c
+@@ -47,6 +47,7 @@ extern int copy_dirlinks;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
+extern int always_checksum;
extern int recurse;
extern int relative_paths;
- extern int rsync_port;
-@@ -60,8 +61,10 @@ extern char *filesfrom_host;
- extern char *rsync_path;
- extern char *shell_cmd;
- extern char *batch_name;
-+extern char curr_dir[MAXPATHLEN];
+ extern int sanitize_paths;
+@@ -68,6 +69,7 @@ extern char *batch_name;
+
+ extern char curr_dir[MAXPATHLEN];
- int local_server = 0;
+int pre_checksum = 0;
+ int local_server = 0;
+ mode_t orig_umask = 0;
struct file_list *the_file_list;
-
- /* There's probably never more than at most 2 outstanding child processes,
-@@ -633,6 +636,7 @@ static void do_server_recv(int f_in, int
+@@ -736,6 +738,7 @@ static void do_server_recv(int f_in, int
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
-@@ -677,6 +681,10 @@ static void do_server_recv(int f_in, int
+@@ -779,6 +782,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
-@@ -685,6 +693,9 @@ static void do_server_recv(int f_in, int
+@@ -787,6 +794,9 @@ static void do_server_recv(int f_in, int
}
the_file_list = flist;
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
-@@ -733,6 +744,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -848,6 +858,7 @@ int client_run(int f_in, int f_out, pid_
{
struct file_list *flist = NULL;
int exit_code = 0, exit_code2 = 0;
char *local_name = NULL;
cleanup_child_pid = pid;
-@@ -804,11 +816,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -922,11 +933,18 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
---- orig/rsync.h 2005-10-14 18:45:50
-+++ rsync.h 2005-09-16 16:41:26
+--- old/rsync.h
++++ new/rsync.h
@@ -64,6 +64,7 @@
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
- #define FLAG_SENT (1<<3) /* sender */
#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
-+#define FLAG_SUM_DIFFERS (1<<5) /* receiver/generator */
+ #define FLAG_NO_FUZZY (1<<5) /* generator */
++#define FLAG_SUM_DIFFERS (1<<6) /* receiver/generator */
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff