diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-11-21 13:01:22 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-11-23 18:09:23 +0300 |
| commit | c45cb2f3678e53a4bdcb434f4b7c47d85ca88895 (patch) | |
| tree | 3a795114893fdc11cc34eb16f4551f34c497d6eb | |
| parent | fcfcc12f5f00bc2f646f4fe4f02d5ffed4a683dc (diff) | |
Increase terminated process timeout from 1 to 2 sec before killing it on script pipeline termination
| -rw-r--r-- | libbuild2/script/run.cxx | 4 | ||||
| -rw-r--r-- | libbuild2/test/rule.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libbuild2/script/run.cxx b/libbuild2/script/run.cxx index ca4a935..3daa789 100644 --- a/libbuild2/script/run.cxx +++ b/libbuild2/script/run.cxx @@ -1584,7 +1584,7 @@ namespace build2 // Terminate the pipeline processes starting from the specified one and // up to the leftmost one and then kill those which didn't terminate - // after 1 second. + // after 2 seconds. // // After that wait for the pipeline builtins completion. Since their // standard streams should no longer be written to or read from by any @@ -1631,7 +1631,7 @@ namespace build2 // Wait a bit for the processes to terminate and kill the remaining // ones. // - timestamp dl (system_clock::now () + chrono::seconds (1)); + timestamp dl (system_clock::now () + chrono::seconds (2)); for (pipe_command* c (pc); c != nullptr; c = c->prev) { diff --git a/libbuild2/test/rule.cxx b/libbuild2/test/rule.cxx index df2d5ba..d720b25 100644 --- a/libbuild2/test/rule.cxx +++ b/libbuild2/test/rule.cxx @@ -693,8 +693,8 @@ namespace build2 // Terminate the pipeline processes starting from the specified one // and up to the leftmost one and then kill those which didn't - // terminate in 1 second. Issue diagnostics and fail if something goes - // wrong, but still try to terminate all processes. + // terminate in 2 seconds. Issue diagnostics and fail if something + // goes wrong, but still try to terminate all processes. // auto term_pipe = [&timed_wait] (pipe_process* pp) { @@ -720,7 +720,7 @@ namespace build2 // Wait a bit for the processes to terminate and kill the remaining // ones. // - timestamp deadline (system_clock::now () + chrono::seconds (1)); + timestamp deadline (system_clock::now () + chrono::seconds (2)); for (pipe_process* p (pp); p != nullptr; p = p->prev) { |