X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/cdcd21373a3358b21132ad227fe21a8543e45090..refs/heads/master:/time-limit.diff diff --git a/time-limit.diff b/time-limit.diff index 81c1e2d..1ec9c19 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -9,47 +9,43 @@ To use this patch, run these commands for a successful build: ./configure (optional if already run) make ---- old/io.c -+++ new/io.c -@@ -53,6 +53,7 @@ extern int protocol_version; - extern int remove_source_files; +based-on: a01e3b490eb36ccf9e704840e1b6683dab867550 +diff --git a/io.c b/io.c +--- a/io.c ++++ b/io.c +@@ -57,6 +57,7 @@ extern int remove_source_files; extern int preserve_hard_links; + extern BOOL extra_flist_sending_enabled; extern struct stats stats; +extern time_t stop_at_utime; extern struct file_list *cur_flist; #ifdef ICONV_OPTION extern int filesfrom_convert; -@@ -215,16 +216,24 @@ static void check_timeout(void) - { - time_t t; +@@ -161,11 +162,19 @@ static void check_timeout(BOOL allow_keepalive) + * the receiver ignores them. Note that the am_receiver flag is not + * set until the receiver forks from the generator, so timeouts will be + * based on receiving data on the receiving side until that event. */ +- if (!io_timeout || am_receiver) ++ if ((!io_timeout || am_receiver) && !stop_at_utime) + return; + + t = time(NULL); -+ if ((!io_timeout || ignore_timeout) && !stop_at_utime) -+ return; -+ -+ t = time(NULL); -+ + if (stop_at_utime && t >= stop_at_utime) { + rprintf(FERROR, "run-time limit exceeded\n"); + exit_cleanup(RERR_TIMEOUT); + } + - if (!io_timeout || ignore_timeout) - return; - - if (!last_io_in) { -- last_io_in = time(NULL); -+ last_io_in = t; - return; - } - -- t = time(NULL); -- - if (t - last_io_in >= io_timeout) { - if (!am_server && !am_daemon) { - rprintf(FERROR, "io timeout after %d seconds -- exiting\n", ---- old/options.c -+++ new/options.c -@@ -110,6 +110,7 @@ size_t bwlimit_writemax = 0; ++ if (!io_timeout || am_receiver) ++ return; ++ + if (allow_keepalive && we_send_keepalive_messages) { + /* This may put data into iobuf.msg w/o flushing. */ + maybe_send_keepalive(t, False); +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -112,6 +112,7 @@ size_t bwlimit_writemax = 0; int ignore_existing = 0; int ignore_non_existing = 0; int need_messages_from_generator = 0; @@ -57,34 +53,33 @@ To use this patch, run these commands for a successful build: int max_delete = INT_MIN; OFF_T max_size = 0; OFF_T min_size = 0; -@@ -416,6 +417,8 @@ void usage(enum logcode F) +@@ -776,6 +777,8 @@ 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," --bwlimit=RATE limit socket I/O bandwidth\n"); + rprintf(F," --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute\n"); + rprintf(F," --time-limit=MINS Stop rsync after MINS minutes have elapsed\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"); -@@ -438,7 +441,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP - OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, +@@ -800,6 +803,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, -- OPT_NO_D, OPT_APPEND, -+ OPT_NO_D, OPT_APPEND, OPT_STOP_AT, OPT_TIME_LIMIT, + OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, + OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT, ++ OPT_STOP_AT, OPT_TIME_LIMIT, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -603,6 +606,8 @@ static struct poptOption long_options[] - {"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 }, - {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 }, +@@ -989,6 +993,8 @@ static struct poptOption long_options[] = { {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 }, + {"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 }, + {"no-contimeout", 0, POPT_ARG_VAL, &connect_timeout, 0, 0, 0 }, + {"stop-at", 0, POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 }, + {"time-limit", 0, POPT_ARG_STRING, 0, OPT_TIME_LIMIT, 0, 0 }, {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, -@@ -1221,6 +1226,36 @@ int parse_arguments(int *argc_p, const c +@@ -1764,6 +1770,36 @@ int parse_arguments(int *argc_p, const char ***argv_p) return 0; #endif @@ -121,7 +116,7 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1841,6 +1876,15 @@ void server_options(char **args, int *ar +@@ -2480,6 +2516,15 @@ void server_options(char **args, int *argc_p) args[ac++] = arg; } @@ -137,20 +132,21 @@ To use this patch, run these commands for a successful build: if (backup_dir) { args[ac++] = "--backup-dir"; args[ac++] = backup_dir; ---- old/rsync.yo -+++ new/rsync.yo -@@ -422,6 +422,8 @@ to the detailed description below for a +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -431,6 +431,8 @@ to the detailed description below for a complete description. verb( --password-file=FILE read daemon-access password from FILE --list-only list the files instead of copying them - --bwlimit=KBPS limit I/O bandwidth; KBytes per second + --bwlimit=RATE limit socket I/O bandwidth + --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute + --time-limit=MINS Stop rsync after MINS minutes have elapsed --write-batch=FILE write a batched update to FILE --only-write-batch=FILE like --write-batch but w/o updating dest --read-batch=FILE read a batched update from FILE -@@ -1933,6 +1935,19 @@ transfer was too fast, it will wait befo - result is an average transfer rate equaling the specified limit. A value - of zero specifies no limit. +@@ -2309,6 +2311,19 @@ files can show up as being rapidly sent when the data is quickly buffered, + while other can show up as very slow when the flushing of the output buffer + occurs. This may be fixed in a future version. +dit(bf(--stop-at=y-m-dTh:m)) This option allows you to specify at what +time to stop rsync, in year-month-dayThour:minute numeric format (e.g. @@ -168,9 +164,10 @@ To use this patch, run these commands for a successful build: dit(bf(--write-batch=FILE)) Record a file that can later be applied to another identical destination with bf(--read-batch). See the "BATCH MODE" section for details, and also the bf(--only-write-batch) option. ---- old/util.c -+++ new/util.c -@@ -122,6 +122,133 @@ NORETURN void overflow_exit(const char * +diff --git a/util.c b/util.c +--- a/util.c ++++ b/util.c +@@ -123,6 +123,133 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); } @@ -301,6 +298,6 @@ To use this patch, run these commands for a successful build: + return val; +} + - int set_modtime(const char *fname, time_t modtime, mode_t mode) + int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) { - #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES + #ifndef CAN_SET_SYMLINK_TIMES