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
I think I've (finally) fixed the problem with rsync periodically
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
40ccc73
..
51fc0cb
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-28,6
+28,7
@@
static int total_written = 0;
static int total_read = 0;
extern int verbose;
static int total_read = 0;
extern int verbose;
+extern int sparse_files;
int write_total(void)
{
int write_total(void)
{
@@
-61,6
+62,8
@@
static void read_check(int f)
{
int n;
{
int n;
+ if (f == -1) return;
+
if (read_buffer_len == 0) {
read_buffer_p = read_buffer;
}
if (read_buffer_len == 0) {
read_buffer_p = read_buffer;
}
@@
-68,6
+71,9
@@
static void read_check(int f)
if ((n=num_waiting(f)) <= 0)
return;
if ((n=num_waiting(f)) <= 0)
return;
+ /* things could deteriorate if we read in really small chunks */
+ if (n < 10) n = 1024;
+
if (read_buffer_p != read_buffer) {
memmove(read_buffer,read_buffer_p,read_buffer_len);
read_buffer_p = read_buffer;
if (read_buffer_p != read_buffer) {
memmove(read_buffer,read_buffer_p,read_buffer_len);
read_buffer_p = read_buffer;
@@
-94,10
+100,13
@@
static int readfd(int fd,char *buffer,int N)
{
int ret;
int total=0;
{
int ret;
int total=0;
+
+ if (read_buffer_len < N)
+ read_check(buffer_f_in);
while (total < N)
{
while (total < N)
{
- if (read_buffer_len > 0) {
+ if (read_buffer_len > 0
&& buffer_f_in == fd
) {
ret = MIN(read_buffer_len,N-total);
memcpy(buffer+total,read_buffer_p,ret);
read_buffer_p += ret;
ret = MIN(read_buffer_len,N-total);
memcpy(buffer+total,read_buffer_p,ret);
read_buffer_p += ret;
@@
-128,9
+137,9
@@
int read_int(int f)
char b[4];
if ((ret=readfd(f,b,4)) != 4) {
if (verbose > 1)
char b[4];
if ((ret=readfd(f,b,4)) != 4) {
if (verbose > 1)
- fprintf(
stderr,"
Error reading %d bytes : %s\n",
- 4,ret==-1?strerror(errno):"EOF");
- exit(1);
+ fprintf(
FERROR,"(%d)
Error reading %d bytes : %s\n",
+
getpid(),
4,ret==-1?strerror(errno):"EOF");
+ exit
_cleanup
(1);
}
total_read += 4;
return IVAL(b,0);
}
total_read += 4;
return IVAL(b,0);
@@
-141,18
+150,18
@@
void read_buf(int f,char *buf,int len)
int ret;
if ((ret=readfd(f,buf,len)) != len) {
if (verbose > 1)
int ret;
if ((ret=readfd(f,buf,len)) != len) {
if (verbose > 1)
- fprintf(
stderr,"
Error reading %d bytes : %s\n",
- len,ret==-1?strerror(errno):"EOF");
- exit(1);
+ fprintf(
FERROR,"(%d)
Error reading %d bytes : %s\n",
+
getpid(),
len,ret==-1?strerror(errno):"EOF");
+ exit
_cleanup
(1);
}
total_read += len;
}
unsigned char read_byte(int f)
{
}
total_read += len;
}
unsigned char read_byte(int f)
{
- char c;
- read_buf(f,&c,1);
- return
(unsigned char)
c;
+
unsigned
char c;
+ read_buf(f,
(char *)
&c,1);
+ return c;
}
}
@@
-161,42
+170,51
@@
static int last_sparse = 0;
int sparse_end(int f)
{
int sparse_end(int f)
{
-#if SPARSE_FILES
if (last_sparse) {
lseek(f,-1,SEEK_CUR);
return (write(f,&last_byte,1) == 1 ? 0 : -1);
}
if (last_sparse) {
lseek(f,-1,SEEK_CUR);
return (write(f,&last_byte,1) == 1 ? 0 : -1);
}
-#endif
+ last_sparse = 0;
return 0;
}
int write_sparse(int f,char *buf,int len)
{
return 0;
}
int write_sparse(int f,char *buf,int len)
{
- int l=0;
+ int l1=0,l2=0;
+ int ret;
-#if SPARSE_FILES
-
for (l=0;l<len && buf[l]==0;l++)
;
+ if (!sparse_files)
+
return write(f,buf,len)
;
- if (l > 0)
-
lseek(f,l,SEEK_CUR)
;
+ for (l1=0;l1<len && buf[l1]==0;l1++) ;
+
for (l2=0;l2<(len-l1) && buf[len-(l2+1)]==0;l2++)
;
last_byte = buf[len-1];
last_byte = buf[len-1];
-#endif
- if (l == len) {
- last_sparse = 1;
+ if (l1 == len || l2 > 0)
+ last_sparse=1;
+
+ if (l1 > 0)
+ lseek(f,l1,SEEK_CUR);
+
+ if (l1 == len)
return len;
return len;
- }
- last_sparse = 0;
+ if ((ret=write(f,buf+l1,len-(l1+l2))) != len-(l1+l2)) {
+ if (ret == -1 || ret == 0) return ret;
+ return (l1+ret);
+ }
- return (l + write(f,buf+l,len-l));
+ if (l2 > 0)
+ lseek(f,l2,SEEK_CUR);
+
+ return len;
}
int read_write(int fd_in,int fd_out,int size)
{
static char *buf=NULL;
}
int read_write(int fd_in,int fd_out,int size)
{
static char *buf=NULL;
-
static int bufsize = WRITE_BLOCK
_SIZE;
+
int bufsize = sparse_files?SPARSE_WRITE_SIZE:WRITE
_SIZE;
int total=0;
if (!buf) {
int total=0;
if (!buf) {
@@
-218,7
+236,8
@@
int read_write(int fd_in,int fd_out,int size)
static int writefd(int fd,char *buf,int len)
{
int total = 0;
static int writefd(int fd,char *buf,int len)
{
int total = 0;
- fd_set fds;
+ fd_set w_fds, r_fds;
+ int fd_count;
struct timeval tv;
if (buffer_f_in == -1)
struct timeval tv;
if (buffer_f_in == -1)
@@
-235,11
+254,18
@@
static int writefd(int fd,char *buf,int len)
if (ret == -1) {
read_check(buffer_f_in);
if (ret == -1) {
read_check(buffer_f_in);
- FD_ZERO(&fds);
- FD_SET(fd,&fds);
+ fd_count = fd+1;
+ FD_ZERO(&w_fds);
+ FD_ZERO(&r_fds);
+ FD_SET(fd,&w_fds);
+ if (buffer_f_in != -1) {
+ FD_SET(buffer_f_in,&r_fds);
+ if (buffer_f_in > fd)
+ fd_count = buffer_f_in+1;
+ }
tv.tv_sec = BLOCKING_TIMEOUT;
tv.tv_usec = 0;
tv.tv_sec = BLOCKING_TIMEOUT;
tv.tv_usec = 0;
- select(fd
+1,NULL,&
fds,NULL,&tv);
+ select(fd
_count,buffer_f_in == -1? NULL: &r_fds,&w_
fds,NULL,&tv);
} else {
total += ret;
}
} else {
total += ret;
}
@@
-256,9
+282,9
@@
void write_int(int f,int x)
char b[4];
SIVAL(b,0,x);
if ((ret=writefd(f,b,4)) != 4) {
char b[4];
SIVAL(b,0,x);
if ((ret=writefd(f,b,4)) != 4) {
- fprintf(
stderr
,"write_int failed : %s\n",
+ fprintf(
FERROR
,"write_int failed : %s\n",
ret==-1?strerror(errno):"EOF");
ret==-1?strerror(errno):"EOF");
- exit(1);
+ exit
_cleanup
(1);
}
total_written += 4;
}
}
total_written += 4;
}
@@
-267,9
+293,9
@@
void write_buf(int f,char *buf,int len)
{
int ret;
if ((ret=writefd(f,buf,len)) != len) {
{
int ret;
if ((ret=writefd(f,buf,len)) != len) {
- fprintf(
stderr
,"write_buf failed : %s\n",
+ fprintf(
FERROR
,"write_buf failed : %s\n",
ret==-1?strerror(errno):"EOF");
ret==-1?strerror(errno):"EOF");
- exit(1);
+ exit
_cleanup
(1);
}
total_written += len;
}
}
total_written += len;
}