Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed one typo and improved another sentence.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
f26b48d
..
fdaa713
100644
(file)
--- 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 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_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 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 char *filesfrom_host;
extern struct stats stats;
+extern struct file_list *the_file_list;
const char phase_unknown[] = "unknown";
int select_timeout = SELECT_TIMEOUT;
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 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 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;
static time_t last_io;
static int no_flush;
@@
-111,7
+115,7
@@
struct flist_ndx_list {
struct flist_ndx_item *head, *tail;
};
struct flist_ndx_item *head, *tail;
};
-static struct flist_ndx_list redo_list;
+static struct flist_ndx_list redo_list
, hlink_list
;
struct msg_list {
struct msg_list *next;
struct msg_list {
struct msg_list *next;
@@
-284,7
+288,10
@@
static void read_msg_fd(void)
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, len);
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:
break;
case MSG_INFO:
case MSG_ERROR:
@@
-346,15
+353,24
@@
int msg_list_push(int flush_it_all)
return 1;
}
return 1;
}
-int get_redo_num(
void
)
+int get_redo_num(
int itemizing, enum logcode code
)
{
{
- while (!redo_list.head) {
+ while (1) {
+ if (hlink_list.head)
+ check_for_finished_hlinks(itemizing, code);
+ if (redo_list.head)
+ break;
read_msg_fd();
}
return flist_ndx_pop(&redo_list);
}
read_msg_fd();
}
return flist_ndx_pop(&redo_list);
}
+int get_hlink_num(void)
+{
+ return flist_ndx_pop(&hlink_list);
+}
+
/**
* When we're the receiver and we have a local --files-from list of names
* that needs to be sent over the socket to the sender, we have to do two
/**
* When we're the receiver and we have a local --files-from list of names
* that needs to be sent over the socket to the sender, we have to do two
@@
-558,7
+574,7
@@
static int read_timeout(int fd, char *buf, size_t len)
len -= n;
ret += n;
len -= n;
ret += n;
- if (
io_timeout && fd == sock_f_in
)
+ if (
fd == sock_f_in && (io_timeout || am_generator)
)
last_io = time(NULL);
}
last_io = time(NULL);
}
@@
-649,13
+665,20
@@
void io_end_buffering(void)
}
}
-void maybe_send_keepalive(int allowed_lull, int ndx)
+void maybe_flush_socket(void)
+{
+ if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io >= 5)
+ io_flush(NORMAL_FLUSH);
+}
+
+
+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 */
{
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)
write_shortint(sock_f_out, ITEM_IS_NEW);
}
if (iobuf_out)
@@
-690,7
+713,11
@@
static int readfd_unbuffered(int fd, char *buf, size_t len)
static size_t remaining;
static size_t iobuf_in_ndx;
int tag, ret = 0;
static size_t remaining;
static size_t iobuf_in_ndx;
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);
if (!iobuf_in || fd != sock_f_in)
return read_timeout(fd, buf, len);
@@
-744,8
+771,8
@@
static int readfd_unbuffered(int fd, char *buf, size_t len)
break;
case MSG_SUCCESS:
if (remaining != 4) {
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);
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, line, remaining);
@@
-756,8
+783,8
@@
static int readfd_unbuffered(int fd, char *buf, size_t len)
case MSG_ERROR:
if (remaining >= sizeof line) {
rprintf(FERROR,
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);
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, line, remaining);
@@
-765,8
+792,8
@@
static int readfd_unbuffered(int fd, char *buf, size_t len)
remaining = 0;
break;
default:
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);
}
}
exit_cleanup(RERR_STREAMIO);
}
}
@@
-872,7
+899,7
@@
int read_vstring(int f, char *buf, int bufsize)
if (len >= bufsize) {
rprintf(FERROR, "over-long vstring received (%d > %d)\n",
len, bufsize - 1);
if (len >= bufsize) {
rprintf(FERROR, "over-long vstring received (%d > %d)\n",
len, bufsize - 1);
-
exit_cleanup(RERR_PROTOCOL)
;
+
return -1
;
}
if (len)
}
if (len)
@@
-888,20
+915,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) {
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) {
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) {
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);
}
}
exit_cleanup(RERR_PROTOCOL);
}
}
@@
-990,7
+1017,7
@@
static void writefd_unbuffered(int fd,char *buf,size_t len)
{
size_t n, total = 0;
fd_set w_fds, r_fds;
{
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++;
struct timeval tv;
no_flush++;
@@
-1005,7
+1032,9
@@
static void writefd_unbuffered(int fd,char *buf,size_t len)
FD_SET(msg_fd_in,&r_fds);
if (msg_fd_in > maxfd)
maxfd = msg_fd_in;
FD_SET(msg_fd_in,&r_fds);
if (msg_fd_in > maxfd)
maxfd = msg_fd_in;
- }
+ using_r_fds = 1;
+ } else
+ using_r_fds = 0;
if (fd != sock_f_out && iobuf_out_cnt && no_flush == 1) {
FD_SET(sock_f_out, &w_fds);
if (sock_f_out > maxfd)
if (fd != sock_f_out && iobuf_out_cnt && no_flush == 1) {
FD_SET(sock_f_out, &w_fds);
if (sock_f_out > maxfd)
@@
-1016,7
+1045,7
@@
static void writefd_unbuffered(int fd,char *buf,size_t len)
tv.tv_usec = 0;
errno = 0;
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) {
&w_fds, NULL, &tv);
if (count <= 0) {
@@
-1026,17
+1055,11
@@
static void writefd_unbuffered(int fd,char *buf,size_t len)
continue;
}
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();
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;
continue;
- }
n = len - total;
if (bwlimit && n > bwlimit_writemax)
n = len - total;
if (bwlimit && n > bwlimit_writemax)
@@
-1073,7
+1096,7
@@
static void writefd_unbuffered(int fd,char *buf,size_t len)
total += ret;
if (fd == sock_f_out) {
total += ret;
if (fd == sock_f_out) {
- if (io_timeout)
+ if (io_timeout
|| am_generator
)
last_io = time(NULL);
sleep_for_bwlimit(ret);
}
last_io = time(NULL);
sleep_for_bwlimit(ret);
}