X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6f921167e854a829c94ad9c36feeec7c742b6322..f1f4dbd128c05bca1b3a305f775aca7034f188d7:/slow-down.diff

diff --git a/slow-down.diff b/slow-down.diff
index 87f8f5e..9e4de29 100644
--- a/slow-down.diff
+++ b/slow-down.diff
@@ -8,20 +8,26 @@ should really be a way to affect more of rsync's processing, perhaps by
 specifying a maximum disk I/O rate (and have that affect a maximum stat()
 rate or something like that).
 
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/slow-down.diff
+    ./configure                           (optional if already run)
+    make
+
 --- old/flist.c
 +++ new/flist.c
-@@ -58,6 +58,7 @@ extern int copy_links;
+@@ -63,6 +63,7 @@ extern int copy_links;
  extern int copy_unsafe_links;
  extern int protocol_version;
  extern int sanitize_paths;
 +extern unsigned long sleep_asec;
- extern const char *io_write_phase;
  extern struct stats stats;
- extern struct file_list *the_file_list;
-@@ -1049,6 +1050,9 @@ static void send_directory(int f, struct
+ extern char *filesfrom_host;
+ 
+@@ -1465,6 +1466,9 @@ static void send_directory(int f, struct
  		}
  
- 		send_file_name(f, flist, fbuf, NULL, 0);
+ 		send_file_name(f, flist, fbuf, NULL, flags, filter_level);
 +		/* Sleep for a bit, to avoid hammering the disk. */
 +		if (sleep_asec)
 +			usleep(sleep_asec);
@@ -30,7 +36,7 @@ rate or something like that).
  	fbuf[len] = '\0';
 --- old/options.c
 +++ new/options.c
-@@ -102,6 +102,7 @@ int size_only = 0;
+@@ -106,6 +106,7 @@ int size_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
@@ -38,19 +44,19 @@ rate or something like that).
  size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
-@@ -364,6 +365,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --password-file=FILE    read password from FILE\n");
+@@ -416,6 +417,7 @@ void usage(enum logcode F)
+   rprintf(F,"     --password-file=FILE    read daemon-access password from FILE\n");
    rprintf(F,"     --list-only             list the files instead of copying them\n");
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");
 +  rprintf(F,"     --slow-down=USECs       sleep N usec while creating the filelist\n");
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
-@@ -492,6 +494,7 @@ static struct poptOption long_options[] 
-   {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
+@@ -583,6 +585,7 @@ static struct poptOption long_options[] 
    {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
-   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
+   {"no-itemize-changes",0, POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
+   {"no-i",             0,  POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
 +  {"slow-down",        0,  POPT_ARG_LONG,   &sleep_asec, 0, 0, 0 },
-   {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
-   {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
-   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
+   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
+   {"no-bwlimit",       0,  POPT_ARG_VAL,    &bwlimit, 0, 0, 0 },
+   {"backup",          'b', POPT_ARG_VAL,    &make_backups, 1, 0, 0 },