From 00891c37f35c50a9c97344c07347359d4dce8555 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 27 Apr 2004 03:04:54 +0000 Subject: [PATCH] Took John's new patch (with the --stopat option) and created a much simplified version with the options slightly tweaked. --- time-limit.diff | 215 ++++++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 97 deletions(-) diff --git a/time-limit.diff b/time-limit.diff index 5ed86ee..105ba4f 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -1,79 +1,127 @@ +John Taylor's patch for implementing --time-limit and --stop-at, reworked +to be simpler and more efficient by Wayne Davison. + +Do we need configure support for mktime() and strptime()? + --- io.c 16 Jan 2004 16:31:47 -0000 1.119 -+++ io.c 24 Apr 2004 07:49:11 -0000 -@@ -47,6 +47,7 @@ static time_t last_io; ++++ io.c 27 Apr 2004 02:56:33 -0000 +@@ -44,6 +44,7 @@ static int io_multiplexing_in; + static int multiplex_in_fd = -1; + static int multiplex_out_fd = -1; + static time_t last_io; ++extern time_t stop_at_utime; static int no_flush; extern int bwlimit; -+extern int timelimit; - extern int verbose; - extern int io_timeout; - extern int am_server; -@@ -759,6 +760,26 @@ static void sleep_for_bwlimit(int bytes_ - select(0, NULL, NULL, NULL, &tv); - } +@@ -125,15 +126,20 @@ static void check_timeout(void) + { + time_t t; -+/* -+ * When --timelimit is used, compare rsync_start_time and the current time -+ * and return 1 when the timelimit has been reached. -+ */ -+static int has_timelimit_expired() -+{ -+ struct timeval tv; -+ time_t start_time = 0; -+ time_t expiration_time = 0; -+ -+ assert(timelimit > 0); -+ -+ start_time = get_rsync_start_time(); -+ assert(start_time > 0); +- if (!io_timeout) ++ if (!io_timeout && !stop_at_utime) + return; + ++ t = time(NULL); + -+ gettimeofday(&tv, NULL); -+ expiration_time = start_time + (timelimit * 60); ++ if (stop_at_utime && t >= stop_at_utime) { ++ rprintf(FERROR, "run-time limit exceeded\n"); ++ exit_cleanup(RERR_TIMEOUT); ++ } + -+ return tv.tv_sec > expiration_time; -+} + if (!last_io) { +- last_io = time(NULL); ++ last_io = t; + return; + } +- +- t = time(NULL); - /** - * Write len bytes to the file descriptor @p fd. -@@ -837,6 +858,11 @@ static void writefd_unbuffered(int fd,ch - } + if (last_io && io_timeout && (t-last_io) >= io_timeout) { + if (!am_server && !am_daemon) { +--- options.c 17 Apr 2004 17:07:23 -0000 1.147 ++++ options.c 27 Apr 2004 02:56:33 -0000 +@@ -92,6 +92,7 @@ int modify_window = 0; + int blocking_io = -1; + int checksum_seed = 0; + unsigned int block_size = 0; ++time_t stop_at_utime = 0; - sleep_for_bwlimit(ret); -+ -+ if (timelimit && has_timelimit_expired()) { -+ rprintf(FERROR, RSYNC_NAME ": \n%d minute time limit exceeded.\n", timelimit); -+ exit_cleanup(RERR_PARTIAL); -+ } - - total += ret; ---- options.c 17 Apr 2004 17:07:23 -0000 1.147 -+++ options.c 24 Apr 2004 07:49:11 -0000 -@@ -83,6 +83,7 @@ int safe_symlinks = 0; - int copy_unsafe_links = 0; - int size_only = 0; - int bwlimit = 0; -+int timelimit = 0; - int delete_after = 0; - int only_existing = 0; - int opt_ignore_existing = 0; -@@ -288,6 +289,7 @@ void usage(enum logcode F) + /** Network address family. **/ +@@ -288,6 +289,8 @@ void usage(enum logcode F) rprintf(F," --log-format=FORMAT log file transfers using specified format\n"); rprintf(F," --password-file=FILE get password from FILE\n"); rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); -+ rprintf(F," --timelimit=MINS Stop rsync after MINS minutes\n"); ++ rprintf(F," --stop-at=YY-MM-DD@HH:MM Stop rsync at year-month-day@hour:minute\n"); ++ rprintf(F," --time-limit=TIME Stop rsync after TIME minutes have elapsed\n"); rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); rprintf(F," -h, --help show this help screen\n"); -@@ -377,6 +379,7 @@ static struct poptOption long_options[] +@@ -305,7 +308,7 @@ void usage(enum logcode F) + enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, + OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, + OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, +- OPT_READ_BATCH, OPT_WRITE_BATCH, ++ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_STOP_AT, OPT_TIME_LIMIT, + OPT_REFUSED_BASE = 9000}; + + static struct poptOption long_options[] = { +@@ -377,6 +380,8 @@ static struct poptOption long_options[] {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 }, {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, -+ {"timelimit", 0, POPT_ARG_INT, &timelimit, 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 }, {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, -@@ -881,6 +884,12 @@ void server_options(char **args,int *arg +@@ -471,6 +476,7 @@ int parse_arguments(int *argc, const cha + { + int opt; + char *ref = lp_refuse_options(module_id); ++ struct tm stop_at_tm; + const char *arg; + poptContext pc; + +@@ -584,6 +590,37 @@ int parse_arguments(int *argc, const cha + return 0; + #endif + ++ case OPT_STOP_AT: ++ arg = poptGetOptArg(pc); ++ if (!strptime(arg, "%y-%m-%d@%H:%M", &stop_at_tm)) { ++ snprintf(err_buf, sizeof err_buf, ++ "invalid --stop-at format: %s\n", ++ arg); ++ rprintf(FERROR, "ERROR: %s", err_buf); ++ return 0; ++ } ++ stop_at_utime = mktime(&stop_at_tm); ++ if (stop_at_utime < time(NULL)) { ++ snprintf(err_buf, sizeof err_buf, ++ "--stop-at time is in the past: %s\n", ++ arg); ++ rprintf(FERROR, "ERROR: %s", err_buf); ++ return 0; ++ } ++ break; ++ ++ case OPT_TIME_LIMIT: ++ arg = poptGetOptArg(pc); ++ if ((stop_at_utime = atol(arg) * 60) <= 0) { ++ snprintf(err_buf, sizeof err_buf, ++ "invalid --time-limit value: %s\n", ++ arg); ++ rprintf(FERROR, "ERROR: %s", err_buf); ++ return 0; ++ } ++ stop_at_utime += time(NULL); ++ break; ++ + default: + /* A large opt value means that set_refuse_options() + * turned this option off (opt-BASE is its index). */ +@@ -881,6 +918,15 @@ void server_options(char **args,int *arg if (bwlimit) { if (asprintf(&arg, "--bwlimit=%d", bwlimit) < 0) @@ -81,63 +129,36 @@ + args[ac++] = arg; + } + -+ if (timelimit) { -+ if (asprintf(&arg, "--timelimit=%d", timelimit) < 0) ++ if (stop_at_utime) { ++ long mins = (stop_at_utime - time(NULL)) / 60; ++ if (mins <= 0) ++ mins = 1; ++ if (asprintf(&arg, "--time-limit=%ld", mins) < 0) goto oom; args[ac++] = arg; } ---- proto.h 22 Apr 2004 09:58:09 -0000 1.189 -+++ proto.h 24 Apr 2004 07:49:11 -0000 -@@ -266,6 +266,7 @@ int u_strcmp(const char *cs1, const char - int unsafe_symlink(const char *dest, const char *src); - char *timestring(time_t t); - int msleep(int t); -+time_t get_rsync_start_time(void); - int cmp_modtime(time_t file1, time_t file2); - int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); - void *_new_array(unsigned int size, unsigned long num); --- rsync.yo 24 Apr 2004 06:16:04 -0000 1.164 -+++ rsync.yo 24 Apr 2004 07:49:12 -0000 -@@ -346,6 +346,7 @@ verb( ++++ rsync.yo 27 Apr 2004 02:56:35 -0000 +@@ -346,6 +346,8 @@ verb( --log-format=FORMAT log file transfers using specified format --password-file=FILE get password from FILE --bwlimit=KBPS limit I/O bandwidth, KBytes per second -+ --timelimit=MINS Stop rsync after MINS minutes ++ --stop-at=YY-MM-DD@HH:MM Stop rsync at year-month-day@hour:minute ++ --time-limit=TIME Stop rsync after TIME minutes have elapsed --write-batch=PREFIX write batch fileset starting with PREFIX --read-batch=PREFIX read batch fileset starting with PREFIX -h, --help show this help screen -@@ -888,6 +889,10 @@ of rsync transfers, blocks of data are s +@@ -888,6 +890,13 @@ of rsync transfers, blocks of data are s transfer was too fast, it will wait before sending the next data block. The result is an average transfer rate equaling the specified limit. A value of zero specifies no limit. + -+dit(bf(--timelimit=MINS)) This option allows you to specify the maximum -+number of minutes rsync will run for. Ths time starts when the first -+file starts transferring. ++dit(bf(--stop-at=YY-MM-DD@HH:MM)) This option allows you to specify at what ++time to stop rsync, in year-month-day@hour:minute numeric format (e.g. ++04-12-3l@23:59). ++ ++dit(bf(--time-limit=TIME)) This option allows you to specify the maximum ++number of minutes rsync will run for. dit(bf(--write-batch=PREFIX)) Generate a set of files that can be transferred as a batch update. Each filename in the set starts with ---- util.c 22 Apr 2004 22:17:15 -0000 1.138 -+++ util.c 24 Apr 2004 07:49:12 -0000 -@@ -1049,6 +1049,21 @@ int msleep(int t) - return True; - } - -+/** -+ * Return the time that rsync is started, used by --time-limit -+ */ -+time_t get_rsync_start_time(void) -+{ -+ static struct timeval tval; -+ static int has_set_rsync_start_time = 0; -+ -+ if (!has_set_rsync_start_time) { -+ gettimeofday(&tval, NULL); -+ has_set_rsync_start_time = 1; -+ } -+ -+ return tval.tv_sec; -+} - - /** - * Determine if two file modification times are equivalent (either -- 2.34.1