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
removed old "make dist" target
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
61bdc60
..
fc62e45
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-54,8
+54,8
@@
static void check_timeout(void)
t = time(NULL);
t = time(NULL);
- if (last_io && io_timeout && (t-last_io)
>
io_timeout) {
- rprintf(FERROR,"
read
timeout after %d second - exiting\n",
+ if (last_io && io_timeout && (t-last_io)
>=
io_timeout) {
+ rprintf(FERROR,"
io
timeout after %d second - exiting\n",
(int)(t-last_io));
exit_cleanup(1);
}
(int)(t-last_io));
exit_cleanup(1);
}
@@
-108,9
+108,18
@@
static int read_timeout(int fd, char *buf, int len)
continue;
}
continue;
}
+ if (n == -1 &&
+ (errno == EAGAIN || errno == EWOULDBLOCK)) {
+ /* this shouldn't happen, if it does then
+ sleep for a short time to prevent us
+ chewing too much CPU */
+ u_sleep(100);
+ continue;
+ }
+
if (n == 0) {
if (eof_error) {
if (n == 0) {
if (eof_error) {
- rprintf(FERROR,"EOF in read_timeout\n");
+ rprintf(FERROR,"
unexpected
EOF in read_timeout\n");
}
exit_cleanup(1);
}
}
exit_cleanup(1);
}
@@
-229,7
+238,7
@@
static void readfd(int fd,char *buffer,int N)
int ret;
int total=0;
int ret;
int total=0;
- if (
read_buffer_len < N && N < 1024
) {
+ if (
(read_buffer_len < N) && (N < 1024)
) {
read_check(buffer_f_in);
}
read_check(buffer_f_in);
}
@@
-310,17
+319,19
@@
static void writefd_unbuffered(int fd,char *buf,int len)
int fd_count, count;
struct timeval tv;
int reading;
int fd_count, count;
struct timeval tv;
int reading;
+ int blocked=0;
no_flush++;
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;
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)
if (reading) {
FD_SET(buffer_f_in,&r_fds);
if (buffer_f_in > fd)
@@
-340,28
+351,35
@@
static void writefd_unbuffered(int fd,char *buf,int len)
continue;
}
continue;
}
+ if (reading && FD_ISSET(buffer_f_in, &r_fds)) {
+ read_check(buffer_f_in);
+ }
+
if (FD_ISSET(fd, &w_fds)) {
if (FD_ISSET(fd, &w_fds)) {
- int ret = write(fd,buf+total,len-total);
+ int n = (len-total)>>blocked;
+ int ret = write(fd,buf+total,n?n:1);
if (ret == -1 && errno == EINTR) {
continue;
}
if (ret == -1 && errno == EINTR) {
continue;
}
+ if (ret == -1 &&
+ (errno == EAGAIN || errno == EWOULDBLOCK)) {
+ blocked++;
+ continue;
+ }
+
if (ret <= 0) {
rprintf(FERROR,"erroring writing %d bytes - exiting\n", len);
exit_cleanup(1);
}
if (ret <= 0) {
rprintf(FERROR,"erroring writing %d bytes - exiting\n", len);
exit_cleanup(1);
}
+ blocked = 0;
total += ret;
stats.total_written += ret;
if (io_timeout)
last_io = time(NULL);
total += ret;
stats.total_written += ret;
if (io_timeout)
last_io = time(NULL);
- continue;
- }
-
- if (reading && FD_ISSET(buffer_f_in, &r_fds)) {
- read_check(buffer_f_in);
}
}
}
}