From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t 1/3] runner/executor: Make sure that intervals_left is always initialized
Date: Thu, 20 Jun 2019 15:29:00 +0300 [thread overview]
Message-ID: <20190620122902.20761-1-arkadiusz.hiler@intel.com> (raw)
intervals_left got initialized only when when we had a timeout exceeding
watchdog capabilities, meaning we had to use multiple shorter intervals
by moving intervals_left = timeout_intervals down we are always
initializing it
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
runner/executor.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/runner/executor.c b/runner/executor.c
index 7e5fbe8f..bce4d420 100644
--- a/runner/executor.c
+++ b/runner/executor.c
@@ -493,7 +493,6 @@ static int monitor_output(pid_t child,
if (wd_timeout - wd_extra < 0)
wd_extra = wd_timeout / 2;
timeout_intervals = timeout / (wd_timeout - wd_extra);
- intervals_left = timeout_intervals;
timeout /= timeout_intervals;
if (settings->log_level >= LOG_LEVEL_VERBOSE) {
@@ -504,6 +503,8 @@ static int monitor_output(pid_t child,
}
}
+ intervals_left = timeout_intervals;
+
while (outfd >= 0 || errfd >= 0 || sigfd >= 0) {
struct timeval tv = { .tv_sec = timeout };
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next reply other threads:[~2019-06-20 12:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 12:29 Arkadiusz Hiler [this message]
2019-06-20 12:29 ` [igt-dev] [PATCH i-g-t 2/3] runner/resultgen: Don't pass NULL to str*() functions Arkadiusz Hiler
2019-06-20 12:33 ` Petri Latvala
2019-06-20 12:29 ` [igt-dev] [PATCH i-g-t 3/3] runner/settings: Be consistent with empty blacklist Arkadiusz Hiler
2019-06-20 12:34 ` Petri Latvala
2019-06-20 12:33 ` [igt-dev] [PATCH i-g-t 1/3] runner/executor: Make sure that intervals_left is always initialized Petri Latvala
2019-06-20 16:50 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/3] " Patchwork
2019-06-20 19:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190620122902.20761-1-arkadiusz.hiler@intel.com \
--to=arkadiusz.hiler@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=petri.latvala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.