- Added set_io_timeout(), which sets all the timeout-dependent
[rsync.git] / io.c
diff --git a/io.c b/io.c
index c1f389783540e123d6ad1adb900b0039e8b860f4..90ff04f1a29ed736d0d9d8774f8643a4372e9f84 100644 (file)
--- a/io.c
+++ b/io.c
@@ -43,19 +43,23 @@ 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;
 extern int am_generator;
 extern int eol_nulls;
+extern int read_batch;
 extern int csum_length;
 extern int checksum_seed;
 extern int protocol_version;
-extern char *remote_filesfrom_file;
+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;
 int ignore_timeout = 0;
 int batch_fd = -1;
 int batch_gen_fd = -1;
@@ -81,12 +85,13 @@ 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 time_t last_io_in;
+static time_t last_io_out;
 static int no_flush;
 
 static int write_batch_monitor_in = -1;
@@ -98,16 +103,21 @@ 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 int select_timeout = SELECT_TIMEOUT;
 
 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 +128,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)
@@ -140,17 +168,17 @@ static void check_timeout(void)
        if (!io_timeout || ignore_timeout)
                return;
 
-       if (!last_io) {
-               last_io = time(NULL);
+       if (!last_io_in) {
+               last_io_in = time(NULL);
                return;
        }
 
        t = time(NULL);
 
-       if (t - last_io >= io_timeout) {
+       if (t - last_io_in >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
-                               (int)(t-last_io));
+                               (int)(t-last_io_in));
                }
                exit_cleanup(RERR_TIMEOUT);
        }
@@ -164,6 +192,18 @@ void io_set_sock_fds(int f_in, int f_out)
        sock_f_out = f_out;
 }
 
+void set_io_timeout(int secs)
+{
+       io_timeout = secs;
+
+       if (!io_timeout || io_timeout > SELECT_TIMEOUT)
+               select_timeout = SELECT_TIMEOUT;
+       else
+               select_timeout = io_timeout;
+
+       allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
+}
+
 /* Setup the fd used to receive MSG_* messages.  Only needed 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 from
@@ -187,10 +227,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 +263,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 +278,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 +286,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 +302,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 +367,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);
 }
 
 /**
@@ -376,9 +419,11 @@ void io_set_filesfrom_fds(int f_in, int f_out)
 static void whine_about_eof(int fd)
 {
        if (kluge_around_eof && fd == sock_f_in) {
+               int i;
                if (kluge_around_eof > 0)
                        exit_cleanup(0);
-               while (1)
+               /* If we're still here after 10 seconds, exit with an error. */
+               for (i = 10*1000/20; i--; )
                        msleep(20);
        }
 
@@ -417,11 +462,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;
@@ -458,9 +499,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) {
@@ -549,8 +588,8 @@ static int read_timeout(int fd, char *buf, size_t len)
                len -= n;
                ret += n;
 
-               if (io_timeout && fd == sock_f_in)
-                       last_io = time(NULL);
+               if (fd == sock_f_in && io_timeout)
+                       last_io_in = time(NULL);
        }
 
        return ret;
@@ -564,7 +603,7 @@ int read_filesfrom_line(int fd, char *fname)
 {
        char ch, *s, *eob = fname + MAXPATHLEN - 1;
        int cnt;
-       int reading_remotely = remote_filesfrom_file != NULL;
+       int reading_remotely = filesfrom_host != NULL;
        int nulls = eol_nulls || reading_remotely;
 
   start:
@@ -640,13 +679,20 @@ void io_end_buffering(void)
 }
 
 
-void maybe_send_keepalive(int allowed_lull, int ndx)
+void maybe_flush_socket(void)
 {
-       if (time(NULL) - last_io >= allowed_lull) {
+       if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5)
+               io_flush(NORMAL_FLUSH);
+}
+
+
+void maybe_send_keepalive(void)
+{
+       if (time(NULL) - last_io_out >= 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)
@@ -680,8 +726,13 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
 {
        static size_t remaining;
        static size_t iobuf_in_ndx;
+       size_t msg_bytes;
        int tag, ret = 0;
-       char line[MAXPATHLEN+1];
+#if MAXPATHLEN < 4096
+       char line[4096+1024];
+#else
+       char line[MAXPATHLEN+1024];
+#endif
 
        if (!iobuf_in || fd != sock_f_in)
                return read_timeout(fd, buf, len);
@@ -704,60 +755,56 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
                read_loop(fd, line, 4);
                tag = IVAL(line, 0);
 
-               remaining = tag & 0xFFFFFF;
+               msg_bytes = tag & 0xFFFFFF;
                tag = (tag >> 24) - MPLEX_BASE;
 
                switch (tag) {
                case MSG_DATA:
-                       if (remaining > iobuf_in_siz) {
+                       if (msg_bytes > iobuf_in_siz) {
                                if (!(iobuf_in = realloc_array(iobuf_in, char,
-                                                              remaining)))
+                                                              msg_bytes)))
                                        out_of_memory("readfd_unbuffered");
-                               iobuf_in_siz = remaining;
+                               iobuf_in_siz = msg_bytes;
                        }
-                       read_loop(fd, iobuf_in, remaining);
+                       read_loop(fd, iobuf_in, msg_bytes);
+                       remaining = msg_bytes;
                        iobuf_in_ndx = 0;
                        break;
                case MSG_DELETED:
-                       if (remaining >= sizeof line) {
-                               rprintf(FERROR, "invalid multi-message %d:%ld\n",
-                                       tag, (long)remaining);
-                               exit_cleanup(RERR_STREAMIO);
-                       }
-                       read_loop(fd, line, remaining);
-                       line[remaining] = '\0';
+                       if (msg_bytes >= sizeof line)
+                               goto overflow;
+                       read_loop(fd, line, msg_bytes);
+                       line[msg_bytes] = '\0';
                        /* A directory name was sent with the trailing null */
-                       if (remaining > 0 && !line[remaining-1])
+                       if (msg_bytes > 0 && !line[msg_bytes-1])
                                log_delete(line, S_IFDIR);
                        else
                                log_delete(line, S_IFREG);
-                       remaining = 0;
                        break;
                case MSG_SUCCESS:
-                       if (remaining != 4) {
-                               rprintf(FERROR, "invalid multi-message %d:%ld\n",
-                                       tag, (long)remaining);
+                       if (msg_bytes != 4) {
+                               rprintf(FERROR, "invalid multi-message %d:%ld [%s]\n",
+                                       tag, (long)msg_bytes, who_am_i());
                                exit_cleanup(RERR_STREAMIO);
                        }
-                       read_loop(fd, line, remaining);
+                       read_loop(fd, line, msg_bytes);
                        successful_send(IVAL(line, 0));
-                       remaining = 0;
                        break;
                case MSG_INFO:
                case MSG_ERROR:
-                       if (remaining >= sizeof line) {
+                       if (msg_bytes >= sizeof line) {
+                           overflow:
                                rprintf(FERROR,
-                                       "[%s] multiplexing overflow %d:%ld\n\n",
-                                       who_am_i(), tag, (long)remaining);
+                                       "multiplexing overflow %d:%ld [%s]\n",
+                                       tag, (long)msg_bytes, who_am_i());
                                exit_cleanup(RERR_STREAMIO);
                        }
-                       read_loop(fd, line, remaining);
-                       rwrite((enum logcode)tag, line, remaining);
-                       remaining = 0;
+                       read_loop(fd, line, msg_bytes);
+                       rwrite((enum logcode)tag, line, msg_bytes);
                        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);
                }
        }
@@ -843,7 +890,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)
@@ -853,6 +900,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)
@@ -860,20 +926,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);
        }
 }
@@ -953,8 +1019,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. */
@@ -962,7 +1028,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
 {
        size_t n, total = 0;
        fd_set w_fds, r_fds;
-       int maxfd, count, ret;
+       int maxfd, count, ret, using_r_fds;
        struct timeval tv;
 
        no_flush++;
@@ -972,23 +1038,20 @@ 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)
                                maxfd = msg_fd_in;
-               }
-               if (fd != sock_f_out && iobuf_out_cnt && no_flush == 1) {
-                       FD_SET(sock_f_out, &w_fds);
-                       if (sock_f_out > maxfd)
-                               maxfd = sock_f_out;
-               }
+                       using_r_fds = 1;
+               } else
+                       using_r_fds = 0;
 
                tv.tv_sec = select_timeout;
                tv.tv_usec = 0;
 
                errno = 0;
-               count = select(maxfd + 1, msg_fd_in >= 0 ? &r_fds : NULL,
+               count = select(maxfd + 1, using_r_fds ? &r_fds : NULL,
                               &w_fds, NULL, &tv);
 
                if (count <= 0) {
@@ -998,17 +1061,11 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                        continue;
                }
 
-               if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds))
+               if (using_r_fds && 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)
@@ -1034,7 +1091,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                        /* If the other side is sending us error messages, try
                         * to grab any messages they sent before they died. */
                        while (fd == sock_f_out && io_multiplexing_in) {
-                               io_timeout = select_timeout = 30;
+                               set_io_timeout(30);
                                ignore_timeout = 0;
                                readfd_unbuffered(sock_f_in, io_filesfrom_buf,
                                                  sizeof io_filesfrom_buf);
@@ -1045,8 +1102,8 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                total += ret;
 
                if (fd == sock_f_out) {
-                       if (io_timeout)
-                               last_io = time(NULL);
+                       if (io_timeout || am_generator)
+                               last_io_out = time(NULL);
                        sleep_for_bwlimit(ret);
                }
        }
@@ -1066,6 +1123,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;
 
@@ -1077,6 +1141,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;
 }
 
 
@@ -1185,19 +1252,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