X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2a5df8629964df5f5762d2b5de0a56f2ae6d73e1..d762dfe94b9b9122f58a12ac1f5a0dfacee5dcb1:/io.c

diff --git a/io.c b/io.c
index c809c93b..b69816aa 100644
--- a/io.c
+++ b/io.c
@@ -4,12 +4,11 @@
  * Copyright (C) 1996-2001 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -58,7 +57,7 @@ extern struct file_list *cur_flist, *first_flist;
 const char phase_unknown[] = "unknown";
 int ignore_timeout = 0;
 int batch_fd = -1;
-int done_cnt = 0;
+int msgdone_cnt = 0;
 
 /* Ignore an EOF error if non-zero. See whine_about_eof(). */
 int kluge_around_eof = 0;
@@ -299,7 +298,7 @@ static void read_msg_fd(void)
 			readfd(fd, buf, len);
 			stats.total_read = read_longint(fd);
 		}
-		done_cnt++;
+		msgdone_cnt++;
 		break;
 	case MSG_REDO:
 		if (len != 4 || !am_generator)
@@ -390,16 +389,15 @@ void increment_active_files(int ndx, int itemizing, enum logcode code)
 {
 	/* TODO: tune these limits? */
 	while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) {
-#ifdef SUPPORT_HARD_LINKS
-		if (hlink_list.head)
-			check_for_finished_hlinks(itemizing, code);
-#endif
-		io_flush(NORMAL_FLUSH);
-		read_msg_fd();
+		check_for_finished_files(itemizing, code, 0);
+		if (iobuf_out_cnt)
+			io_flush(NORMAL_FLUSH);
+		else
+			read_msg_fd();
 	}
 
 	active_filecnt++;
-	active_bytecnt += F_LENGTH(cur_flist->files[ndx]);
+	active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]);
 }
 
 static void decrement_active_files(int ndx)
@@ -806,9 +804,10 @@ void io_end_buffering_out(void)
 	iobuf_f_out = -1;
 }
 
-void maybe_flush_socket(void)
+void maybe_flush_socket(int important)
 {
-	if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5)
+	if (iobuf_out && iobuf_out_cnt
+	 && (important || time(NULL) - last_io_out >= 5))
 		io_flush(NORMAL_FLUSH);
 }