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

diff --git a/io.c b/io.c
index 1186740a..a91b3db6 100644
--- a/io.c
+++ b/io.c
@@ -27,26 +27,52 @@
 static int64 total_written;
 static int64 total_read;
 
+static int io_multiplexing_out;
+static int io_multiplexing_in;
+static int multiplex_in_fd;
+static int multiplex_out_fd;
+static time_t last_io;
+
 extern int verbose;
 extern int sparse_files;
 extern int io_timeout;
 
 int64 write_total(void)
 {
-  return total_written;
+	return total_written;
 }
 
 int64 read_total(void)
 {
-  return total_read;
+	return total_read;
 }
 
 static int buffer_f_in = -1;
 
 void setup_nonblocking(int f_in,int f_out)
 {
-  set_blocking(f_out,0);
-  buffer_f_in = f_in;
+	set_blocking(f_out,0);
+	buffer_f_in = f_in;
+}
+
+static void check_timeout(void)
+{
+	time_t t;
+	
+	if (!io_timeout) return;
+
+	if (!last_io) {
+		last_io = time(NULL);
+		return;
+	}
+
+	t = time(NULL);
+
+	if (last_io && io_timeout && (t-last_io)>io_timeout) {
+		rprintf(FERROR,"read timeout after %d second - exiting\n", 
+			(int)(t-last_io));
+		exit_cleanup(1);
+	}
 }
 
 
@@ -56,66 +82,134 @@ static int read_buffer_len;
 static int read_buffer_size;
 
 
-/* This function was added to overcome a deadlock problem when using
- * ssh.  It looks like we can't allow our receive queue to get full or
- * ssh will clag up. Uggh.  */
-static void read_check(int f)
+/* continue trying to read len bytes - don't return until len
+   has been read */
+static void read_loop(int fd, char *buf, int len)
 {
-  int n;
+	while (len) {
+		int n = read(fd, buf, len);
+		if (n > 0) {
+			buf += n;
+			len -= n;
+		}
+		if (n == 0) {
+			rprintf(FERROR,"EOF in read_loop\n");
+			exit_cleanup(1);
+		}
+		if (n == -1) {
+			fd_set fds;
+			struct timeval tv;
 
-  if (f == -1) return;
+			if (errno != EAGAIN && errno != EWOULDBLOCK) {
+				rprintf(FERROR,"io error: %s\n", 
+					strerror(errno));
+				exit_cleanup(1);
+			}
 
-  if (read_buffer_len == 0) {
-    read_buffer_p = read_buffer;
-  }
+			FD_ZERO(&fds);
+			FD_SET(fd, &fds);
+			tv.tv_sec = io_timeout;
+			tv.tv_usec = 0;
 
-  if ((n=num_waiting(f)) <= 0)
-    return;
+			if (select(fd+1, &fds, NULL, NULL, 
+				   io_timeout?&tv:NULL) != 1) {
+				check_timeout();
+			}
+		}
+	}
+}
 
-  /* things could deteriorate if we read in really small chunks */
-  if (n < 10) n = 1024;
+static int read_unbuffered(int fd, char *buf, int len)
+{
+	static int remaining;
+	char ibuf[4];
+	int tag, ret=0;
+	char line[1024];
+
+	if (!io_multiplexing_in || fd != multiplex_in_fd) 
+		return read(fd, buf, len);
+
+	while (ret == 0) {
+		if (remaining) {
+			len = MIN(len, remaining);
+			read_loop(fd, buf, len);
+			remaining -= len;
+			ret = len;
+			continue;
+		}
 
-  if (read_buffer_p != read_buffer) {
-    memmove(read_buffer,read_buffer_p,read_buffer_len);
-    read_buffer_p = read_buffer;
-  }
+		read_loop(fd, ibuf, 4);
+		tag = IVAL(ibuf, 0);
 
-  if (n > (read_buffer_size - read_buffer_len)) {
-    read_buffer_size += n;
-    if (!read_buffer)
-      read_buffer = (char *)malloc(read_buffer_size);
-    else
-      read_buffer = (char *)realloc(read_buffer,read_buffer_size);
-    if (!read_buffer) out_of_memory("read check");      
-    read_buffer_p = read_buffer;      
-  }
+		remaining = tag & 0xFFFFFF;
+		tag = tag >> 24;
 
-  n = read(f,read_buffer+read_buffer_len,n);
-  if (n > 0) {
-    read_buffer_len += n;
-  }
-}
+		if (tag == MPLEX_BASE) continue;
 
-static time_t last_io;
+		tag -= MPLEX_BASE;
 
+		if (tag != FERROR && tag != FINFO) {
+			rprintf(FERROR,"unexpected tag %d\n", tag);
+			exit_cleanup(1);
+		}
 
-static void check_timeout(void)
+		if (remaining > sizeof(line)-1) {
+			rprintf(FERROR,"multiplexing overflow %d\n\n", 
+				remaining);
+			exit_cleanup(1);
+		}
+
+		read_loop(fd, line, remaining);
+		line[remaining] = 0;
+
+		rprintf(tag,"%s", line);
+		remaining = 0;
+	}
+
+	return ret;
+}
+
+
+/* This function was added to overcome a deadlock problem when using
+ * ssh.  It looks like we can't allow our receive queue to get full or
+ * ssh will clag up. Uggh.  */
+static void read_check(int f)
 {
-	time_t t;
-	
-	if (!io_timeout) return;
+	int n;
 
-	if (!last_io) {
-		last_io = time(NULL);
+	if (f == -1) return;
+
+	if (read_buffer_len == 0) {
+		read_buffer_p = read_buffer;
+	}
+
+	if ((n=num_waiting(f)) <= 0)
 		return;
+
+	/* things could deteriorate if we read in really small chunks */
+	if (n < 10) n = 1024;
+
+	if (n > MAX_READ_BUFFER/4)
+		n = MAX_READ_BUFFER/4;
+
+	if (read_buffer_p != read_buffer) {
+		memmove(read_buffer,read_buffer_p,read_buffer_len);
+		read_buffer_p = read_buffer;
 	}
 
-	t = time(NULL);
+	if (n > (read_buffer_size - read_buffer_len)) {
+		read_buffer_size += n;
+		if (!read_buffer)
+			read_buffer = (char *)malloc(read_buffer_size);
+		else
+			read_buffer = (char *)realloc(read_buffer,read_buffer_size);
+		if (!read_buffer) out_of_memory("read check");      
+		read_buffer_p = read_buffer;      
+	}
 
-	if (last_io && io_timeout && (t-last_io)>io_timeout) {
-		fprintf(FERROR,"read timeout after %d second - exiting\n", 
-			(int)(t-last_io));
-		exit_cleanup(1);
+	n = read_unbuffered(f,read_buffer+read_buffer_len,n);
+	if (n > 0) {
+		read_buffer_len += n;
 	}
 }
 
@@ -138,7 +232,9 @@ static int readfd(int fd,char *buffer,int N)
 			continue;
 		} 
 
-		while ((ret = read(fd,buffer + total,N-total)) == -1) {
+		io_flush();
+
+		while ((ret = read_unbuffered(fd,buffer + total,N-total)) == -1) {
 			fd_set fds;
 
 			if (errno != EAGAIN && errno != EWOULDBLOCK)
@@ -148,7 +244,8 @@ static int readfd(int fd,char *buffer,int N)
 			tv.tv_sec = io_timeout;
 			tv.tv_usec = 0;
 
-			if (select(fd+1, &fds, NULL, NULL, &tv) != 1) {
+			if (select(fd+1, &fds, NULL, NULL, 
+				   io_timeout?&tv:NULL) != 1) {
 				check_timeout();
 			}
 		}
@@ -170,7 +267,7 @@ int32 read_int(int f)
   char b[4];
   if ((ret=readfd(f,b,4)) != 4) {
     if (verbose > 1) 
-      fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+      rprintf(FERROR,"(%d) read_int: Error reading %d bytes : %s\n",
 	      getpid(),4,ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
@@ -188,13 +285,13 @@ int64 read_longint(int f)
 	if ((int32)ret != (int32)0xffffffff) return ret;
 
 #ifdef NO_INT64
-	fprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
+	rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
 	exit_cleanup(1);
 #else
 	if (remote_version >= 16) {
 		if ((ret=readfd(f,b,8)) != 8) {
 			if (verbose > 1) 
-				fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+				rprintf(FERROR,"(%d) read_longint: Error reading %d bytes : %s\n",
 					getpid(),8,ret==-1?strerror(errno):"EOF");
 			exit_cleanup(1);
 		}
@@ -211,7 +308,7 @@ void read_buf(int f,char *buf,int len)
   int ret;
   if ((ret=readfd(f,buf,len)) != len) {
     if (verbose > 1) 
-      fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+      rprintf(FERROR,"(%d) read_buf: Error reading %d bytes : %s\n",
 	      getpid(),len,ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
@@ -300,93 +397,157 @@ int write_file(int f,char *buf,int len)
 }
 
 
-static int writefd(int fd,char *buf,int len)
+static int writefd_unbuffered(int fd,char *buf,int len)
 {
-  int total = 0;
-  fd_set w_fds, r_fds;
-  int fd_count, count, got_select=0;
-  struct timeval tv;
+	int total = 0;
+	fd_set w_fds, r_fds;
+	int fd_count, count, got_select=0;
+	struct timeval tv;
 
-  if (buffer_f_in == -1) 
-    return write(fd,buf,len);
+	while (total < len) {
+		int ret = write(fd,buf+total,len-total);
 
-  while (total < len) {
-    int ret = write(fd,buf+total,len-total);
+		if (ret == 0) return total;
 
-    if (ret == 0) return total;
+		if (ret == -1 && !(errno == EWOULDBLOCK || errno == EAGAIN)) 
+			return -1;
 
-    if (ret == -1 && !(errno == EWOULDBLOCK || errno == EAGAIN)) 
-      return -1;
+		if (ret == -1 && got_select) {
+			/* hmmm, we got a write select on the fd and
+			   then failed to write.  Why doesn't that
+			   mean that the fd is dead? It doesn't on
+			   some systems it seems (eg. IRIX) */
+			u_sleep(1000);
+		}
 
-    if (ret == -1 && got_select) {
-	    /* hmmm, we got a write select on the fd and then failed to write.
-	       Why doesn't that mean that the fd is dead? It doesn't on some
-	       systems it seems (eg. IRIX) */
-	    u_sleep(1000);
-#if 0
-	    fprintf(FERROR,"write exception\n");
-	    exit_cleanup(1);
-#endif
-    }
-
-    got_select = 0;
-
-
-    if (ret == -1) {
-      read_check(buffer_f_in);
-
-      fd_count = fd+1;
-      FD_ZERO(&w_fds);
-      FD_ZERO(&r_fds);
-      FD_SET(fd,&w_fds);
-      if (buffer_f_in != -1) {
-	      FD_SET(buffer_f_in,&r_fds);
-	      if (buffer_f_in > fd) 
-		      fd_count = buffer_f_in+1;
-      }
-
-      tv.tv_sec = BLOCKING_TIMEOUT;
-      tv.tv_usec = 0;
-      count = select(fd_count,buffer_f_in == -1? NULL: &r_fds,
-		     &w_fds,NULL,&tv);
-      if (count == -1 && errno != EINTR) {
-	      if (verbose > 1) 
-		      fprintf(FERROR,"select error: %s\n", strerror(errno));
-	      exit_cleanup(1);
-      }
-
-      if (count == 0) {
-	      check_timeout();
-	      continue;
-      }
-      
-      if (FD_ISSET(fd, &w_fds)) {
-	      got_select = 1;
-      }
-    } else {
-      total += ret;
-    }
-  }
+		got_select = 0;
+
+
+		if (ret != -1) {
+			total += ret;
+			continue;
+		}
+
+		if (read_buffer_len < MAX_READ_BUFFER && buffer_f_in != -1)
+			read_check(buffer_f_in);
+
+		fd_count = fd+1;
+		FD_ZERO(&w_fds);
+		FD_ZERO(&r_fds);
+		FD_SET(fd,&w_fds);
+		if (buffer_f_in != -1) {
+			FD_SET(buffer_f_in,&r_fds);
+			if (buffer_f_in > fd) 
+				fd_count = buffer_f_in+1;
+		}
 
-  if (io_timeout)
-	  last_io = time(NULL);
+		tv.tv_sec = BLOCKING_TIMEOUT;
+		tv.tv_usec = 0;
+		count = select(fd_count,buffer_f_in == -1? NULL: &r_fds,
+			       &w_fds,NULL,&tv);
+		
+		if (count == -1 && errno != EINTR) {
+			if (verbose > 1) 
+				rprintf(FERROR,"select error: %s\n", strerror(errno));
+			exit_cleanup(1);
+		}
+		
+		if (count == 0) {
+			check_timeout();
+			continue;
+		}
+		
+		if (FD_ISSET(fd, &w_fds)) {
+			got_select = 1;
+		}
+	}
 
-  return total;
+	if (io_timeout)
+		last_io = time(NULL);
+	
+	return total;
 }
 
 
+static char *io_buffer;
+static int io_buffer_count;
+
+void io_start_buffering(int fd)
+{
+	if (io_buffer) return;
+	multiplex_out_fd = fd;
+	io_buffer = (char *)malloc(IO_BUFFER_SIZE+4);
+	if (!io_buffer) out_of_memory("writefd");
+	io_buffer_count = 0;
+
+	/* leave room for the multiplex header in case it's needed */
+	io_buffer += 4;
+}
+
+void io_flush(void)
+{
+	int fd = multiplex_out_fd;
+	if (!io_buffer_count) return;
+
+	if (io_multiplexing_out) {
+		SIVAL(io_buffer-4, 0, (MPLEX_BASE<<24) + io_buffer_count);
+		if (writefd_unbuffered(fd, io_buffer-4, io_buffer_count+4) !=
+		    io_buffer_count+4) {
+			rprintf(FERROR,"write failed\n");
+			exit_cleanup(1);
+		}
+	} else {
+		if (writefd_unbuffered(fd, io_buffer, io_buffer_count) != 
+		    io_buffer_count) {
+			rprintf(FERROR,"write failed\n");
+			exit_cleanup(1);
+		}
+	}
+	io_buffer_count = 0;
+}
+
+void io_end_buffering(int fd)
+{
+	io_flush();
+	if (!io_multiplexing_out) {
+		free(io_buffer-4);
+		io_buffer = NULL;
+	}
+}
+
+static int writefd(int fd,char *buf,int len1)
+{
+	int len = len1;
+
+	if (!io_buffer) return writefd_unbuffered(fd, buf, len);
+
+	while (len) {
+		int n = MIN(len, IO_BUFFER_SIZE-io_buffer_count);
+		if (n > 0) {
+			memcpy(io_buffer+io_buffer_count, buf, n);
+			buf += n;
+			len -= n;
+			io_buffer_count += n;
+		}
+		
+		if (io_buffer_count == IO_BUFFER_SIZE) io_flush();
+	}
+
+	return len1;
+}
+
 
 void write_int(int f,int32 x)
 {
-  int ret;
-  char b[4];
-  SIVAL(b,0,x);
-  if ((ret=writefd(f,b,4)) != 4) {
-    fprintf(FERROR,"write_int failed : %s\n",
-	    ret==-1?strerror(errno):"EOF");
-    exit_cleanup(1);
-  }
-  total_written += 4;
+	int ret;
+	char b[4];
+	SIVAL(b,0,x);
+	if ((ret=writefd(f,b,4)) != 4) {
+		rprintf(FERROR,"write_int failed : %s\n",
+			ret==-1?strerror(errno):"EOF");
+		exit_cleanup(1);
+	}
+	total_written += 4;
 }
 
 void write_longint(int f, int64 x)
@@ -405,7 +566,7 @@ void write_longint(int f, int64 x)
 	SIVAL(b,4,((x>>32)&0xFFFFFFFF));
 
 	if ((ret=writefd(f,b,8)) != 8) {
-		fprintf(FERROR,"write_longint failed : %s\n",
+		rprintf(FERROR,"write_longint failed : %s\n",
 			ret==-1?strerror(errno):"EOF");
 		exit_cleanup(1);
 	}
@@ -414,19 +575,25 @@ void write_longint(int f, int64 x)
 
 void write_buf(int f,char *buf,int len)
 {
-  int ret;
-  if ((ret=writefd(f,buf,len)) != len) {
-    fprintf(FERROR,"write_buf failed : %s\n",
-	    ret==-1?strerror(errno):"EOF");
-    exit_cleanup(1);
-  }
-  total_written += len;
+	int ret;
+	if ((ret=writefd(f,buf,len)) != len) {
+		rprintf(FERROR,"write_buf failed : %s\n",
+			ret==-1?strerror(errno):"EOF");
+		exit_cleanup(1);
+	}
+	total_written += len;
+}
+
+/* write a string to the connection */
+void write_sbuf(int f,char *buf)
+{
+	write_buf(f, buf, strlen(buf));
 }
 
 
 void write_byte(int f,unsigned char c)
 {
-  write_buf(f,(char *)&c,1);
+	write_buf(f,(char *)&c,1);
 }
 
 void write_flush(int f)
@@ -434,3 +601,80 @@ void write_flush(int f)
 }
 
 
+int read_line(int f, char *buf, int maxlen)
+{
+	while (maxlen) {
+		read_buf(f, buf, 1);
+		if (buf[0] == '\n') {
+			buf[0] = 0;
+			break;
+		}
+		if (buf[0] != '\r') {
+			buf++;
+			maxlen--;
+		}
+	}
+	if (maxlen == 0) {
+		*buf = 0;
+		return 0;
+	}
+	return 1;
+}
+
+
+void io_printf(int fd, const char *format, ...)
+{
+	va_list ap;  
+	char buf[1024];
+	int len;
+	
+	va_start(ap, format);
+	len = vslprintf(buf, sizeof(buf)-1, format, ap);
+	va_end(ap);
+
+	if (len < 0) exit_cleanup(1);
+
+	write_sbuf(fd, buf);
+}
+
+
+/* setup for multiplexing an error stream with the data stream */
+void io_start_multiplex_out(int fd)
+{
+	multiplex_out_fd = fd;
+	io_flush();
+	io_start_buffering(fd);
+	io_multiplexing_out = 1;
+}
+
+/* setup for multiplexing an error stream with the data stream */
+void io_start_multiplex_in(int fd)
+{
+	multiplex_in_fd = fd;
+	io_flush();
+	if (read_buffer_len) {
+		fprintf(stderr,"ERROR: data in read buffer at mplx start\n");
+		exit_cleanup(1);
+	}
+
+	io_multiplexing_in = 1;
+}
+
+/* write an message to the error stream */
+int io_multiplex_write(int f, char *buf, int len)
+{
+	if (!io_multiplexing_out) return 0;
+
+	io_flush();
+
+	SIVAL(io_buffer-4, 0, ((MPLEX_BASE + f)<<24) + len);
+	memcpy(io_buffer, buf, len);
+
+	writefd_unbuffered(multiplex_out_fd, io_buffer-4, len+4);
+	return 1;
+}
+
+void io_close_input(int fd)
+{
+	buffer_f_in = -1;
+}