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 --address work for a client connecting to a server
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
7191140
..
9e2a475
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-112,15
+112,6
@@
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) {
rprintf(FERROR,"unexpected EOF in read_timeout\n");
if (n == 0) {
if (eof_error) {
rprintf(FERROR,"unexpected EOF in read_timeout\n");
@@
-333,7
+324,6
@@
static void writefd_unbuffered(int fd,char *buf,int len)
int fd_count, count;
struct timeval tv;
int reading=0;
int fd_count, count;
struct timeval tv;
int reading=0;
- int blocked=0;
no_flush++;
no_flush++;
@@
-371,16
+361,13
@@
static void writefd_unbuffered(int fd,char *buf,int len)
}
if (FD_ISSET(fd, &w_fds)) {
}
if (FD_ISSET(fd, &w_fds)) {
- int n = (len-total)>>blocked;
- int ret = write(fd,buf+total,n?n:1);
+ int ret, n = len-total;
+
+ if (n > PIPE_BUF) n = PIPE_BUF;
- if (ret == -1 && errno == EINTR) {
- continue;
- }
+ ret = write(fd,buf+total,n?n:1);
- if (ret == -1 &&
- (errno == EAGAIN || errno == EWOULDBLOCK)) {
- blocked++;
+ if (ret == -1 && errno == EINTR) {
continue;
}
continue;
}
@@
-389,7
+376,6
@@
static void writefd_unbuffered(int fd,char *buf,int len)
exit_cleanup(RERR_STREAMIO);
}
exit_cleanup(RERR_STREAMIO);
}
- blocked = 0;
total += ret;
if (io_timeout)
total += ret;
if (io_timeout)
@@
-538,7
+524,7
@@
void io_printf(int fd, const char *format, ...)
int len;
va_start(ap, format);
int len;
va_start(ap, format);
- len = vslprintf(buf, sizeof(buf)
-1
, format, ap);
+ len = vslprintf(buf, sizeof(buf), format, ap);
va_end(ap);
if (len < 0) exit_cleanup(RERR_STREAMIO);
va_end(ap);
if (len < 0) exit_cleanup(RERR_STREAMIO);