* Copyright (C) 1996-2001 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
extern int am_daemon;
extern int am_sender;
extern int am_generator;
-extern int incremental;
+extern int inc_recurse;
extern int io_error;
extern int eol_nulls;
extern int flist_eof;
const char phase_unknown[] = "unknown";
int ignore_timeout = 0;
int batch_fd = -1;
-int done_cnt = 0;
+int msgdone_cnt = 0;
/* Ignore an EOF error if non-zero. See whine_about_eof(). */
int kluge_around_eof = 0;
5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 9, /* (C0 - FF)/4 */
};
-static int readfd_unbuffered(int fd, char *buf, size_t len);
+static void readfd(int fd, char *buffer, size_t N);
static void writefd(int fd, const char *buf, size_t len);
static void writefd_unbuffered(int fd, const char *buf, size_t len);
static void decrement_active_files(int ndx);
struct msg_list_item *head, *tail;
};
-static struct msg_list msg2genr, msg2sndr;
+static struct msg_list msg2sndr;
static void flist_ndx_push(struct flist_ndx_list *lp, int ndx)
{
lst->tail = m;
}
+static void msg2sndr_flush(void)
+{
+ while (msg2sndr.head && io_multiplexing_out) {
+ struct msg_list_item *m = msg2sndr.head;
+ if (!(msg2sndr.head = m->next))
+ msg2sndr.tail = NULL;
+ stats.total_written += m->len;
+ defer_forwarding_messages = 1;
+ writefd_unbuffered(sock_f_out, m->buf, m->len);
+ defer_forwarding_messages = 0;
+ free(m);
+ }
+}
+
/* Read a message from the MSG_* fd and handle it. This is called either
* during the early stages of being a local sender (up through the sending
* of the file list) or when we're the generator (to fetch the messages
/* Temporarily disable msg_fd_in. This is needed to avoid looping back
* to this routine from writefd_unbuffered(). */
+ no_flush++;
msg_fd_in = -1;
+ defer_forwarding_messages++;
- readfd_unbuffered(fd, buf, 4);
+ readfd(fd, buf, 4);
tag = IVAL(buf, 0);
len = tag & 0xFFFFFF;
switch (tag) {
case MSG_DONE:
- if (len != 0 || !am_generator) {
+ if (len < 0 || len > 1 || !am_generator) {
invalid_msg:
rprintf(FERROR, "invalid message %d:%d [%s%s]\n",
tag, len, who_am_i(),
- incremental ? "/incremental" : "");
+ inc_recurse ? "/inc" : "");
exit_cleanup(RERR_STREAMIO);
}
- done_cnt++;
+ if (len) {
+ readfd(fd, buf, len);
+ stats.total_read = read_longint(fd);
+ }
+ msgdone_cnt++;
break;
case MSG_REDO:
if (len != 4 || !am_generator)
goto invalid_msg;
- readfd_unbuffered(fd, buf, 4);
+ readfd(fd, buf, 4);
if (remove_source_files)
decrement_active_files(IVAL(buf,0));
flist_ndx_push(&redo_list, IVAL(buf,0));
- if (incremental)
+ if (inc_recurse)
decrement_flist_in_progress(IVAL(buf,0), 1);
break;
case MSG_FLIST:
- if (len != 4 || !am_generator || !incremental)
+ if (len != 4 || !am_generator || !inc_recurse)
goto invalid_msg;
- readfd_unbuffered(fd, buf, 4);
+ readfd(fd, buf, 4);
/* Read extra file list from receiver. */
assert(iobuf_in != NULL);
assert(iobuf_f_in == fd);
flist->parent_ndx = IVAL(buf,0);
break;
case MSG_FLIST_EOF:
- if (len != 0 || !am_generator || !incremental)
+ if (len != 0 || !am_generator || !inc_recurse)
goto invalid_msg;
flist_eof = 1;
break;
case MSG_DELETED:
if (len >= (int)sizeof buf || !am_generator)
goto invalid_msg;
- readfd_unbuffered(fd, buf, len);
+ readfd(fd, buf, len);
send_msg(MSG_DELETED, buf, len);
break;
case MSG_SUCCESS:
if (len != 4 || !am_generator)
goto invalid_msg;
- readfd_unbuffered(fd, buf, len);
+ readfd(fd, buf, len);
if (remove_source_files) {
decrement_active_files(IVAL(buf,0));
send_msg(MSG_SUCCESS, buf, len);
}
if (preserve_hard_links)
flist_ndx_push(&hlink_list, IVAL(buf,0));
- if (incremental)
+ if (inc_recurse)
decrement_flist_in_progress(IVAL(buf,0), 0);
break;
case MSG_NO_SEND:
if (len != 4 || !am_generator)
goto invalid_msg;
- readfd_unbuffered(fd, buf, len);
- if (incremental)
+ readfd(fd, buf, len);
+ if (inc_recurse)
decrement_flist_in_progress(IVAL(buf,0), 0);
break;
case MSG_SOCKERR:
n = len;
if (n >= sizeof buf)
n = sizeof buf - 1;
- readfd_unbuffered(fd, buf, n);
+ readfd(fd, buf, n);
rwrite((enum logcode)tag, buf, n);
len -= n;
}
exit_cleanup(RERR_STREAMIO);
}
+ no_flush--;
msg_fd_in = fd;
+ if (!--defer_forwarding_messages)
+ msg2sndr_flush();
}
/* This is used by the generator to limit how many file transfers can
{
/* TODO: tune these limits? */
while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) {
-#ifdef SUPPORT_HARD_LINKS
- if (hlink_list.head)
- check_for_finished_hlinks(itemizing, code);
-#endif
- read_msg_fd();
+ check_for_finished_files(itemizing, code, 0);
+ if (iobuf_out_cnt)
+ io_flush(NORMAL_FLUSH);
+ else
+ read_msg_fd();
}
active_filecnt++;
- active_bytecnt += F_LENGTH(cur_flist->files[ndx]);
+ active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]);
}
static void decrement_active_files(int ndx)
flist->to_redo++;
}
-/* Try to push messages off the list onto the wire. If we leave with more
- * to do, return 0. On error, return -1. If everything flushed, return 1.
- * This is only active in the receiver. */
-static int msg2genr_flush(void)
+/* Write an message to a multiplexed stream. If this fails, rsync exits. */
+static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len)
{
- if (msg_fd_out < 0 || no_flush)
- return -1;
+ char buffer[1024];
+ size_t n = len;
- no_flush++;
- while (msg2genr.head) {
- struct msg_list_item *m = msg2genr.head;
- writefd(msg_fd_out, m->buf, m->len);
- msg2genr.head = m->next;
- if (!msg2genr.head)
- msg2genr.tail = NULL;
- free(m);
- }
- if (iobuf_out_cnt) {
- writefd_unbuffered(iobuf_f_out, iobuf_out, iobuf_out_cnt);
- iobuf_out_cnt = 0;
+ SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
+
+ if (n > sizeof buffer - 4)
+ n = 0;
+ else
+ memcpy(buffer + 4, buf, n);
+
+ writefd_unbuffered(fd, buffer, n+4);
+
+ len -= n;
+ buf += n;
+
+ if (len) {
+ defer_forwarding_messages++;
+ writefd_unbuffered(fd, buf, len);
+ if (!--defer_forwarding_messages)
+ msg2sndr_flush();
}
- no_flush--;
- return 1;
}
int send_msg(enum msgcode code, const char *buf, int len)
msg_list_add(&msg2sndr, code, buf, len);
return 1;
}
- msg_list_add(&msg2genr, code, buf, len);
- msg2genr_flush();
+ mplex_write(msg_fd_out, code, buf, len);
return 1;
}
void wait_for_receiver(void)
{
- read_msg_fd();
+ if (iobuf_out_cnt)
+ io_flush(NORMAL_FLUSH);
+ else
+ read_msg_fd();
}
int get_redo_num(void)
{
int n, cnt = 0;
- io_flush(NORMAL_FLUSH);
+ io_flush(FULL_FLUSH);
while (cnt == 0) {
/* until we manage to read *something* */
FD_ZERO(&r_fds);
FD_ZERO(&w_fds);
FD_SET(fd, &r_fds);
- if (msg2genr.head) {
- FD_SET(msg_fd_out, &w_fds);
- if (msg_fd_out > maxfd)
- maxfd = msg_fd_out;
- }
if (io_filesfrom_f_out >= 0) {
int new_fd;
if (io_filesfrom_buflen == 0) {
count = select(maxfd + 1, &r_fds, &w_fds, NULL, &tv);
if (count <= 0) {
- if (errno == EBADF)
+ if (errno == EBADF) {
+ defer_forwarding_messages = 0;
exit_cleanup(RERR_SOCKETIO);
+ }
check_timeout();
continue;
}
- if (msg2genr.head && FD_ISSET(msg_fd_out, &w_fds))
- msg2genr_flush();
-
if (io_filesfrom_f_out >= 0) {
if (io_filesfrom_buflen) {
if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
iobuf_f_out = -1;
}
-void maybe_flush_socket(void)
+void maybe_flush_socket(int important)
{
- if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5)
+ if (iobuf_out && iobuf_out_cnt
+ && (important || time(NULL) - last_io_out >= 5))
io_flush(NORMAL_FLUSH);
}
void stop_flist_forward()
{
- io_flush(NORMAL_FLUSH);
flist_forward_from = -1;
+ io_flush(FULL_FLUSH);
}
/**
return cnt;
}
-/**
- * Do a buffered read from @p fd. Don't return until all @p n bytes
- * have been read. If all @p n can't be read then exit with an
- * error.
- **/
+/* Do a buffered read from fd. Don't return until all N bytes have
+ * been read. If all N can't be read then exit with an error. */
static void readfd(int fd, char *buffer, size_t N)
{
int cnt;
int defer_save = defer_forwarding_messages;
struct timeval tv;
- no_flush++;
+ if (no_flush++)
+ defer_forwarding_messages = 1;
while (total < len) {
FD_ZERO(&w_fds);
/* Don't try to write errors back across the stream. */
if (fd == sock_f_out)
io_end_multiplex_out();
+ /* Don't try to write errors down a failing msg pipe. */
+ if (am_server && fd == msg_fd_out)
+ exit_cleanup(RERR_STREAMIO);
rsyserr(FERROR, errno,
"writefd_unbuffered failed to write %ld bytes [%s]",
(long)len, who_am_i());
}
}
- defer_forwarding_messages = defer_save;
no_flush--;
-}
-
-static void msg2sndr_flush(void)
-{
- if (defer_forwarding_messages)
- return;
-
- while (msg2sndr.head && io_multiplexing_out) {
- struct msg_list_item *m = msg2sndr.head;
- if (!(msg2sndr.head = m->next))
- msg2sndr.tail = NULL;
- stats.total_written += m->len;
- defer_forwarding_messages = 1;
- writefd_unbuffered(sock_f_out, m->buf, m->len);
- defer_forwarding_messages = 0;
- free(m);
- }
-}
-
-/**
- * Write an message to a multiplexed stream. If this fails then rsync
- * exits.
- **/
-static void mplex_write(enum msgcode code, const char *buf, size_t len)
-{
- char buffer[1024];
- size_t n = len;
-
- SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
-
- if (n > sizeof buffer - 4)
- n = 0;
- else
- memcpy(buffer + 4, buf, n);
-
- writefd_unbuffered(sock_f_out, buffer, n+4);
-
- len -= n;
- buf += n;
-
- if (len) {
- defer_forwarding_messages = 1;
- writefd_unbuffered(sock_f_out, buf, len);
- defer_forwarding_messages = 0;
+ if (!(defer_forwarding_messages = defer_save))
msg2sndr_flush();
- }
}
-void io_flush(UNUSED(int flush_it_all))
+void io_flush(int flush_it_all)
{
- msg2genr_flush();
- msg2sndr_flush();
+ if (flush_it_all && !defer_forwarding_messages)
+ msg2sndr_flush();
if (!iobuf_out_cnt || no_flush)
return;
if (io_multiplexing_out)
- mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt);
+ mplex_write(sock_f_out, MSG_DATA, iobuf_out, iobuf_out_cnt);
else
writefd_unbuffered(iobuf_f_out, iobuf_out, iobuf_out_cnt);
iobuf_out_cnt = 0;
writefd(f, str, len);
}
+/* Send a file-list index using a byte-reduction method. */
+void write_ndx(int f, int32 ndx)
+{
+ static int32 prev_positive = -1, prev_negative = 1;
+ int32 diff, cnt = 0;
+ char b[6];
+
+ if (protocol_version < 30 || read_batch) {
+ write_int(f, ndx);
+ return;
+ }
+
+ /* Send NDX_DONE as a single-byte 0 with no side effects. Send
+ * negative nums as a positive after sending a leading 0xFF. */
+ if (ndx >= 0) {
+ diff = ndx - prev_positive;
+ prev_positive = ndx;
+ } else if (ndx == NDX_DONE) {
+ *b = 0;
+ writefd(f, b, 1);
+ return;
+ } else {
+ b[cnt++] = (char)0xFF;
+ ndx = -ndx;
+ diff = ndx - prev_negative;
+ prev_negative = ndx;
+ }
+
+ /* A diff of 1 - 253 is sent as a one-byte diff; a diff of 254 - 32767
+ * or 0 is sent as a 0xFE + a two-byte diff; otherwise we send 0xFE
+ * & all 4 bytes of the (non-negative) num with the high-bit set. */
+ if (diff < 0xFE && diff > 0)
+ b[cnt++] = (char)diff;
+ else if (diff < 0 || diff > 0x7FFF) {
+ b[cnt++] = (char)0xFE;
+ b[cnt++] = (char)((ndx >> 24) | 0x80);
+ b[cnt++] = (char)(ndx >> 16);
+ b[cnt++] = (char)(ndx >> 8);
+ b[cnt++] = (char)ndx;
+ } else {
+ b[cnt++] = (char)0xFE;
+ b[cnt++] = (char)(diff >> 8);
+ b[cnt++] = (char)diff;
+ }
+ writefd(f, b, cnt);
+}
+
+/* Receive a file-list index using a byte-reduction method. */
+int32 read_ndx(int f)
+{
+ static int32 prev_positive = -1, prev_negative = 1;
+ int32 *prev_ptr, num;
+ char b[4];
+
+ if (protocol_version < 30)
+ return read_int(f);
+
+ readfd(f, b, 1);
+ if (CVAL(b, 0) == 0xFF) {
+ readfd(f, b, 1);
+ prev_ptr = &prev_negative;
+ } else if (CVAL(b, 0) == 0)
+ return NDX_DONE;
+ else
+ prev_ptr = &prev_positive;
+ if (CVAL(b, 0) == 0xFE) {
+ readfd(f, b, 2);
+ if (CVAL(b, 0) & 0x80) {
+ readfd(f, b+2, 2);
+ num = NVAL4(b, 0x80);
+ } else
+ num = NVAL2(b, 0) + *prev_ptr;
+ } else
+ num = CVAL(b, 0) + *prev_ptr;
+ *prev_ptr = num;
+ if (prev_ptr == &prev_negative)
+ num = -num;
+ return num;
+}
+
/**
* Read a line of up to @p maxlen characters into @p buf (not counting
* the trailing null). Strips the (required) trailing newline and all
return 0;
io_flush(NORMAL_FLUSH);
stats.total_written += (len+4);
- mplex_write(code, buf, len);
+ mplex_write(sock_f_out, code, buf, len);
return 1;
}