shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

test: timeout when no write happens since last written line

Browse Source 
Change current test abort after 3 minutes, to abort after 3 minutes
without written output line.
This commit is contained in:
Zdenek Kabelac 2013-09-09 12:14:00 +02:00
parent f5832d8c49
commit ac2de55d69
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/lib/harness.c
View File

@ -365,8 +365,9 @@ static void run(int i, char *f) {
char outpath[PATH_MAX]; char outpath[PATH_MAX];
char *c = outpath + strlen(results) + 1; char *c = outpath + strlen(results) + 1;
struct timeval selectwait; struct timeval selectwait;
fd_set master_set, copy_set; fd_set set;
int runaway = 0; int runaway = 0;
int no_write = 0;
snprintf(buf, sizeof(buf), "%s ...", f); snprintf(buf, sizeof(buf), "%s ...", f);
printf("Running %-60s ", buf); printf("Running %-60s ", buf);
@ -377,11 +378,9 @@ static void run(int i, char *f) {
if (!(outfile = fopen(outpath, "w"))) if (!(outfile = fopen(outpath, "w")))
perror("fopen"); perror("fopen");
FD_ZERO(&master_set);
FD_SET(fds[1], &master_set);
while ((w = wait4(pid, &st, WNOHANG, &usage)) == 0) { while ((w = wait4(pid, &st, WNOHANG, &usage)) == 0) {
if ((fullbuffer && fullbuffer++ == 8000) || if ((fullbuffer && fullbuffer++ == 8000) ||
time(NULL) - start > 180) // a 3 minute timeout (no_write > 180 * 2)) /* a 3 minute timeout */
{ {
system("echo t > /proc/sysrq-trigger"); system("echo t > /proc/sysrq-trigger");
kill(pid, SIGINT); kill(pid, SIGINT);
@ -394,12 +393,16 @@ static void run(int i, char *f) {
break; break;
} }
memcpy(&copy_set, &master_set, sizeof(master_set)); FD_ZERO(&set);
FD_SET(fds[1], &set);
selectwait.tv_sec = 0; selectwait.tv_sec = 0;
selectwait.tv_usec = 500000; selectwait.tv_usec = 500000; /* timeout 0.5s */
if (select(fds[1] + 1, &copy_set, NULL, NULL, &selectwait) <= 0) if (select(fds[1] + 1, &set, NULL, NULL, &selectwait) <= 0) {
no_write++;
continue; continue;
}
drain(); drain();
no_write = 0;
} }
if (w != pid) { if (w != pid) {
perror("waitpid"); perror("waitpid");