X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d19320fdf6d143e2ccf512847932b12a0085440e..9a6ed83f2c4a455b19b49824d86f5308b45f5c88:/io.c diff --git a/io.c b/io.c index 454b2768..2321666d 100644 --- a/io.c +++ b/io.c @@ -43,6 +43,7 @@ extern int bwlimit; extern size_t bwlimit_writemax; extern int verbose; extern int io_timeout; +extern int allowed_lull; extern int am_server; extern int am_daemon; extern int am_sender; @@ -51,8 +52,11 @@ extern int eol_nulls; extern int csum_length; extern int checksum_seed; extern int protocol_version; +extern int remove_sent_files; +extern int preserve_hard_links; extern char *filesfrom_host; extern struct stats stats; +extern struct file_list *the_file_list; const char phase_unknown[] = "unknown"; int select_timeout = SELECT_TIMEOUT; @@ -81,11 +85,11 @@ int kluge_around_eof = 0; int msg_fd_in = -1; int msg_fd_out = -1; +int sock_f_in = -1; +int sock_f_out = -1; static int io_multiplexing_out; static int io_multiplexing_in; -static int sock_f_in = -1; -static int sock_f_out = -1; static time_t last_io; static int no_flush; @@ -98,16 +102,20 @@ static char io_filesfrom_buf[2048]; static char *io_filesfrom_bp; static char io_filesfrom_lastchar; static int io_filesfrom_buflen; +static size_t contiguous_write_len = 0; static void read_loop(int fd, char *buf, size_t len); -struct redo_list { - struct redo_list *next; - int num; +struct flist_ndx_item { + struct flist_ndx_item *next; + int ndx; }; -static struct redo_list *redo_list_head; -static struct redo_list *redo_list_tail; +struct flist_ndx_list { + struct flist_ndx_item *head, *tail; +}; + +static struct flist_ndx_list redo_list, hlink_list; struct msg_list { struct msg_list *next; @@ -118,19 +126,37 @@ struct msg_list { static struct msg_list *msg_list_head; static struct msg_list *msg_list_tail; -static void redo_list_add(int num) +static void flist_ndx_push(struct flist_ndx_list *lp, int ndx) { - struct redo_list *rl; - - if (!(rl = new(struct redo_list))) - exit_cleanup(RERR_MALLOC); - rl->next = NULL; - rl->num = num; - if (redo_list_tail) - redo_list_tail->next = rl; + struct flist_ndx_item *item; + + if (!(item = new(struct flist_ndx_item))) + out_of_memory("flist_ndx_push"); + item->next = NULL; + item->ndx = ndx; + if (lp->tail) + lp->tail->next = item; else - redo_list_head = rl; - redo_list_tail = rl; + lp->head = item; + lp->tail = item; +} + +static int flist_ndx_pop(struct flist_ndx_list *lp) +{ + struct flist_ndx_item *next; + int ndx; + + if (!lp->head) + return -1; + + ndx = lp->head->ndx; + next = lp->head->next; + free(lp->head); + lp->head = next; + if (!next) + lp->tail = NULL; + + return ndx; } static void check_timeout(void) @@ -187,10 +213,10 @@ static void msg_list_add(int code, char *buf, int len) struct msg_list *ml; if (!(ml = new(struct msg_list))) - exit_cleanup(RERR_MALLOC); + out_of_memory("msg_list_add"); ml->next = NULL; if (!(ml->buf = new_array(char, len+4))) - exit_cleanup(RERR_MALLOC); + out_of_memory("msg_list_add"); SIVAL(ml->buf, 0, ((code+MPLEX_BASE)<<24) | len); memcpy(ml->buf+4, buf, len); ml->len = len+4; @@ -223,7 +249,7 @@ static void read_msg_fd(void) int tag, len; /* Temporarily disable msg_fd_in. This is needed to avoid looping back - * to this routine from read_timeout() and writefd_unbuffered(). */ + * to this routine from writefd_unbuffered(). */ msg_fd_in = -1; read_loop(fd, buf, 4); @@ -238,7 +264,7 @@ static void read_msg_fd(void) rprintf(FERROR, "invalid message %d:%d\n", tag, len); exit_cleanup(RERR_STREAMIO); } - redo_list_add(-1); + flist_ndx_push(&redo_list, -1); break; case MSG_REDO: if (len != 4 || !am_generator) { @@ -246,7 +272,7 @@ static void read_msg_fd(void) exit_cleanup(RERR_STREAMIO); } read_loop(fd, buf, 4); - redo_list_add(IVAL(buf,0)); + flist_ndx_push(&redo_list, IVAL(buf,0)); break; case MSG_DELETED: if (len >= (int)sizeof buf || !am_generator) { @@ -262,7 +288,10 @@ static void read_msg_fd(void) exit_cleanup(RERR_STREAMIO); } read_loop(fd, buf, len); - io_multiplex_write(MSG_SUCCESS, buf, len); + if (remove_sent_files) + io_multiplex_write(MSG_SUCCESS, buf, len); + if (preserve_hard_links) + flist_ndx_push(&hlink_list, IVAL(buf,0)); break; case MSG_INFO: case MSG_ERROR: @@ -324,22 +353,22 @@ int msg_list_push(int flush_it_all) return 1; } -int get_redo_num(void) +int get_redo_num(int itemizing, enum logcode code) { - struct redo_list *next; - int num; - - while (!redo_list_head) + while (1) { + if (hlink_list.head) + check_for_finished_hlinks(itemizing, code); + if (redo_list.head) + break; read_msg_fd(); + } - num = redo_list_head->num; - next = redo_list_head->next; - free(redo_list_head); - redo_list_head = next; - if (!next) - redo_list_tail = NULL; + return flist_ndx_pop(&redo_list); +} - return num; +int get_hlink_num(void) +{ + return flist_ndx_pop(&hlink_list); } /** @@ -419,11 +448,7 @@ 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 (msg_fd_in >= 0) { - FD_SET(msg_fd_in, &r_fds); - if (msg_fd_in > maxfd) - maxfd = msg_fd_in; - } else if (msg_list_head) { + if (msg_list_head) { FD_SET(msg_fd_out, &w_fds); if (msg_fd_out > maxfd) maxfd = msg_fd_out; @@ -460,9 +485,7 @@ static int read_timeout(int fd, char *buf, size_t len) continue; } - if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds)) - read_msg_fd(); - else if (msg_list_head && FD_ISSET(msg_fd_out, &w_fds)) + if (msg_list_head && FD_ISSET(msg_fd_out, &w_fds)) msg_list_push(NORMAL_FLUSH); if (io_filesfrom_f_out >= 0) { @@ -642,13 +665,13 @@ void io_end_buffering(void) } -void maybe_send_keepalive(int allowed_lull, int ndx) +void maybe_send_keepalive(void) { if (time(NULL) - last_io >= allowed_lull) { if (!iobuf_out || !iobuf_out_cnt) { if (protocol_version < 29) return; /* there's nothing we can do */ - write_int(sock_f_out, ndx); + write_int(sock_f_out, the_file_list->count); write_shortint(sock_f_out, ITEM_IS_NEW); } if (iobuf_out) @@ -737,8 +760,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) break; case MSG_SUCCESS: if (remaining != 4) { - rprintf(FERROR, "invalid multi-message %d:%ld\n", - tag, (long)remaining); + rprintf(FERROR, "invalid multi-message %d:%ld [%s]\n", + tag, (long)remaining, who_am_i()); exit_cleanup(RERR_STREAMIO); } read_loop(fd, line, remaining); @@ -749,8 +772,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) case MSG_ERROR: if (remaining >= sizeof line) { rprintf(FERROR, - "[%s] multiplexing overflow %d:%ld\n\n", - who_am_i(), tag, (long)remaining); + "multiplexing overflow %d:%ld [%s]\n", + tag, (long)remaining, who_am_i()); exit_cleanup(RERR_STREAMIO); } read_loop(fd, line, remaining); @@ -758,8 +781,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) remaining = 0; break; default: - rprintf(FERROR, "[%s] unexpected tag %d\n", - who_am_i(), tag); + rprintf(FERROR, "unexpected tag %d [%s]\n", + tag, who_am_i()); exit_cleanup(RERR_STREAMIO); } } @@ -845,7 +868,7 @@ void read_buf(int f,char *buf,size_t len) void read_sbuf(int f,char *buf,size_t len) { readfd(f, buf, len); - buf[len] = 0; + buf[len] = '\0'; } uchar read_byte(int f) @@ -855,6 +878,25 @@ uchar read_byte(int f) return c; } +int read_vstring(int f, char *buf, int bufsize) +{ + int len = read_byte(f); + + if (len & 0x80) + len = (len & ~0x80) * 0x100 + read_byte(f); + + if (len >= bufsize) { + rprintf(FERROR, "over-long vstring received (%d > %d)\n", + len, bufsize - 1); + return -1; + } + + if (len) + readfd(f, buf, len); + buf[len] = '\0'; + return len; +} + /* Populate a sum_struct with values from the socket. This is * called by both the sender and the receiver. */ void read_sum_head(int f, struct sum_struct *sum) @@ -862,20 +904,20 @@ void read_sum_head(int f, struct sum_struct *sum) sum->count = read_int(f); sum->blength = read_int(f); if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) { - rprintf(FERROR, "[%s] Invalid block length %ld\n", - who_am_i(), (long)sum->blength); + rprintf(FERROR, "Invalid block length %ld [%s]\n", + (long)sum->blength, who_am_i()); exit_cleanup(RERR_PROTOCOL); } sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f); if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) { - rprintf(FERROR, "[%s] Invalid checksum length %d\n", - who_am_i(), sum->s2length); + rprintf(FERROR, "Invalid checksum length %d [%s]\n", + sum->s2length, who_am_i()); exit_cleanup(RERR_PROTOCOL); } sum->remainder = read_int(f); if (sum->remainder < 0 || sum->remainder > sum->blength) { - rprintf(FERROR, "[%s] Invalid remainder length %ld\n", - who_am_i(), (long)sum->remainder); + rprintf(FERROR, "Invalid remainder length %ld [%s]\n", + (long)sum->remainder, who_am_i()); exit_cleanup(RERR_PROTOCOL); } } @@ -955,8 +997,8 @@ static void sleep_for_bwlimit(int bytes_written) /* Write len bytes to the file descriptor fd, looping as necessary to get - * the job done and also (in the generator) reading any data on msg_fd_in - * (to avoid deadlock). + * the job done and also (in certain circumstnces) reading any data on + * msg_fd_in to avoid deadlock. * * This function underlies the multiplexing system. The body of the * application never calls this function directly. */ @@ -974,7 +1016,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len) FD_SET(fd,&w_fds); maxfd = fd; - if (msg_fd_in >= 0) { + if (msg_fd_in >= 0 && len-total >= contiguous_write_len) { FD_ZERO(&r_fds); FD_SET(msg_fd_in,&r_fds); if (msg_fd_in > maxfd) @@ -1003,14 +1045,8 @@ static void writefd_unbuffered(int fd,char *buf,size_t len) if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds)) read_msg_fd(); - if (!FD_ISSET(fd, &w_fds)) { - if (fd != sock_f_out && iobuf_out_cnt) { - no_flush--; - io_flush(NORMAL_FLUSH); - no_flush++; - } + if (!FD_ISSET(fd, &w_fds)) continue; - } n = len - total; if (bwlimit && n > bwlimit_writemax) @@ -1068,6 +1104,13 @@ static void mplex_write(enum msgcode code, char *buf, size_t len) SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); + /* When the generator reads messages from the msg_fd_in pipe, it can + * cause output to occur down the socket. Setting contiguous_write_len + * prevents the reading of msg_fd_in once we actually start to write + * this sequence of data (though we might read it before the start). */ + if (am_generator && msg_fd_in >= 0) + contiguous_write_len = len + 4; + if (n > sizeof buffer - 4) n = sizeof buffer - 4; @@ -1079,6 +1122,9 @@ static void mplex_write(enum msgcode code, char *buf, size_t len) if (len) writefd_unbuffered(sock_f_out, buf, len); + + if (am_generator && msg_fd_in >= 0) + contiguous_write_len = 0; } @@ -1187,19 +1233,37 @@ void write_buf(int f,char *buf,size_t len) writefd(f,buf,len); } - /** Write a string to the connection */ void write_sbuf(int f, char *buf) { writefd(f, buf, strlen(buf)); } - void write_byte(int f, uchar c) { writefd(f, (char *)&c, 1); } +void write_vstring(int f, char *str, int len) +{ + uchar lenbuf[3], *lb = lenbuf; + + if (len > 0x7F) { + if (len > 0x7FFF) { + rprintf(FERROR, + "attempting to send over-long vstring (%d > %d)\n", + len, 0x7FFF); + exit_cleanup(RERR_PROTOCOL); + } + *lb++ = len / 0x100 + 0x80; + } + *lb = len; + + writefd(f, (char*)lenbuf, lb - lenbuf + 1); + if (len) + writefd(f, str, len); +} + /** * Read a line of up to @p maxlen characters into @p buf (not counting