summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-01-29 14:19:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-29 17:26:46 (GMT)
commit72d63b2f45e46ab7dbcd0102f3922fd02f5e1573 (patch)
tree858f6d8ea06879cb9f56015b09a6f5a5f8735fea /compat
parent6c1f4ae65ad62f33c85884c723aa2c8a57207b85 (diff)
downloadgit-72d63b2f45e46ab7dbcd0102f3922fd02f5e1573.zip
git-72d63b2f45e46ab7dbcd0102f3922fd02f5e1573.tar.gz
git-72d63b2f45e46ab7dbcd0102f3922fd02f5e1573.tar.bz2
mingw: be more generous when wrapping up the setitimer() emulation
Every once in a while, the Azure Pipeline fails with some semi-random error: timer thread did not terminate timely This error message means that the thread that is used to emulate the setitimer() function did not terminate within 1,000 milliseconds. The most likely explanation (and therefore the one we should assume to be true, according to Occam's Razor) is that the timeout of one second is simply not enough because we try to run so many tasks in parallel. So let's give it ten seconds instead of only one. That should be enough. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index b459e1a..e0dfe88 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2100,7 +2100,7 @@ static void stop_timer_thread(void)
if (timer_event)
SetEvent(timer_event); /* tell thread to terminate */
if (timer_thread) {
- int rc = WaitForSingleObject(timer_thread, 1000);
+ int rc = WaitForSingleObject(timer_thread, 10000);
if (rc == WAIT_TIMEOUT)
error("timer thread did not terminate timely");
else if (rc != WAIT_OBJECT_0)