Commit b4de848d authored by Wayne Davison's avatar Wayne Davison

Avoid a potential hang when --remove-*-files is active.

parent 89cb4721
...@@ -447,9 +447,14 @@ static void read_msg_fd(void) ...@@ -447,9 +447,14 @@ static void read_msg_fd(void)
* this, sender-side deletions were mostly happening at the end. */ * this, sender-side deletions were mostly happening at the end. */
void increment_active_files(int ndx, int itemizing, enum logcode code) void increment_active_files(int ndx, int itemizing, enum logcode code)
{ {
/* TODO: tune these limits? */ while (1) {
while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) { /* TODO: tune these limits? */
int limit = active_bytecnt >= 128*1024 ? 10 : 50;
if (active_filecnt < limit)
break;
check_for_finished_files(itemizing, code, 0); check_for_finished_files(itemizing, code, 0);
if (active_filecnt < limit)
break;
if (iobuf_out_cnt) if (iobuf_out_cnt)
io_flush(NORMAL_FLUSH); io_flush(NORMAL_FLUSH);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment