Commit | Line | Data |
---|---|---|
00891c37 WD |
1 | John Taylor's patch for implementing --time-limit and --stop-at, reworked |
2 | to be simpler and more efficient by Wayne Davison. | |
3 | ||
ed44ffcf | 4 | Do we need configure support for mktime()? |
00891c37 | 5 | |
ed44ffcf | 6 | --- io.c 15 May 2004 19:31:10 -0000 1.121 |
7ce4946a | 7 | +++ io.c 22 May 2004 19:33:07 -0000 |
00891c37 WD |
8 | @@ -44,6 +44,7 @@ static int io_multiplexing_in; |
9 | static int multiplex_in_fd = -1; | |
10 | static int multiplex_out_fd = -1; | |
11 | static time_t last_io; | |
12 | +extern time_t stop_at_utime; | |
c70898d5 WD |
13 | static int no_flush; |
14 | ||
15 | extern int bwlimit; | |
7ce4946a | 16 | @@ -125,16 +126,21 @@ static void check_timeout(void) |
00891c37 WD |
17 | { |
18 | time_t t; | |
c70898d5 | 19 | |
00891c37 WD |
20 | - if (!io_timeout) |
21 | + if (!io_timeout && !stop_at_utime) | |
22 | return; | |
23 | ||
24 | + t = time(NULL); | |
c70898d5 | 25 | + |
00891c37 WD |
26 | + if (stop_at_utime && t >= stop_at_utime) { |
27 | + rprintf(FERROR, "run-time limit exceeded\n"); | |
28 | + exit_cleanup(RERR_TIMEOUT); | |
29 | + } | |
c70898d5 | 30 | + |
00891c37 WD |
31 | if (!last_io) { |
32 | - last_io = time(NULL); | |
33 | + last_io = t; | |
34 | return; | |
35 | } | |
c70898d5 | 36 | |
7ce4946a WD |
37 | - t = time(NULL); |
38 | - | |
00891c37 WD |
39 | if (last_io && io_timeout && (t-last_io) >= io_timeout) { |
40 | if (!am_server && !am_daemon) { | |
7ce4946a WD |
41 | rprintf(FERROR, "io timeout after %d seconds - exiting\n", |
42 | --- options.c 22 May 2004 06:09:22 -0000 1.151 | |
43 | +++ options.c 22 May 2004 19:33:07 -0000 | |
00891c37 WD |
44 | @@ -92,6 +92,7 @@ int modify_window = 0; |
45 | int blocking_io = -1; | |
46 | int checksum_seed = 0; | |
47 | unsigned int block_size = 0; | |
48 | +time_t stop_at_utime = 0; | |
c70898d5 | 49 | |
c70898d5 | 50 | |
00891c37 WD |
51 | /** Network address family. **/ |
52 | @@ -288,6 +289,8 @@ void usage(enum logcode F) | |
c70898d5 WD |
53 | rprintf(F," --log-format=FORMAT log file transfers using specified format\n"); |
54 | rprintf(F," --password-file=FILE get password from FILE\n"); | |
55 | rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); | |
ed44ffcf WD |
56 | + rprintf(F," --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute\n"); |
57 | + rprintf(F," --time-limit=MINS Stop rsync after MINS minutes have elapsed\n"); | |
c70898d5 WD |
58 | rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); |
59 | rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); | |
7ce4946a WD |
60 | rprintf(F," --checksum-seed=NUM set block/file checksum seed\n"); |
61 | @@ -306,7 +309,7 @@ void usage(enum logcode F) | |
00891c37 WD |
62 | enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, |
63 | OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, | |
64 | OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, | |
65 | - OPT_READ_BATCH, OPT_WRITE_BATCH, | |
66 | + OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_STOP_AT, OPT_TIME_LIMIT, | |
67 | OPT_REFUSED_BASE = 9000}; | |
68 | ||
69 | static struct poptOption long_options[] = { | |
7ce4946a | 70 | @@ -378,6 +381,8 @@ static struct poptOption long_options[] |
c70898d5 WD |
71 | {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 }, |
72 | {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 }, | |
73 | {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, | |
00891c37 WD |
74 | + {"stop-at", 0, POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 }, |
75 | + {"time-limit", 0, POPT_ARG_STRING, 0, OPT_TIME_LIMIT, 0, 0 }, | |
c70898d5 WD |
76 | {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 }, |
77 | {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, | |
78 | {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, | |
7ce4946a | 79 | @@ -587,6 +592,36 @@ int parse_arguments(int *argc, const cha |
00891c37 WD |
80 | return 0; |
81 | #endif | |
82 | ||
83 | + case OPT_STOP_AT: | |
84 | + arg = poptGetOptArg(pc); | |
ed44ffcf | 85 | + if ((stop_at_utime = parse_time(arg)) == (time_t)-1) { |
00891c37 WD |
86 | + snprintf(err_buf, sizeof err_buf, |
87 | + "invalid --stop-at format: %s\n", | |
88 | + arg); | |
89 | + rprintf(FERROR, "ERROR: %s", err_buf); | |
90 | + return 0; | |
91 | + } | |
00891c37 WD |
92 | + if (stop_at_utime < time(NULL)) { |
93 | + snprintf(err_buf, sizeof err_buf, | |
94 | + "--stop-at time is in the past: %s\n", | |
95 | + arg); | |
96 | + rprintf(FERROR, "ERROR: %s", err_buf); | |
97 | + return 0; | |
98 | + } | |
99 | + break; | |
100 | + | |
101 | + case OPT_TIME_LIMIT: | |
102 | + arg = poptGetOptArg(pc); | |
103 | + if ((stop_at_utime = atol(arg) * 60) <= 0) { | |
104 | + snprintf(err_buf, sizeof err_buf, | |
105 | + "invalid --time-limit value: %s\n", | |
106 | + arg); | |
107 | + rprintf(FERROR, "ERROR: %s", err_buf); | |
108 | + return 0; | |
109 | + } | |
110 | + stop_at_utime += time(NULL); | |
111 | + break; | |
112 | + | |
113 | default: | |
114 | /* A large opt value means that set_refuse_options() | |
115 | * turned this option off (opt-BASE is its index). */ | |
7ce4946a WD |
116 | @@ -886,6 +921,15 @@ void server_options(char **args,int *arg |
117 | args[ac++] = arg; | |
118 | } | |
c70898d5 | 119 | |
00891c37 WD |
120 | + if (stop_at_utime) { |
121 | + long mins = (stop_at_utime - time(NULL)) / 60; | |
122 | + if (mins <= 0) | |
123 | + mins = 1; | |
124 | + if (asprintf(&arg, "--time-limit=%ld", mins) < 0) | |
7ce4946a WD |
125 | + goto oom; |
126 | + args[ac++] = arg; | |
127 | + } | |
128 | + | |
129 | if (backup_dir) { | |
130 | args[ac++] = "--backup-dir"; | |
131 | args[ac++] = backup_dir; | |
132 | --- rsync.yo 21 May 2004 09:44:32 -0000 1.170 | |
133 | +++ rsync.yo 22 May 2004 19:33:08 -0000 | |
00891c37 | 134 | @@ -346,6 +346,8 @@ verb( |
c70898d5 WD |
135 | --log-format=FORMAT log file transfers using specified format |
136 | --password-file=FILE get password from FILE | |
137 | --bwlimit=KBPS limit I/O bandwidth, KBytes per second | |
ed44ffcf WD |
138 | + --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute |
139 | + --time-limit=MINS Stop rsync after MINS minutes have elapsed | |
c70898d5 WD |
140 | --write-batch=PREFIX write batch fileset starting with PREFIX |
141 | --read-batch=PREFIX read batch fileset starting with PREFIX | |
7ce4946a WD |
142 | --checksum-seed=NUM set block/file checksum seed |
143 | @@ -892,6 +894,18 @@ transfer was too fast, it will wait befo | |
c70898d5 WD |
144 | result is an average transfer rate equaling the specified limit. A value |
145 | of zero specifies no limit. | |
7ce4946a | 146 | |
ed44ffcf WD |
147 | +dit(bf(--stop-at=y-m-dTh:m)) This option allows you to specify at what |
148 | +time to stop rsync, in year-month-dayThour:minute numeric format (e.g. | |
149 | +2004-12-3lT23:59). You can specify a 2 or 4-digit year. You can also | |
150 | +leave off various items and the result will be the next possible time | |
151 | +that matches the specified data. For example, "1-30" specifies the next | |
16711fbf WD |
152 | +January 30th (at midnight), "04:00" specifies the next 4am, "1" |
153 | +specifies the next 1st of the month at midnight, and ":59" specifies the | |
ed44ffcf | 154 | +next 59th minute after the hour. |
00891c37 | 155 | + |
ed44ffcf | 156 | +dit(bf(--time-limit=MINS)) This option allows you to specify the maximum |
00891c37 | 157 | +number of minutes rsync will run for. |
7ce4946a | 158 | + |
c70898d5 WD |
159 | dit(bf(--write-batch=PREFIX)) Generate a set of files that can be |
160 | transferred as a batch update. Each filename in the set starts with | |
7ce4946a WD |
161 | PREFIX. See the "BATCH MODE" section for details. |
162 | --- util.c 21 May 2004 08:40:25 -0000 1.144 | |
163 | +++ util.c 22 May 2004 19:33:08 -0000 | |
164 | @@ -125,6 +125,132 @@ void overflow(char *str) | |
ed44ffcf WD |
165 | exit_cleanup(RERR_MALLOC); |
166 | } | |
167 | ||
168 | +/* Allow the user to specify a time in the format yyyy-mm-ddThh:mm while | |
169 | + * also allowing abbreviated data. For instance, if the time is omitted, | |
170 | + * it defaults to midnight. If the date is omitted, it defaults to the | |
171 | + * next possible date in the future with the specified time. Even the | |
172 | + * year or year-month can be omitted, again defaulting to the next date | |
173 | + * in the future that matches the specified information. A 2-digit year | |
174 | + * is also OK, as is using '/' instead of '-'. */ | |
175 | +time_t parse_time(const char *arg) | |
176 | +{ | |
177 | + const char *cp; | |
178 | + time_t val, now = time(NULL); | |
179 | + struct tm t, *today = localtime(&now); | |
16711fbf | 180 | + int in_date, n; |
ed44ffcf WD |
181 | + |
182 | + memset(&t, 0, sizeof t); | |
183 | + t.tm_year = t.tm_mon = t.tm_mday = -1; | |
184 | + t.tm_hour = t.tm_min = t.tm_isdst = -1; | |
16711fbf WD |
185 | + cp = arg; |
186 | + if (*cp == 'T' || *cp == 't' || *cp == ':') { | |
187 | + cp++; | |
188 | + in_date = 0; | |
189 | + } else | |
190 | + in_date = 1; | |
191 | + for ( ; ; cp++) { | |
192 | + if (!isdigit(*cp)) | |
ed44ffcf | 193 | + return -1; |
16711fbf WD |
194 | + |
195 | + n = 0; | |
196 | + do { | |
197 | + n = n * 10 + *cp++ - '0'; | |
198 | + } while (isdigit(*cp)); | |
199 | + | |
200 | + if (*cp == ':') | |
201 | + in_date = 0; | |
ed44ffcf | 202 | + if (in_date) { |
16711fbf WD |
203 | + if (t.tm_year != -1) |
204 | + return -1; | |
205 | + t.tm_year = t.tm_mon; | |
206 | + t.tm_mon = t.tm_mday; | |
207 | + t.tm_mday = n; | |
208 | + if (!*cp) | |
209 | + break; | |
210 | + if (*cp == 'T' || *cp == 't') { | |
211 | + if (!cp[1]) | |
ed44ffcf | 212 | + break; |
16711fbf WD |
213 | + in_date = 0; |
214 | + } else if (*cp != '-' && *cp != '/') | |
215 | + return -1; | |
216 | + continue; | |
ed44ffcf WD |
217 | + } |
218 | + if (t.tm_hour != -1) | |
219 | + return -1; | |
220 | + t.tm_hour = t.tm_min; | |
221 | + t.tm_min = n; | |
222 | + if (!*cp) | |
223 | + break; | |
224 | + if (*cp != ':') | |
225 | + return -1; | |
226 | + } | |
227 | + | |
228 | + in_date = 0; | |
229 | + if (t.tm_year < 0) { | |
230 | + t.tm_year = today->tm_year; | |
231 | + in_date = 1; | |
232 | + } else if (t.tm_year < 100) { | |
233 | + while (t.tm_year < today->tm_year) | |
234 | + t.tm_year += 100; | |
235 | + } else | |
236 | + t.tm_year -= 1900; | |
237 | + if (t.tm_mon < 0) { | |
238 | + t.tm_mon = today->tm_mon; | |
239 | + in_date = 2; | |
240 | + } else | |
241 | + t.tm_mon--; | |
242 | + if (t.tm_mday < 0) { | |
ed44ffcf WD |
243 | + t.tm_mday = today->tm_mday; |
244 | + in_date = 3; | |
245 | + } | |
246 | + | |
247 | + n = 0; | |
248 | + if (t.tm_min < 0) { | |
249 | + t.tm_hour = t.tm_min = 0; | |
250 | + } else if (t.tm_hour < 0) { | |
251 | + if (in_date != 3) | |
252 | + return -1; | |
253 | + in_date = 0; | |
254 | + t.tm_hour = today->tm_hour; | |
255 | + n = 60*60; | |
256 | + } | |
257 | + | |
16711fbf WD |
258 | + if (t.tm_hour > 23 || t.tm_min > 59 |
259 | + || t.tm_mon < 0 || t.tm_mon >= 12 | |
260 | + || t.tm_mday < 1 || t.tm_mday > 31 | |
261 | + || (val = mktime(&t)) == (time_t)-1) | |
ed44ffcf WD |
262 | + return -1; |
263 | + | |
264 | + if (val <= now && in_date) { | |
265 | + tweak_date: | |
266 | + switch (in_date) { | |
267 | + case 3: | |
268 | + t.tm_mday++; | |
269 | + break; | |
270 | + case 2: | |
271 | + if (++t.tm_mon == 12) | |
272 | + t.tm_mon = 0; | |
273 | + else | |
274 | + break; | |
275 | + case 1: | |
276 | + t.tm_year++; | |
277 | + break; | |
278 | + } | |
279 | + if ((val = mktime(&t)) == (time_t)-1) { | |
280 | + if (in_date == 3 && t.tm_mday > 28) { | |
281 | + t.tm_mday = 1; | |
282 | + in_date = 2; | |
283 | + goto tweak_date; | |
284 | + } | |
285 | + return -1; | |
286 | + } | |
287 | + } | |
288 | + if (n) { | |
289 | + while (val <= now) | |
290 | + val += n; | |
291 | + } | |
292 | + return val; | |
293 | +} | |
294 | ||
295 | ||
296 | int set_modtime(char *fname, time_t modtime) |