syscalls/clone03: Convert to new API
PATCH 3/7 syscalls/clone03: Convert to new API
Signed-off-by zhanglianjie <[email protected]>
testcases/kernel/syscalls/clone/clone03.c +40 -119
@@ -1,147 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved. * Copyright (c) 2012 Wanlong Gao <[email protected]> -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it would be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -* */ -/* + +/*\ +* [Description] * Check for equality of pid of child & return value of clone(2) -* Test: -* Open a pipe. -* Loop if the proper options are given. -* Call clone(2) called without SIGCHLD -* -* CHILD: -* writes the pid to pipe -* PARENT: -* reads child'd pid from pipe -* if child's pid == return value from clone(2) -* Test passed -* else -* test failed */ - -#if definedUCLINUX && !__THROW -/* workaround for libc bug */ -#define __THROW -#endif - -#include <errno.h> -#include <sched.h> -#include <sys/wait.h> -#include "test.h" - +#include <stdio.h> +#include <stdlib.h> +#include "tst_test.h" #include "clone_platform.h" -static void setup (void ); -static void cleanup (void ); -static int child_fn (); -static int pfd[2 ]; +static void *child_stack; -char *TCID ="clone03" ; -int TST_TOTAL =1 ; - -int main (int ac,char **av) +static int child_fn(void *arg LTP_ATTRIBUTE_UNUSED) { +char pid[10 ]; + +sprintf (pid,"%d" ,getpid ()); -int lc; -void *child_stack; -char buff[10 ]; -int child_pid, status; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -/* Allocate stack for child */ - child_stack =malloc (CHILD_STACK_SIZE ); -if (child_stack ==NULL ) -tst_brkm (TBROK , cleanup,"Cannot allocate stack for child" ); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - tst_count =0 ; - -if ((pipe (pfd)) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup,"pipe failed" ); - -TEST (ltp_clone (SIGCHLD , child_fn,NULL ,CHILD_STACK_SIZE , - child_stack)); - -if (TEST_RETURN ==-1 ) -tst_brkm (TFAIL |TTERRNO , cleanup,"clone() failed" ); - -/* close write end from parent */ -if ((close (pfd[1 ])) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup, -"close(pfd[1]) failed" ); - -/* Read pid from read end */ -if ((read (pfd[0 ], buff,sizeof (buff))) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup, -"read from pipe failed" ); +SAFE_CLOSE (pfd[0 ]); +SAFE_WRITE (1 , pfd[1 ], pid,sizeof (pid)); +SAFE_CLOSE (pfd[1 ]); -/* Close read end from parent */ -if ((close (pfd[0 ])) ==-1 ) -tst_resm (TWARN |TERRNO ,"close(pfd[0]) failed" ); +exit (0 ); +} -/* Get child's pid from pid string */ - child_pid =atoi (buff); +static void verify_clone (void ) +{ +char buff[10 ]; +int child_pid; -if (TEST_RETURN == child_pid) -tst_resm (TPASS ,"Test passed" ); -else -tst_resm (TFAIL ,"Test failed" ); +TST_EXP_POSITIVE (ltp_clone (SIGCHLD , child_fn,NULL ,CHILD_STACK_SIZE , + child_stack)); -if ((wait (&status)) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup, -"wait failed, status: %d" , status); - } +if (!TST_PASS ) +return ; + +tst_reap_children (); -free (child_stack); +SAFE_CLOSE (pfd[1 ]); +SAFE_READ (1 , pfd[0 ], buff,sizeof (buff)); +SAFE_CLOSE (pfd[0 ]); + child_pid =atoi (buff); -cleanup (); -tst_exit (); +TST_EXP_PASS (!(TST_RET == child_pid),"pid(%d)" , child_pid); }static void setup (void ) { -tst_sig (FORK ,DEF_HANDLER , cleanup); -TEST_PAUSE ; + child_stack =SAFE_MALLOC (CHILD_STACK_SIZE ); +SAFE_PIPE (pfd); }static void cleanup (void ) { +free (child_stack); } -static int child_fn (void ) -{ -char pid[10 ]; - -/* Close read end from child */ -if ((close (pfd[0 ])) ==-1 ) -perror ("close(pfd[0]) failed" ); - -sprintf (pid,"%d" ,getpid ()); - -/* Write pid string to pipe */ -if ((write (pfd[1 ], pid,sizeof (pid))) ==-1 ) -perror ("write to pipe failed" ); - -/* Close write end of pipe from child */ -if ((close (pfd[1 ])) ==-1 ) -perror ("close(pfd[1]) failed" ); - -exit (1 ); -} +static struct tst_test test = { + .setup = setup, + .test_all = verify_clone, + .cleanup = cleanup, +};
--
2.20.1
PATCH 3/7 syscalls/clone03: Convert to new API
Hi!
testcases/kernel/syscalls/clone/clone03.c line 56
Quoted 6 lines
static void setup(void)
{testcases/kernel/syscalls/clone/clone03.c +2
-2-tst_sig (FORK ,DEF_HANDLER , cleanup); -TEST_PAUSE ; + child_stack =SAFE_MALLOC (CHILD_STACK_SIZE ); +SAFE_PIPE (pfd);
I guess that it would be probably easier to mmap() a piece of shared anonymous memory and used that instead of the pipe().
See for example setrlimit06.c
Signature · 2 lines
Cyril Hrubis [email protected]