linuxmsm/cdba
0
0
Fork 0
mirror of https://github.com/linux-msm/cdba.git synced 2026-02-25 13:11:56 -08:00
Code Issues Packages Projects Releases Wiki Activity

cdba: Support inactivity timeout

Browse Source 
In addition to have a fixed timeout (-t) introduce a new inactivity
timeout (-T) which allow us to provide a shorter timeout to quickly
abort when the kernel fails to boot but still allow us to run lengthy
test scripts without getting a timeout.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson
2018-11-30 11:32:34 -08:00
parent 1e92a38df1
commit eacf76b7b9
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cdba.c
View File

@@ -459,12 +459,15 @@ static void usage(void)
{
extern const char *__progname;
fprintf(stderr, "usage: %s -b <board> -h <host> boot.img\n", __progname);
fprintf(stderr, "usage: %s -b <board> -h <host> [-t <timeout>] "
"[-T <inactivity-timeout>] boot.img\n",
__progname);
exit(1);
}
int main(int argc, char **argv)
{
bool timeout_on_inactivity = false;
struct termios *orig_tios;
struct work *next;
struct work *work;
@@ -484,7 +487,7 @@ int main(int argc, char **argv)
int opt;
int ret;
while ((opt = getopt(argc, argv, "b:c:h:t:")) != -1) {
while ((opt = getopt(argc, argv, "b:c:h:t:T:")) != -1) {
switch (opt) {
case 'b':
board = optarg;
@@ -498,6 +501,10 @@ int main(int argc, char **argv)
case 't':
timeout = atoi(optarg);
break;
case 'T':
timeout = atoi(optarg);
timeout_on_inactivity = true;
break;
default:
usage();
}
@@ -568,7 +575,11 @@ int main(int argc, char **argv)
if (ret < 0) {
err(1, "select");
} else if (ret == 0) {
warnx("timeout reached");
if (timeout_on_inactivity)
warnx("timeout due to inactivity");
else
warnx("timeout reached");
reached_timeout = true;
}
@@ -605,6 +616,12 @@ int main(int argc, char **argv)
n = handle_message(&recv_buf);
if (n < 0)
break;
/* Reset inactivity timeout on activity */
if (timeout_on_inactivity) {
tv.tv_sec = timeout;
tv.tv_usec = 0;
}
}
if (FD_ISSET(ssh_fds[0], &wfds)) {