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);
+ exit_cleanup(RERR_TIMEOUT);
}
}
n = read(fd, buf, len);
if (n > 0) {
- stats.total_read += n;
buf += n;
len -= n;
ret += n;
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");
}
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
rprintf(FERROR,"read error: %s\n", strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
return ret;
if (tag != FERROR && tag != FINFO) {
rprintf(FERROR,"unexpected tag %d\n", tag);
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
if (remaining > sizeof(line)-1) {
rprintf(FERROR,"multiplexing overflow %d\n\n",
remaining);
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, line, remaining);
ret = read_unbuffered(fd,buffer + total,N-total);
total += ret;
}
+
+ stats.total_read += total;
}
int32 read_int(int f)
{
char b[4];
+ int32 ret;
+
readfd(f,b,4);
- return IVAL(b,0);
+ ret = IVAL(b,0);
+ if (ret == (int32)0xffffffff) return -1;
+ return ret;
}
int64 read_longint(int f)
char b[8];
ret = read_int(f);
- if ((int32)ret != (int32)0xffffffff) return ret;
+ if ((int32)ret != (int32)0xffffffff) {
+ return ret;
+ }
#ifdef NO_INT64
rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_UNSUPPORTED);
#else
if (remote_version >= 16) {
readfd(f,b,8);
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 n = len-total;
int ret = write(fd,buf+total,n?n:1);
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);
+ exit_cleanup(RERR_STREAMIO);
}
- blocked = 0;
total += ret;
- stats.total_written += ret;
if (io_timeout)
last_io = time(NULL);
static void writefd(int fd,char *buf,int len)
{
+ stats.total_written += len;
+
if (!io_buffer) {
writefd_unbuffered(fd, buf, len);
return;
return;
}
- write_int(f, -1);
+ write_int(f, (int32)0xFFFFFFFF);
SIVAL(b,0,(x&0xFFFFFFFF));
SIVAL(b,4,((x>>32)&0xFFFFFFFF));
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(1);
+ if (len < 0) exit_cleanup(RERR_STREAMIO);
write_sbuf(fd, buf);
}
io_flush();
if (read_buffer_len) {
fprintf(stderr,"ERROR: data in read buffer at mplx start\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
io_multiplexing_in = 1;
SIVAL(io_buffer-4, 0, ((MPLEX_BASE + f)<<24) + len);
memcpy(io_buffer, buf, len);
+ stats.total_written += (len+4);
+
writefd_unbuffered(multiplex_out_fd, io_buffer-4, len+4);
return 1;
}