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) {
exit_cleanup(RERR_STREAMIO);
}
+ /* this prevents us trying to write errors on a dead socket */
+ io_multiplexing_out = 0;
+
rprintf(FERROR,"read error: %s\n", strerror(errno));
exit_cleanup(RERR_STREAMIO);
}
int fd_count, count;
struct timeval tv;
int reading=0;
- int blocked=0;
no_flush++;
}
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;
}
exit_cleanup(RERR_STREAMIO);
}
- blocked = 0;
total += ret;
if (io_timeout)
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);