[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ltp-list
Subject:    Re: [LTP] [PATCH] pidns05.c: fix suspend due to call waitpid()
From:       Peng Haitao <penght () cn ! fujitsu ! com>
Date:       2011-03-23 5:46:22
Message-ID: 4D89892E.2020808 () cn ! fujitsu ! com
[Download RAW message or body]

Murlin Wenzel said the following on 2011-3-23 4:06:
> > > > diff --git a/testcases/kernel/containers/pidns/pidns05.c 
> > > > b/testcases/kernel/containers/pidns/pidns05.c
> > > > index 8a08dce..9ffc946 100644
> > > > --- a/testcases/kernel/containers/pidns/pidns05.c
> > > > +++ b/testcases/kernel/containers/pidns/pidns05.c
> > > > @@ -186,13 +186,8 @@ void kill_nested_containers()
> > > > 
> > > > 	/* Loops through the containers created to exit from sleep() */
> > > > 	for (i = 0; i < MAX_DEPTH; i++) {
> > > > -		if (waitpid(pids[i], &status, 0) == -1)
> > > > -			tst_resm(TFAIL|TERRNO, "waitpid(%d, ...) failed",
> > > > -			    pids[i]);
> > > > -		else {
> > > > -			kill(pids[i], SIGKILL);
> > > > -			waitpid(pids[i], &status, 0);
> > > > -		}
> > > > +		kill(pids[i], SIGKILL);
> > > > +		waitpid(pids[i], &status, 0);
> > > > 	}
> > > > }
> > > > 
> > > > @@ -222,7 +217,10 @@ int main(int argc, char *argv[])
> > > > 		if (waitpid(pid, &status, 0) == -1) {
> > > > 			perror("wait failed");
> > > > 		}
> > > > -		exit(status);
> > > > +		if (WIFEXITED(status))
> > > > +			exit(WEXITSTATUS(status));
> > > > +		else
> > > > +			exit(status);
> > > > 	}
> > > > 
> > > > 	/* To make all the containers share the same PGID as its parent */
> > > > @@ -255,4 +253,4 @@ int main(int argc, char *argv[])
> > > > 	cleanup();
> > > > 
> > > > 	tst_exit();
> > > > -}
> > > > \ No newline at end of file
> > > > +}
> > > 
> > > 
> > > I applied this patch to 20110228 release and the 'containers' test now runs 
> > without hanging.  There are several 'TBROK' and 'TFAIL' errors, but at least 
> > the test runs to completion now.
> > > 
> > 
> > When executing the case after applied this patch, the log is as following:
> > 
> > pidns05     0  TINFO  :   5 Nested Containers are created
> > pidns05     1  TPASS  :  The number of containers killed are 2
> > 
> > Would you share your test log?
> > 
> Attached is latest test log of containers test.  I think the only actual failure \
> now is a client test of some sort which is entirely possible since I doubt I have \
> everything configured for network testing. 

In your test log, the case pidns05 does not output 'TBROK' or 'TFAIL' errors。
This looks like the patch can work correctly:)

-- 
Best Regards,
Peng Haitao


------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software 
be a part of the solution? Download the Intel(R) Manageability Checker 
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list


[prev in list] [next in list] [prev in thread] [next in thread]