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
prioritise reading over writing in the select loop. (this is another
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
7909e0b
..
2575dc4
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);
}
@@
-319,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)
@@
-349,8
+351,13
@@
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;
@@
-358,10
+365,7
@@
static void writefd_unbuffered(int fd,char *buf,int len)
if (ret == -1 &&
(errno == EAGAIN || errno == EWOULDBLOCK)) {
if (ret == -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);
+ blocked++;
continue;
}
continue;
}
@@
-370,6
+374,7
@@
static void writefd_unbuffered(int fd,char *buf,int len)
exit_cleanup(1);
}
exit_cleanup(1);
}
+ blocked = 0;
total += ret;
stats.total_written += ret;
total += ret;
stats.total_written += ret;
@@
-377,10
+382,6
@@
static void writefd_unbuffered(int fd,char *buf,int len)
last_io = time(NULL);
continue;
}
last_io = time(NULL);
continue;
}
-
- if (reading && FD_ISSET(buffer_f_in, &r_fds)) {
- read_check(buffer_f_in);
- }
}
no_flush--;
}
no_flush--;