From 1155a0d1d6da810ccd0ef63b79c71b5497dd3dd6 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 17 Apr 2020 11:56:55 +0200 Subject: sys/linux: sync call timeouts with executor Timeouts in executor and sys/linux get out of sync. Sync them. --- executor/executor.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'executor/executor.cc') diff --git a/executor/executor.cc b/executor/executor.cc index 87f1eaeb6..64d84c394 100644 --- a/executor/executor.cc +++ b/executor/executor.cc @@ -711,7 +711,8 @@ retry: // We already have results from the previous execution. } else if (flag_threaded) { // Wait for call completion. - // Note: sys knows about this 25ms timeout when it generates timespec/timeval values. + // Note: sys/linux knows about this 45 ms timeout when it generates timespec/timeval values. + // Note: pkg/csource also knows about this 45 ms per-call timeout. uint64 timeout_ms = 45 + call->attrs.timeout; if (flag_debug && timeout_ms < 1000) timeout_ms = 1000; -- cgit mrf-deployment