aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-26 12:27:19 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-26 12:27:19 +0200
commit4c4f3160258e799c65dccc80c00bb7ef16daac01 (patch)
tree1ef1f4480064b8b4fdbea20adeae584db9971b69
parent796a0fd12c7950ca7574095cce5aa2a0adc57deb (diff)
Improve MSYS2 BLODA code
-rw-r--r--libbutl/process.cxx25
1 files changed, 20 insertions, 5 deletions
diff --git a/libbutl/process.cxx b/libbutl/process.cxx
index d78b64f..53a333f 100644
--- a/libbutl/process.cxx
+++ b/libbutl/process.cxx
@@ -1280,7 +1280,7 @@ namespace butl
msys = i->second;
}
- for (size_t ret (0); ret != 40; ++ret)
+ for (DWORD timeout (10000); timeout != 0; ) // Try for about 10s.
{
if (!CreateProcess (
batch != nullptr ? batch : pp.effect_string (),
@@ -1297,16 +1297,31 @@ namespace butl
auto_handle (pi.hThread).reset (); // Close.
+ // @@ Should we unlock and re-lock the mutex? To be able to do that we
+ // will have to revert handles to non-inheritable and, in case of
+ // retry, back to inheritable. Still might be worth the pain.
+
if (msys)
{
// Wait a bit and check if the process has terminated. If it is
// still running then we assume all is good. Otherwise, retry if
// this is the DLL initialization error.
//
- DWORD s;
- if (WaitForSingleObject (pi.hProcess, 250) == WAIT_OBJECT_0 &&
- GetExitCodeProcess (pi.hProcess, &s) &&
- s == STATUS_DLL_INIT_FAILED)
+ DWORD r;
+
+ // Wait in small increments to get (approximate) time elapsed.
+ //
+ for (size_t i (0); i != 4; ++i, timeout -= 50) // 4 * 50 = 200ms.
+ {
+ r = WaitForSingleObject (pi.hProcess, 50);
+
+ if (r != WAIT_TIMEOUT)
+ break;
+ }
+
+ if (r == WAIT_OBJECT_0 &&
+ GetExitCodeProcess (pi.hProcess, &r) &&
+ r == STATUS_DLL_INIT_FAILED)
continue;
}