X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8a65e0ce00bb5150c1cc70b985a649e0dc9e5278..f31514adb780899d886df63edd79ac3d48363f2f:/io.c diff --git a/io.c b/io.c index e2304d4f..25574409 100644 --- a/io.c +++ b/io.c @@ -4,12 +4,11 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * 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 @@ -41,7 +40,7 @@ extern int am_server; 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; @@ -58,7 +57,7 @@ extern struct file_list *cur_flist, *first_flist; 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; @@ -101,13 +100,13 @@ static int active_filecnt = 0; static OFF_T active_bytecnt = 0; static char int_byte_cnt[64] = { - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (00 - 3F)/4 */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (40 - 7F)/4 */ - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* (80 - BF)/4 */ - 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 9, /* (C0 - FF)/4 */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (00 - 3F)/4 */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (40 - 7F)/4 */ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* (80 - BF)/4 */ + 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 6, 7, /* (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); @@ -134,7 +133,7 @@ struct msg_list { 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) { @@ -248,6 +247,20 @@ static void msg_list_add(struct msg_list *lst, int code, const char *buf, int le 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 @@ -262,9 +275,11 @@ static void read_msg_fd(void) /* 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; @@ -272,29 +287,33 @@ static void read_msg_fd(void) 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); @@ -302,34 +321,34 @@ static void read_msg_fd(void) 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: @@ -346,7 +365,7 @@ static void read_msg_fd(void) 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; } @@ -357,7 +376,10 @@ static void read_msg_fd(void) 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 @@ -367,15 +389,15 @@ void increment_active_files(int ndx, int itemizing, enum logcode code) { /* 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) @@ -412,29 +434,30 @@ static void decrement_flist_in_progress(int ndx, int redo) 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) @@ -447,8 +470,7 @@ 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; } @@ -461,7 +483,10 @@ void send_msg_int(enum msgcode code, int num) 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) @@ -538,7 +563,7 @@ static int read_timeout(int fd, char *buf, size_t len) { int n, cnt = 0; - io_flush(NORMAL_FLUSH); + io_flush(FULL_FLUSH); while (cnt == 0) { /* until we manage to read *something* */ @@ -550,11 +575,6 @@ static int read_timeout(int fd, char *buf, size_t len) 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) { @@ -581,15 +601,14 @@ static int read_timeout(int fd, char *buf, size_t len) 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)) { @@ -785,9 +804,10 @@ void io_end_buffering_out(void) 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); } @@ -818,8 +838,8 @@ void start_flist_forward(int f_in) void stop_flist_forward() { - io_flush(NORMAL_FLUSH); flist_forward_from = -1; + io_flush(FULL_FLUSH); } /** @@ -947,11 +967,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) 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; @@ -981,6 +998,37 @@ unsigned short read_shortint(int f) return (UVAL(b, 1) << 8) + UVAL(b, 0); } +int32 read_varint(int f) +{ + int32 num; + char b[5]; + int cnt; + readfd(f, b, 1); + cnt = int_byte_cnt[CVAL(b, 0) / 4]; + if (cnt > 1) + readfd(f, b + 1, cnt - 1); + switch (cnt) { + case 1: + num = NVAL1(b, 0); + break; + case 2: + num = NVAL2(b, 0x80); + break; + case 3: + num = NVAL3(b, 0xC0); + break; + case 4: + num = NVAL4(b, 0xE0); + break; + case 5: + num = NVAL4(b+1, 0); + break; + default: + exit_cleanup(RERR_PROTOCOL); /* impossible... */ + } + return num; +} + int32 read_int(int f) { char b[4]; @@ -1016,7 +1064,7 @@ int64 read_longint(int f) } else { int cnt; readfd(f, b, 3); - cnt = int_byte_cnt[CVAL(b, 0) / 4]; + cnt = int_byte_cnt[CVAL(b, 0) / 4] + 2; #if SIZEOF_INT64 < 8 if (cnt > 5 || (cnt == 5 && (CVAL(b,0)&0x3F || CVAL(b,1)&0x80))) { rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); @@ -1111,7 +1159,7 @@ void read_sum_head(int f, struct sum_struct *sum) exit_cleanup(RERR_PROTOCOL); } sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f); - if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) { + if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) { rprintf(FERROR, "Invalid checksum length %d [%s]\n", sum->s2length, who_am_i()); exit_cleanup(RERR_PROTOCOL); @@ -1210,7 +1258,8 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) 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); @@ -1271,6 +1320,9 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) /* 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()); @@ -1295,66 +1347,21 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } } - 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; @@ -1397,6 +1404,37 @@ void write_shortint(int f, unsigned short x) writefd(f, b, 2); } +void write_varint(int f, int32 x) +{ + char b[5]; + if ((uint32)x < ((uint32)1<<(1*8-1))) { + b[0] = (char)x; + writefd(f, b, 1); + } else if ((uint32)x < ((uint32)1<<(2*8-2))) { + b[0] = (char)(x >> 8) | 0x80; + b[1] = (char)x; + writefd(f, b, 2); + } else if ((uint32)x < ((uint32)1<<(3*8-3))) { + b[0] = (char)(x >> 16) | 0xC0; + b[1] = (char)(x >> 8); + b[2] = (char)x; + writefd(f, b, 3); + } else if ((uint32)x < ((uint32)1<<(4*8-4))) { + b[0] = (char)(x >> 24) | 0xE0; + b[1] = (char)(x >> 16); + b[2] = (char)(x >> 8); + b[3] = (char)x; + writefd(f, b, 4); + } else { + b[0] = 0xF0; + b[1] = (char)(x >> 24); + b[2] = (char)(x >> 16); + b[3] = (char)(x >> 8); + b[4] = (char)x; + writefd(f, b, 5); + } +} + void write_int(int f, int32 x) { char b[4]; @@ -1692,7 +1730,7 @@ int io_multiplex_write(enum msgcode code, const char *buf, size_t len) 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; }