X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/c8a8b4a7fd58ee1ee8b055a1559c71c9921d8753..5214a41bbae94607b196b199b483710e1babf292:/drop-cache.diff diff --git a/drop-cache.diff b/drop-cache.diff index 52d14d7..0fb8d67 100644 --- a/drop-cache.diff +++ b/drop-cache.diff @@ -56,18 +56,26 @@ You can get the latest edition of the patch from cheers tobi -Changes: +Changes: 2007-04-23 * pass --drop-cache on to the remote server * make test works now ---- old/checksum.c -+++ new/checksum.c -@@ -26,6 +26,10 @@ extern int protocol_version; - - int csum_length = SHORT_SUM_LENGTH; /* initial value */ +To use this patch, run these commands for a successful build: + + patch -p1 = 0; fd--) { if ((ret = do_fstat(fd, &st)) == 0) { ---- old/configure.in -+++ new/configure.in -@@ -561,7 +561,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd - strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -583,7 +583,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ - strerror putenv iconv_open locale_charset nl_langinfo getxattr \ -- extattr_get_link sigaction sigprocmask) -+ extattr_get_link sigaction sigprocmask posix_fadvise64) + seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \ + extattr_get_link sigaction sigprocmask setattrlist getgrouplist \ +- initgroups utimensat) ++ initgroups utimensat posix_fadvise64) - AC_CHECK_FUNCS(getpgrp tcgetpgrp) - if test $ac_cv_func_getpgrp = yes; then ---- old/fileio.c -+++ new/fileio.c -@@ -30,6 +30,12 @@ extern int sparse_files; + dnl cygwin iconv.h defines iconv_open as libiconv_open + if test x"$ac_cv_func_iconv_open" != x"yes"; then +diff --git a/fileio.c b/fileio.c +--- a/fileio.c ++++ b/fileio.c +@@ -31,6 +31,12 @@ extern int sparse_files; static char last_byte; - static size_t sparse_seek = 0; + static OFF_T sparse_seek = 0; +#ifdef HAVE_POSIX_FADVISE64 +#define close(fd) fadv_close(fd) @@ -118,9 +129,10 @@ Changes: int sparse_end(int f) { int ret; ---- old/generator.c -+++ new/generator.c -@@ -114,6 +114,10 @@ static int need_retouch_dir_times; +diff --git a/generator.c b/generator.c +--- a/generator.c ++++ b/generator.c +@@ -112,6 +112,10 @@ static int need_retouch_dir_times; static int need_retouch_dir_perms; static const char *solo_file = NULL; @@ -128,12 +140,13 @@ Changes: +#define close(fd) fadv_close(fd) +#endif + - /* For calling delete_item() and delete_dir_contents(). */ - #define DEL_RECURSE (1<<1) /* recurse */ - #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ ---- old/options.c -+++ new/options.c -@@ -58,6 +58,7 @@ int preserve_uid = 0; + enum nonregtype { + TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK + }; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -60,6 +60,7 @@ int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; int update_only = 0; @@ -141,7 +154,7 @@ Changes: int cvs_exclude = 0; int dry_run = 0; int do_xfers = 1; -@@ -319,6 +320,9 @@ void usage(enum logcode F) +@@ -671,6 +672,9 @@ void usage(enum logcode F) rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n"); rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); rprintf(F," -u, --update skip files that are newer on the receiver\n"); @@ -151,9 +164,9 @@ Changes: rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n"); rprintf(F," --append append data onto shorter files\n"); rprintf(F," --append-verify like --append, but with old data in file checksum\n"); -@@ -522,6 +526,9 @@ static struct poptOption long_options[] - {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, +@@ -892,6 +896,9 @@ static struct poptOption long_options[] = { + {"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, + {"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, +#ifdef HAVE_POSIX_FADVISE64 + {"drop-cache", 0, POPT_ARG_NONE, &drop_cache, 0, 0, 0 }, @@ -161,7 +174,7 @@ Changes: {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, {"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 }, -@@ -1664,6 +1671,11 @@ void server_options(char **args, int *ar +@@ -2272,6 +2279,11 @@ void server_options(char **args, int *argc_p) if (!am_sender) args[ac++] = "--sender"; @@ -173,45 +186,48 @@ Changes: x = 1; argstr[0] = '-'; ---- old/receiver.c -+++ new/receiver.c -@@ -62,6 +62,10 @@ static int phase = 0, redoing = 0; +diff --git a/receiver.c b/receiver.c +--- a/receiver.c ++++ b/receiver.c +@@ -64,6 +64,10 @@ static flist_ndx_list batch_redo_list; /* We're either updating the basis file or an identical copy: */ - static int updating_basis; + static int updating_basis_or_equiv; +#ifdef HAVE_POSIX_FADVISE64 +#define close(fd) fadv_close(fd) +#endif + - /* - * get_tmpname() - create a tmp filename for a given filename - * ---- old/rsync.yo -+++ new/rsync.yo -@@ -353,6 +353,7 @@ to the detailed description below for a + #define TMPNAME_SUFFIX ".XXXXXX" + #define TMPNAME_SUFFIX_LEN ((int)sizeof TMPNAME_SUFFIX - 1) + #define MAX_UNIQUE_NUMBER 999999 +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -359,6 +359,7 @@ to the detailed description below for a complete description. verb( --super receiver attempts super-user activities --fake-super store/recover privileged attrs using xattrs -S, --sparse handle sparse files efficiently + --drop-cache tell OS to drop caching of file data - -n, --dry-run show what would have been transferred - -W, --whole-file copy files whole (without rsync algorithm) + -n, --dry-run perform a trial run with no changes made + -W, --whole-file copy files whole (w/o delta-xfer algorithm) -x, --one-file-system don't cross filesystem boundaries -@@ -1009,6 +1010,10 @@ NOTE: Don't use this option when the des - filesystem. It doesn't seem to handle seeks over null regions - correctly and ends up corrupting the files. +@@ -1127,6 +1128,10 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs" + filesystem. It seems to have problems seeking over null regions, + and ends up corrupting the files. +dit(bf(--drop-cache)) Tell the OS to drop the caching of the file data. This +prevents rsync from filling up the filesystem cache. This can sometimes help +to make a system perform better by keeping non-rsync files in the disk cache. + - dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers, - instead it will just report the actions it would have taken. + dit(bf(-n, --dry-run)) This makes rsync perform a trial run that doesn't + make any changes (and produces mostly the same output as a real run). It + is most commonly used in combination with the bf(-v, --verbose) and/or +diff --git a/sender.c b/sender.c +--- a/sender.c ++++ b/sender.c +@@ -48,6 +48,10 @@ extern struct file_list *cur_flist, *first_flist, *dir_flist; ---- old/sender.c -+++ new/sender.c -@@ -46,6 +46,10 @@ extern int write_batch; - extern struct stats stats; - extern struct file_list *cur_flist, *first_flist, *dir_flist; + BOOL extra_flist_sending_enabled; +#ifdef HAVE_POSIX_FADVISE64 +#define close(fd) fadv_close(fd) @@ -220,27 +236,29 @@ Changes: /** * @file * ---- old/t_unsafe.c -+++ new/t_unsafe.c +diff --git a/t_unsafe.c b/t_unsafe.c +--- a/t_unsafe.c ++++ b/t_unsafe.c @@ -28,6 +28,7 @@ int am_root = 0; + int am_sender = 1; int read_only = 0; int list_only = 0; - int verbose = 0; +int drop_cache = 0; + int human_readable = 0; int preserve_perms = 0; + int preserve_executability = 0; +diff --git a/util.c b/util.c +--- a/util.c ++++ b/util.c +@@ -27,6 +27,7 @@ - int ---- old/util.c -+++ new/util.c -@@ -26,6 +26,7 @@ - extern int verbose; extern int dry_run; extern int module_id; +extern int drop_cache; extern int modify_window; extern int relative_paths; - extern int human_readable; -@@ -41,6 +42,131 @@ char curr_dir[MAXPATHLEN]; + extern int preserve_xattrs; +@@ -42,6 +43,131 @@ char curr_dir[MAXPATHLEN]; unsigned int curr_dir_len; int curr_dir_depth; /* This is only set for a sanitizing daemon. */ @@ -354,12 +372,12 @@ Changes: + fadv_fd_init_func(); + fadv_close_buffer_size += pos - fadv_fd_pos[fd]; + fadv_close_ring[fadv_close_ring_head] = newfd; -+ fadv_close_ring_head = (fadv_close_ring_head + 1) % fadv_max_fd; ++ fadv_close_ring_head = (fadv_close_ring_head + 1) % fadv_max_fd; + fadv_close_ring_size ++; + if (fadv_close_ring_size == fadv_max_fd || fadv_close_buffer_size > 1024*1024 ){ + /* it seems fastest to drop things 'in groups' */ + fadv_close_all(); -+ } ++ } + } + return close(fd); +}