From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 2 Jul 1998 02:59:04 +0000 (+0000)
Subject: prioritise reading over writing in the select loop. (this is another
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/c95f1aa9d32f0a47ed02f283678c546f91c15e85?hp=86ffe37f11f3d3d2f855f9d4384a22ac72d5b6fb

prioritise reading over writing in the select loop. (this is another
ssh-friendly attempt)
---

diff --git a/io.c b/io.c
index 469eef3e..2575dc45 100644
--- a/io.c
+++ b/io.c
@@ -323,14 +323,15 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 
 	no_flush++;
 
-	reading = (buffer_f_in != -1 && read_buffer_len < MAX_READ_BUFFER);
-
 	while (total < len) {
 		FD_ZERO(&w_fds);
 		FD_ZERO(&r_fds);
 		FD_SET(fd,&w_fds);
 		fd_count = fd+1;
 
+		reading = (buffer_f_in != -1 && 
+			   read_buffer_len < MAX_READ_BUFFER);
+
 		if (reading) {
 			FD_SET(buffer_f_in,&r_fds);
 			if (buffer_f_in > fd) 
@@ -350,6 +351,10 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 			continue;
 		}
 
+		if (reading && FD_ISSET(buffer_f_in, &r_fds)) {
+			read_check(buffer_f_in);
+		}
+
 		if (FD_ISSET(fd, &w_fds)) {
 			int n = (len-total)>>blocked;
 			int ret = write(fd,buf+total,n?n:1);
@@ -377,10 +382,6 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 				last_io = time(NULL);
 			continue;
 		}
-
-		if (reading && FD_ISSET(buffer_f_in, &r_fds)) {
-			read_check(buffer_f_in);
-		}
 	}
 
 	no_flush--;