X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/74eccbb1afc7b039d2879b82851334ff24e39cce..612d3765227d9d43bd9ba93986f8d9e6ee7baa47:/early-checksum.diff diff --git a/early-checksum.diff b/early-checksum.diff index fad536f..ccdada2 100644 --- a/early-checksum.diff +++ b/early-checksum.diff @@ -8,6 +8,12 @@ to its checksum pass during its normal find-the-different-files pass. 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. +To use this patch, run these commands for a successful build: + + patch -p1 flags |= FLAG_SUM_DIFFERS; + } + } @@ -45,7 +50,7 @@ for a local copy, so the old algorithm is used for local copies. extern int checksum_len; extern char *partial_dir; extern char *basis_dir[]; -@@ -375,7 +376,8 @@ void itemize(struct file_struct *file, i +@@ -577,7 +578,8 @@ void itemize(struct file_struct *file, i /* Perform our quick-check heuristic for determining if a file is unchanged. */ @@ -53,18 +58,18 @@ for a local copy, so the old algorithm is used for local copies. +int unchanged_file(char *fn, int fnamecmp_type, struct file_struct *file, + STRUCT_STAT *st) { - if (st->st_size != file->length) + if (st->st_size != F_LENGTH(file)) return 0; -@@ -384,6 +386,8 @@ int unchanged_file(char *fn, struct file +@@ -586,6 +588,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, checksum_len) == 0; + return memcmp(sum, F_SUM(file), checksum_len) == 0; } -@@ -626,7 +630,7 @@ static int try_dests_reg(struct file_str +@@ -825,7 +829,7 @@ static int try_dests_reg(struct file_str match_level = 1; /* FALL THROUGH */ case 1: @@ -73,7 +78,7 @@ for a local copy, so the old algorithm is used for local copies. continue; best_match = j; match_level = 2; -@@ -1201,7 +1205,7 @@ static void recv_generator(char *fname, +@@ -1511,7 +1515,7 @@ static void recv_generator(char *fname, ; else if (fnamecmp_type == FNAMECMP_FUZZY) ; @@ -84,15 +89,15 @@ for a local copy, so the old algorithm is used for local copies. 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; +@@ -448,7 +448,7 @@ int hard_link_check(struct file_struct * + } + break; + } +- if (!unchanged_file(cmpbuf, file, &alt_st)) ++ if (!unchanged_file(cmpbuf, 0, file, &alt_st)) + continue; + statret = 1; + *stp = alt_st; --- old/main.c +++ new/main.c @@ -47,6 +47,7 @@ extern int copy_dirlinks; @@ -103,17 +108,17 @@ for a local copy, so the old algorithm is used for local copies. extern int recurse; extern int relative_paths; extern int sanitize_paths; -@@ -69,6 +70,9 @@ extern char *shell_cmd; - extern char *batch_name; +@@ -71,6 +72,9 @@ extern char *batch_name; + extern char curr_dir[MAXPATHLEN]; extern struct filter_list_struct server_filter_list; +extern char curr_dir[MAXPATHLEN]; + +int pre_checksum = 0; int local_server = 0; + int new_root_dir = 0; mode_t orig_umask = 0; - struct file_list *the_file_list; -@@ -751,6 +755,7 @@ static void do_server_recv(int f_in, int +@@ -788,6 +792,7 @@ static void do_server_recv(int f_in, int struct file_list *flist; char *local_name = NULL; char *dir = NULL; @@ -121,18 +126,18 @@ for a local copy, so the old algorithm is used for local copies. int save_verbose = verbose; if (filesfrom_fd >= 0) { -@@ -794,6 +799,10 @@ static void do_server_recv(int f_in, int +@@ -831,6 +836,10 @@ static void do_server_recv(int f_in, int filesfrom_fd = -1; } + strlcpy(olddir, curr_dir, sizeof olddir); + if (always_checksum && !local_server && argc > 0) -+ pre_checksum = push_dir(argv[0]); ++ pre_checksum = push_dir(argv[0], 0); + flist = recv_file_list(f_in); verbose = save_verbose; if (!flist) { -@@ -802,6 +811,9 @@ static void do_server_recv(int f_in, int +@@ -839,6 +848,9 @@ static void do_server_recv(int f_in, int } the_file_list = flist; @@ -142,7 +147,7 @@ for a local copy, so the old algorithm is used for local copies. if (argc > 0) local_name = get_local_name(flist,argv[0]); -@@ -885,6 +897,7 @@ int client_run(int f_in, int f_out, pid_ +@@ -918,6 +930,7 @@ int client_run(int f_in, int f_out, pid_ { struct file_list *flist = NULL; int exit_code = 0, exit_code2 = 0; @@ -150,13 +155,13 @@ for a local copy, so the old algorithm is used for local copies. char *local_name = NULL; cleanup_child_pid = pid; -@@ -959,11 +972,18 @@ int client_run(int f_in, int f_out, pid_ +@@ -992,11 +1005,18 @@ int client_run(int f_in, int f_out, pid_ filesfrom_fd = -1; } + strlcpy(olddir, curr_dir, sizeof olddir); + if (always_checksum && !local_server) -+ pre_checksum = push_dir(argv[0]); ++ pre_checksum = push_dir(argv[0], 0); + if (write_batch && !am_server) start_write_batch(f_in); @@ -171,11 +176,11 @@ for a local copy, so the old algorithm is used for local copies. --- old/rsync.h +++ new/rsync.h -@@ -65,6 +65,7 @@ - #define FLAG_HLINK_TOL (1<<4) /* receiver/generator */ - #define FLAG_NO_FUZZY (1<<5) /* generator */ - #define FLAG_MISSING (1<<6) /* generator */ -+#define FLAG_SUM_DIFFERS (1<<7) /* receiver/generator */ +@@ -68,6 +68,7 @@ + #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */ + #define FLAG_HLINK_DONE (1<<8) /* receiver/generator */ + #define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */ ++#define FLAG_SUM_DIFFERS (1<<10)/* receiver/generator */ - /* update this if you make incompatible changes */ - #define PROTOCOL_VERSION 29 + #define BITS_SET(val,bits) (((val) & (bits)) == (bits)) + #define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))