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
+ Added mkdir_defmode().
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
b4c552b
..
b69ae00
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-339,8
+339,7
@@
static void read_msg_fd(void)
void increment_active_files(int ndx, int itemizing, enum logcode code)
{
/* TODO: tune these limits? */
void increment_active_files(int ndx, int itemizing, enum logcode code)
{
/* TODO: tune these limits? */
- while (active_filecnt >= 10
- && (active_bytecnt >= 128*1024 || active_filecnt >= 50)) {
+ while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) {
if (hlink_list.head)
check_for_finished_hlinks(itemizing, code);
read_msg_fd();
if (hlink_list.head)
check_for_finished_hlinks(itemizing, code);
read_msg_fd();
@@
-1012,7
+1011,7
@@
static void sleep_for_bwlimit(int bytes_written)
#define ONE_SEC 1000000L /* # of microseconds in a second */
#define ONE_SEC 1000000L /* # of microseconds in a second */
- if (!bwlimit)
+ if (!bwlimit
_writemax
)
return;
total_written += bytes_written;
return;
total_written += bytes_written;
@@
-1092,7
+1091,7
@@
static void writefd_unbuffered(int fd,char *buf,size_t len)
continue;
n = len - total;
continue;
n = len - total;
- if (bwlimit && n > bwlimit_writemax)
+ if (bwlimit
_writemax
&& n > bwlimit_writemax)
n = bwlimit_writemax;
cnt = write(fd, buf + total, n);
n = bwlimit_writemax;
cnt = write(fd, buf + total, n);