36 lines
886 B
Diff
36 lines
886 B
Diff
|
From 956ddff4f664d010d5997e87ffed415a205d0425 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Colin Ian King <colin.king@canonical.com>
|
||
|
|
Date: Wed, 20 May 2020 09:31:27 +0100
|
||
|
|
Subject: [PATCH 13/28] core-shim: add delay before re-waiting
|
||
|
|
|
||
|
|
Signed-off-by: Colin Ian King <colin.king@canonical.com>
|
||
|
|
---
|
||
|
|
core-shim.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/core-shim.c b/core-shim.c
|
||
|
|
index 62c00ec991ef..5e659f1ebf99 100644
|
||
|
|
--- a/core-shim.c
|
||
|
|
+++ b/core-shim.c
|
||
|
|
@@ -1185,14 +1185,15 @@ pid_t shim_waitpid(pid_t pid, int *wstatus, int options)
|
||
|
|
break;
|
||
|
|
|
||
|
|
/*
|
||
|
|
- * Retry if EINTR unless we've have 100
|
||
|
|
+ * Retry if EINTR unless we've have 2 mins
|
||
|
|
* consecutive EINTRs then give up.
|
||
|
|
*/
|
||
|
|
if (!keep_stressing_flag()) {
|
||
|
|
kill(pid, SIGALRM);
|
||
|
|
- if (count++ > 100)
|
||
|
|
+ if (count++ > 120)
|
||
|
|
kill(pid, SIGKILL);
|
||
|
|
}
|
||
|
|
+ sleep(1);
|
||
|
|
}
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.21.3
|
||
|
|
|