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
added a --partial option which tells rsync to keep partially
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
7909e0b
..
d7140d2
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-319,6
+319,7
@@
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++;
@@
-350,7
+351,8
@@
static void writefd_unbuffered(int fd,char *buf,int len)
}
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
+360,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
+369,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;