X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8237f9305b6065488d68e0023c69dc506f699331..f08ca43472b518b93230acd853532d79b7e8a3a5:/generator.c

diff --git a/generator.c b/generator.c
index 41cdace8..0349b353 100644
--- a/generator.c
+++ b/generator.c
@@ -52,6 +52,7 @@ extern int ignore_times;
 extern int size_only;
 extern OFF_T max_size;
 extern int io_timeout;
+extern int ignore_timeout;
 extern int protocol_version;
 extern int fuzzy_basis;
 extern int always_checksum;
@@ -345,6 +346,8 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
  * modification-time repair. */
 static void recv_generator(char *fname, struct file_list *flist,
 			   struct file_struct *file, int ndx,
+			   int itemizing, int maybe_PERMS_REPORT,
+			   enum logcode code,
 			   int f_out, int f_out_name)
 {
 	static int missing_below = -1, excluded_below = -1;
@@ -357,31 +360,11 @@ static void recv_generator(char *fname, struct file_list *flist,
 	int statret, stat_errno;
 	char *fnamecmp, *partialptr, *backupptr = NULL;
 	char fnamecmpbuf[MAXPATHLEN];
-	int itemizing, maybe_PERMS_REPORT;
 	uchar fnamecmp_type;
-	enum logcode code;
 
 	if (list_only)
 		return;
 
-	if (protocol_version >= 29) {
-		itemizing = 1;
-		code = daemon_log_format_has_i ? 0 : FLOG;
-		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
-	} else if (am_daemon) {
-		itemizing = daemon_log_format_has_i && !dry_run;
-		code = itemizing || dry_run ? FCLIENT : FINFO;
-		maybe_PERMS_REPORT = PERMS_REPORT;
-	} else if (!am_server) {
-		itemizing = log_format_has_i;
-		code = itemizing ? 0 : FINFO;
-		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
-	} else {
-		itemizing = 0;
-		code = FINFO;
-		maybe_PERMS_REPORT = PERMS_REPORT;
-	}
-
 	if (!fname) {
 		if (fuzzy_dirlist) {
 			flist_free(fuzzy_dirlist);
@@ -826,7 +809,7 @@ notify_others:
 		int iflags = SID_UPDATING;
 		if (always_checksum)
 			iflags |= SID_REPORT_CHECKSUM;
-		if (inplace && fnamecmp_type != FNAMECMP_FNAME)
+		if (fnamecmp_type != FNAMECMP_FNAME)
 			iflags |= SID_USING_ALT_BASIS;
 		itemize(file, statret, &st, iflags, f_out, -1);
 	}
@@ -877,10 +860,31 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	int i;
 	int phase = 0;
 	char fbuf[MAXPATHLEN];
+	int itemizing, maybe_PERMS_REPORT;
+	enum logcode code;
 	int need_retouch_dir_times = preserve_times && !omit_dir_times;
 	int need_retouch_dir_perms = 0;
 	int save_only_existing = only_existing;
 	int save_opt_ignore_existing = opt_ignore_existing;
+	int allowed_lull = io_timeout / 2;
+
+	if (protocol_version >= 29) {
+		itemizing = 1;
+		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
+		code = daemon_log_format_has_i ? 0 : FLOG;
+	} else if (am_daemon) {
+		itemizing = daemon_log_format_has_i && !dry_run;
+		maybe_PERMS_REPORT = PERMS_REPORT;
+		code = itemizing || dry_run ? FCLIENT : FINFO;
+	} else if (!am_server) {
+		itemizing = log_format_has_i;
+		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
+		code = itemizing ? 0 : FINFO;
+	} else {
+		itemizing = 0;
+		maybe_PERMS_REPORT = PERMS_REPORT;
+		code = FINFO;
+	}
 
 	if (verbose > 2) {
 		rprintf(FINFO, "generator starting pid=%ld count=%d\n",
@@ -894,9 +898,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 			: "enabled");
 	}
 
-	/* We expect to just sit around now, so don't exit on a timeout.
-	 * If we really get a timeout then the other process should exit. */
-	io_timeout = 0;
+	if (protocol_version < 29)
+		ignore_timeout = 1;
 
 	for (i = 0; i < flist->count; i++) {
 		struct file_struct *file = flist->files[i];
@@ -916,9 +919,13 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 		}
 
 		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       flist, file, i, f_out, f_out_name);
+			       flist, file, i, itemizing, maybe_PERMS_REPORT,
+			       code, f_out, f_out_name);
+
+		if (allowed_lull && !(i % 100))
+			maybe_send_keepalive(allowed_lull, flist->count);
 	}
-	recv_generator(NULL, NULL, NULL, 0, -1, -1);
+	recv_generator(NULL, NULL, NULL, 0, 0, 0, code, -1, -1);
 	if (delete_during)
 		delete_in_dir(NULL, NULL, NULL);
 
@@ -928,6 +935,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	update_only = always_checksum = size_only = 0;
 	ignore_times = 1;
 
+	/* We expect to just sit around now, so don't exit on a timeout.
+	 * If we really get a timeout then the other process should exit. */
+	ignore_timeout = 1;
+
 	if (verbose > 2)
 		rprintf(FINFO,"generate_files phase=%d\n",phase);
 
@@ -938,7 +949,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	while ((i = get_redo_num()) != -1) {
 		struct file_struct *file = flist->files[i];
 		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       flist, file, i, f_out, f_out_name);
+			       flist, file, i, itemizing, maybe_PERMS_REPORT,
+			       code, f_out, f_out_name);
+		if (allowed_lull)
+			maybe_send_keepalive(allowed_lull, flist->count);
 	}
 
 	phase++;
@@ -968,10 +982,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 			if (!need_retouch_dir_times && file->mode & S_IWUSR)
 				continue;
 			recv_generator(local_name ? local_name : f_name(file),
-				       flist, file, i, -1, -1);
+				       flist, file, i, itemizing,
+				       maybe_PERMS_REPORT, code, -1, -1);
 		}
 	}
-	recv_generator(NULL, NULL, NULL, 0, -1, -1);
+	recv_generator(NULL, NULL, NULL, 0, 0, 0, code, -1, -1);
 
 	if (verbose > 2)
 		rprintf(FINFO,"generate_files finished\n");