static int io_multiplexing_out;
static int io_multiplexing_in;
-static int multiplex_in_fd;
-static int multiplex_out_fd;
+static int multiplex_in_fd = -1;
+static int multiplex_out_fd = -1;
static time_t last_io;
static int no_flush;
time_t t;
err_list_push();
-
+
if (!io_timeout) return;
if (!last_io) {
while (len) {
n = len;
- if (n > (sizeof(buf)-1))
- n = sizeof(buf)-1;
+ if (n > (sizeof buf - 1))
+ n = sizeof buf - 1;
read_loop(fd, buf, n);
rwrite((enum logcode)tag, buf, n);
len -= n;
* program where that is a problem (start_socket_client),
* kludge_around_eof is True and we just exit.
*/
-static void whine_about_eof (void)
+static void whine_about_eof(void)
{
if (kludge_around_eof)
- exit_cleanup (0);
+ exit_cleanup(0);
else {
- rprintf (FERROR,
- "%s: connection unexpectedly closed "
- "(%.0f bytes read so far)\n",
- RSYNC_NAME, (double)stats.total_read);
-
- exit_cleanup (RERR_STREAMIO);
+ rprintf(FERROR,
+ "%s: connection unexpectedly closed "
+ "(%.0f bytes read so far)\n",
+ RSYNC_NAME, (double)stats.total_read);
+
+ exit_cleanup(RERR_STREAMIO);
}
}
-static void die_from_readerr (int err)
+static void die_from_readerr(int err)
{
/* this prevents us trying to write errors on a dead socket */
io_multiplexing_close();
-
+
rprintf(FERROR, "%s: read error: %s\n",
- RSYNC_NAME, strerror (err));
+ RSYNC_NAME, strerror(err));
exit_cleanup(RERR_STREAMIO);
}
* give a better explanation. We can tell whether the connection has
* started by looking e.g. at whether the remote version is known yet.
*/
-static int read_timeout (int fd, char *buf, size_t len)
+static int read_timeout(int fd, char *buf, size_t len)
{
int n, ret=0;
FD_ZERO(&r_fds);
FD_SET(fd, &r_fds);
- if (io_error_fd != -1) {
+ if (io_error_fd >= 0) {
FD_SET(io_error_fd, &r_fds);
if (io_error_fd >= fd_count) fd_count = io_error_fd+1;
}
- if (io_filesfrom_f_out != -1) {
+ if (io_filesfrom_f_out >= 0) {
int new_fd;
if (io_filesfrom_buflen == 0) {
- if (io_filesfrom_f_in != -1) {
+ if (io_filesfrom_f_in >= 0) {
FD_SET(io_filesfrom_f_in, &r_fds);
new_fd = io_filesfrom_f_in;
} else {
continue;
}
-
- if (io_error_fd != -1 && FD_ISSET(io_error_fd, &r_fds)) {
+ if (io_error_fd >= 0 && FD_ISSET(io_error_fd, &r_fds)) {
read_error_fd();
}
- if (io_filesfrom_f_out != -1) {
+ if (io_filesfrom_f_out >= 0) {
if (io_filesfrom_buflen) {
if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
int l = write(io_filesfrom_f_out,
io_filesfrom_f_out = -1;
}
}
- } else if (io_filesfrom_f_in != -1) {
+ } else if (io_filesfrom_f_in >= 0) {
if (FD_ISSET(io_filesfrom_f_in, &r_fds)) {
int l = read(io_filesfrom_f_in,
io_filesfrom_buf,
last_io = time(NULL);
continue;
} else if (n == 0) {
- whine_about_eof ();
+ whine_about_eof();
return -1; /* doesn't return */
- } else if (n == -1) {
+ } else if (n < 0) {
if (errno == EINTR || errno == EWOULDBLOCK ||
errno == EAGAIN)
continue;
- else
- die_from_readerr (errno);
+ die_from_readerr(errno);
}
}
extern int io_timeout;
extern int eol_nulls;
extern char *remote_filesfrom_file;
- extern int am_server;
- int reading_remotely = remote_filesfrom_file || (am_server && fd == 0);
+ int reading_remotely = remote_filesfrom_file != NULL;
int nulls = eol_nulls || reading_remotely;
start:
* Continue trying to read len bytes - don't return until len has been
* read.
**/
-static void read_loop (int fd, char *buf, size_t len)
+static void read_loop(int fd, char *buf, size_t len)
{
while (len) {
int n = read_timeout(fd, buf, len);
static size_t remaining;
int tag, ret = 0;
char line[1024];
+ static char *buffer;
+ static size_t bufferIdx = 0;
+ static size_t bufferSz;
- if (!io_multiplexing_in || fd != multiplex_in_fd)
+ if (fd != multiplex_in_fd)
return read_timeout(fd, buf, len);
+ if (!io_multiplexing_in && remaining == 0) {
+ if (!buffer) {
+ bufferSz = 2 * IO_BUFFER_SIZE;
+ buffer = new_array(char, bufferSz);
+ if (!buffer) out_of_memory("read_unbuffered");
+ }
+ remaining = read_timeout(fd, buffer, bufferSz);
+ bufferIdx = 0;
+ }
+
while (ret == 0) {
if (remaining) {
len = MIN(len, remaining);
- read_loop(fd, buf, len);
+ memcpy(buf, buffer + bufferIdx, len);
+ bufferIdx += len;
remaining -= len;
ret = len;
- continue;
+ break;
}
read_loop(fd, line, 4);
remaining = tag & 0xFFFFFF;
tag = tag >> 24;
- if (tag == MPLEX_BASE)
+ if (tag == MPLEX_BASE) {
+ if (!buffer || remaining > bufferSz) {
+ buffer = realloc_array(buffer, char, remaining);
+ if (!buffer) out_of_memory("read_unbuffered");
+ bufferSz = remaining;
+ }
+ read_loop(fd, buffer, remaining);
+ bufferIdx = 0;
continue;
+ }
tag -= MPLEX_BASE;
exit_cleanup(RERR_STREAMIO);
}
- if (remaining > sizeof(line) - 1) {
- rprintf(FERROR, "multiplexing overflow %d\n\n",
- remaining);
+ if (remaining > sizeof line - 1) {
+ rprintf(FERROR, "multiplexing overflow %ld\n\n",
+ (long)remaining);
exit_cleanup(RERR_STREAMIO);
}
remaining = 0;
}
+ if (remaining == 0)
+ io_flush();
+
return ret;
}
* have been read. If all @p n can't be read then exit with an
* error.
**/
-static void readfd (int fd, char *buffer, size_t N)
+static void readfd(int fd, char *buffer, size_t N)
{
int ret;
size_t total=0;
-
- while (total < N) {
- io_flush();
- ret = read_unbuffered (fd, buffer + total, N-total);
+ while (total < N) {
+ ret = read_unbuffered(fd, buffer + total, N-total);
total += ret;
}
void read_sbuf(int f,char *buf,size_t len)
{
- read_buf (f,buf,len);
+ read_buf(f,buf,len);
buf[len] = 0;
}
unsigned char read_byte(int f)
{
unsigned char c;
- read_buf (f, (char *)&c, 1);
+ read_buf(f, (char *)&c, 1);
return c;
}
assert(bytes_written > 0);
assert(bwlimit > 0);
-
+
tv.tv_usec = bytes_written * 1000 / bwlimit;
tv.tv_sec = tv.tv_usec / 1000000;
tv.tv_usec = tv.tv_usec % 1000000;
FD_SET(fd,&w_fds);
fd_count = fd;
- if (io_error_fd != -1) {
+ if (io_error_fd >= 0) {
FD_ZERO(&r_fds);
FD_SET(io_error_fd,&r_fds);
if (io_error_fd > fd_count)
errno = 0;
count = select(fd_count+1,
- io_error_fd != -1?&r_fds:NULL,
+ io_error_fd >= 0?&r_fds:NULL,
&w_fds,NULL,
&tv);
continue;
}
- if (io_error_fd != -1 && FD_ISSET(io_error_fd, &r_fds)) {
+ if (io_error_fd >= 0 && FD_ISSET(io_error_fd, &r_fds)) {
read_error_fd();
}
size_t n = len-total;
ret = write(fd,buf+total,n);
- if (ret == -1 && errno == EINTR) {
- continue;
- }
-
- if (ret == -1 &&
- (errno == EWOULDBLOCK || errno == EAGAIN)) {
- msleep(1);
- continue;
+ if (ret < 0) {
+ if (errno == EINTR)
+ continue;
+ if (errno == EWOULDBLOCK || errno == EAGAIN) {
+ msleep(1);
+ continue;
+ }
}
if (ret <= 0) {
static char *io_buffer;
static int io_buffer_count;
-void io_start_buffering(int fd)
+void io_start_buffering_out(int fd)
{
if (io_buffer) return;
multiplex_out_fd = fd;
- io_buffer = (char *)malloc(IO_BUFFER_SIZE);
+ io_buffer = new_array(char, IO_BUFFER_SIZE);
if (!io_buffer) out_of_memory("writefd");
io_buffer_count = 0;
}
+void io_start_buffering_in(int fd)
+{
+ multiplex_in_fd = fd;
+}
+
/**
* Write an message to a multiplexed stream. If this fails then rsync
* exits.
SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
- if (n > (sizeof(buffer)-4)) {
- n = sizeof(buffer)-4;
+ if (n > (sizeof buffer - 4)) {
+ n = sizeof buffer - 4;
}
memcpy(&buffer[4], buf, n);
len -= n;
io_buffer_count += n;
}
-
+
if (io_buffer_count == IO_BUFFER_SIZE) io_flush();
}
}
va_list ap;
char buf[1024];
int len;
-
+
va_start(ap, format);
- len = vsnprintf(buf, sizeof(buf), format, ap);
+ len = vsnprintf(buf, sizeof buf, format, ap);
va_end(ap);
if (len < 0) exit_cleanup(RERR_STREAMIO);
{
multiplex_out_fd = fd;
io_flush();
- io_start_buffering(fd);
+ io_start_buffering_out(fd);
io_multiplexing_out = 1;
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff