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

test: Make timeouts a little more robust & verbose.

This commit is contained in:
Petr Rockai 2013-08-05 21:11:49 +02:00
parent 9a1da7b262
commit c1217e6881

View File

@ -381,13 +381,14 @@ static void run(int i, char *f) {
FD_SET(fds[1], &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 > 120) // a 2 minute timeout time(NULL) - start > 5) // a 2 minute timeout
{ {
kill(-pid, SIGINT); system("echo t > /proc/sysrq-trigger");
kill(pid, SIGINT);
sleep(5); /* wait a bit for a reaction */ sleep(5); /* wait a bit for a reaction */
if ((w = waitpid(pid, &st, WNOHANG)) == 0) { if ((w = waitpid(pid, &st, WNOHANG)) == 0) {
kill(-pid, SIGKILL); kill(-pid, SIGKILL);
w = waitpid(pid, &st, NULL); w = pid; // waitpid(pid, &st, NULL);
} }
drain(); drain();
runaway = 1; runaway = 1;