Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure that io_flush() doesn't call writefd_unbuffered from within
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
e9a66a4
..
a88d76a
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-79,6
+79,7
@@
static char *read_buffer;
static char *read_buffer_p;
static int read_buffer_len;
static int read_buffer_size;
static char *read_buffer_p;
static int read_buffer_len;
static int read_buffer_size;
+static int no_flush;
/* read from a socket with IO timeout. return the number of
bytes read. If no bytes can be read then exit, never return
/* read from a socket with IO timeout. return the number of
bytes read. If no bytes can be read then exit, never return
@@
-145,7
+146,7
@@
static void read_loop(int fd, char *buf, int len)
}
}
}
}
-/* read from the file descriptor handing multiplexing -
+/* read from the file descriptor hand
l
ing multiplexing -
return number of bytes read
never return <= 0 */
static int read_unbuffered(int fd, char *buf, int len)
return number of bytes read
never return <= 0 */
static int read_unbuffered(int fd, char *buf, int len)
@@
-223,10
+224,7
@@
static void read_check(int f)
if (n > (read_buffer_size - read_buffer_len)) {
read_buffer_size += n;
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);
+ read_buffer = (char *)Realloc(read_buffer,read_buffer_size);
if (!read_buffer) out_of_memory("read check");
read_buffer_p = read_buffer;
}
if (!read_buffer) out_of_memory("read check");
read_buffer_p = read_buffer;
}
@@
-328,6
+326,8
@@
static void writefd_unbuffered(int fd,char *buf,int len)
struct timeval tv;
int reading;
struct timeval tv;
int reading;
+ no_flush++;
+
reading = (buffer_f_in != -1 && read_buffer_len < MAX_READ_BUFFER);
while (total < len) {
reading = (buffer_f_in != -1 && read_buffer_len < MAX_READ_BUFFER);
while (total < len) {
@@
-377,6
+377,8
@@
static void writefd_unbuffered(int fd,char *buf,int len)
read_check(buffer_f_in);
}
}
read_check(buffer_f_in);
}
}
+
+ no_flush--;
}
}
@@
-398,7
+400,7
@@
void io_start_buffering(int fd)
void io_flush(void)
{
int fd = multiplex_out_fd;
void io_flush(void)
{
int fd = multiplex_out_fd;
- if (!io_buffer_count) return;
+ if (!io_buffer_count
|| no_flush
) return;
if (io_multiplexing_out) {
SIVAL(io_buffer-4, 0, (MPLEX_BASE<<24) + io_buffer_count);
if (io_multiplexing_out) {
SIVAL(io_buffer-4, 0, (MPLEX_BASE<<24) + io_buffer_count);