* [LTP] [PATCH] syscalls/fork03: Convert into new api
@ 2023-06-02 9:55 Yang Xu
2023-06-21 12:44 ` Petr Vorel
0 siblings, 1 reply; 3+ messages in thread
From: Yang Xu @ 2023-06-02 9:55 UTC (permalink / raw)
To: ltp
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
testcases/kernel/syscalls/fork/fork03.c | 146 +++++++-----------------
1 file changed, 44 insertions(+), 102 deletions(-)
diff --git a/testcases/kernel/syscalls/fork/fork03.c b/testcases/kernel/syscalls/fork/fork03.c
index 25b36c897..072f12797 100644
--- a/testcases/kernel/syscalls/fork/fork03.c
+++ b/testcases/kernel/syscalls/fork/fork03.c
@@ -1,119 +1,61 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
+ * Copyright (c) International Business Machines Corp., 2001
*
- * Copyright (c) International Business Machines Corp., 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * AUTHOR
+ * 07/2001 Ported by Wayne Boyer
*/
-/*
- * NAME
- * fork03.c
- *
- * DESCRIPTION
- * Check that child can use a large text space and do a large
- * number of operations.
- *
- * ALGORITHM
- * Fork one process, check for pid == 0 in child.
- * Check for pid > 0 in parent after wait.
- *
- * USAGE
- * fork03
+/*\
+ *[Description]
*
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * None
+ * Check that child process can use a large text space and do a large number
+ * of operations. In this situation, Check for pid == 0 in child and check
+ * for pid > 0 in parent after wait.
*/
#include <sys/types.h>
+#include <unistd.h>
#include <sys/wait.h>
-#include <stdio.h>
-#include "test.h"
-
-char *TCID = "fork03";
-int TST_TOTAL = 1;
-
-static void setup(void);
-static void cleanup(void);
+#include <stdlib.h>
+#include "tst_test.h"
-int main(int ac, char **av)
+static void verify_fork(void)
{
float fl1, fl2;
- int i;
- int pid1, pid2, status;
-
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
- pid1 = fork();
- if (pid1 == -1)
- tst_brkm(TBROK, cleanup, "fork() failed");
-
- if (pid1 == 0) {
- /* child uses some cpu cycles */
- for (i = 1; i < 32767; i++) {
- fl1 = 0.000001;
- fl1 = fl2 = 0.000001;
- fl1 = fl1 * 10.0;
- fl2 = fl1 / 1.232323;
- fl1 = fl2 - fl2;
- fl1 = fl2;
- }
-
- /* Pid must always be zero in child */
- if (pid1 != 0)
- exit(1);
- else
- exit(0);
- } else {
- tst_resm(TINFO, "process id in parent of child from "
- "fork : %d", pid1);
- pid2 = wait(&status); /* wait for child */
-
- if (pid1 != pid2) {
- tst_resm(TFAIL, "pids don't match : %d vs %d",
- pid1, pid2);
- continue;
- }
-
- if ((status >> 8) != 0) {
- tst_resm(TFAIL, "child exited with failure");
- continue;
- }
-
- tst_resm(TPASS, "test 1 PASSED");
+ int pid1, pid2, status, i;
+
+ pid1 = SAFE_FORK();
+ if (!pid1) {
+ /* child uses some cpu time slices */
+ for (i = 1; i < 32767; i++) {
+ fl1 = 0.000001;
+ fl1 = fl2 = 0.000001;
+ fl1 = fl1 * 10.0;
+ fl2 = fl1 / 1.232323;
+ fl1 = fl2 - fl2;
+ fl1 = fl2;
}
+ if (!pid1)
+ exit(0);
+ else
+ exit(1);
}
- cleanup();
- tst_exit();
-}
-
-static void setup(void)
-{
- tst_sig(FORK, DEF_HANDLER, cleanup);
- TEST_PAUSE;
+ tst_res(TINFO, "process id in parent of child from fork : %d", pid1);
+ pid2 = SAFE_WAIT(&status);
+ if (pid1 != pid2) {
+ tst_res(TFAIL, "pids don't match : %d vs %d", pid1, pid2);
+ return;
+ }
+ if ((status >> 8) != 0) {
+ tst_res(TFAIL, "child exited with failure");
+ return;
+ }
+ tst_res(TPASS, "test PASSED");
}
-static void cleanup(void)
-{
-}
+static struct tst_test test = {
+ .test_all = verify_fork,
+ .forks_child = 1,
+};
--
2.39.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [LTP] [PATCH] syscalls/fork03: Convert into new api
2023-06-02 9:55 [LTP] [PATCH] syscalls/fork03: Convert into new api Yang Xu
@ 2023-06-21 12:44 ` Petr Vorel
2023-06-25 14:48 ` Yang Xu (Fujitsu)
0 siblings, 1 reply; 3+ messages in thread
From: Petr Vorel @ 2023-06-21 12:44 UTC (permalink / raw)
To: Yang Xu; +Cc: ltp
Hi Xu,
...
> #include <sys/types.h>
nit: I don't think this is needed
> +#include <unistd.h>
> #include <sys/wait.h>
> -#include <stdio.h>
> -#include "test.h"
...
> +#include <stdlib.h>
> +#include "tst_test.h"
...
> + pid1 = SAFE_FORK();
> + if (!pid1) {
> + /* child uses some cpu time slices */
> + for (i = 1; i < 32767; i++) {
> + fl1 = 0.000001;
> + fl1 = fl2 = 0.000001;
> + fl1 = fl1 * 10.0;
> + fl2 = fl1 / 1.232323;
> + fl1 = fl2 - fl2;
> + fl1 = fl2;
> }
> + if (!pid1)
> + exit(0);
> + else
> + exit(1);
nit: maybe just
exit(!!pid1);
Reviewed-by: Petr Vorel <pvorel@suse.cz>
I suggest further tiny space cleanups.
You can download it or use diff below.
https://github.com/pevik/ltp/raw/4788c24a97c2f0885a2da3a8930f27d2f15f93d3/testcases/kernel/syscalls/fork/fork03.c
Kind regards,
Petr
diff --git testcases/kernel/syscalls/fork/fork03.c testcases/kernel/syscalls/fork/fork03.c
index 072f12797..9f04c113b 100644
--- testcases/kernel/syscalls/fork/fork03.c
+++ testcases/kernel/syscalls/fork/fork03.c
@@ -1,20 +1,18 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) International Business Machines Corp., 2001
- *
- * AUTHOR
- * 07/2001 Ported by Wayne Boyer
+ * Copyright (c) Linux Test Project, 2003-2023
+ * Author: 2001 Ported by Wayne Boyer
*/
/*\
*[Description]
*
* Check that child process can use a large text space and do a large number
- * of operations. In this situation, Check for pid == 0 in child and check
- * for pid > 0 in parent after wait.
+ * of operations. In this situation, check for PID == 0 in child and check
+ * for PID > 0 in parent after wait.
*/
-#include <sys/types.h>
#include <unistd.h>
#include <sys/wait.h>
#include <stdlib.h>
@@ -36,22 +34,23 @@ static void verify_fork(void)
fl1 = fl2 - fl2;
fl1 = fl2;
}
- if (!pid1)
- exit(0);
- else
- exit(1);
+
+ exit(!!pid1);
}
- tst_res(TINFO, "process id in parent of child from fork : %d", pid1);
+ tst_res(TINFO, "process id in parent of child from fork: %d", pid1);
pid2 = SAFE_WAIT(&status);
+
if (pid1 != pid2) {
- tst_res(TFAIL, "pids don't match : %d vs %d", pid1, pid2);
+ tst_res(TFAIL, "pids don't match: %d vs %d", pid1, pid2);
return;
}
+
if ((status >> 8) != 0) {
tst_res(TFAIL, "child exited with failure");
return;
}
+
tst_res(TPASS, "test PASSED");
}
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [LTP] [PATCH] syscalls/fork03: Convert into new api
2023-06-21 12:44 ` Petr Vorel
@ 2023-06-25 14:48 ` Yang Xu (Fujitsu)
0 siblings, 0 replies; 3+ messages in thread
From: Yang Xu (Fujitsu) @ 2023-06-25 14:48 UTC (permalink / raw)
To: Petr Vorel; +Cc: ltp
Hi Petr
> Hi Xu,
>
> ...
>> #include <sys/types.h>
> nit: I don't think this is needed
>
>> +#include <unistd.h>
>> #include <sys/wait.h>
>> -#include <stdio.h>
>> -#include "test.h"
> ...
>> +#include <stdlib.h>
>> +#include "tst_test.h"
>
> ...
>> + pid1 = SAFE_FORK();
>> + if (!pid1) {
>> + /* child uses some cpu time slices */
>> + for (i = 1; i < 32767; i++) {
>> + fl1 = 0.000001;
>> + fl1 = fl2 = 0.000001;
>> + fl1 = fl1 * 10.0;
>> + fl2 = fl1 / 1.232323;
>> + fl1 = fl2 - fl2;
>> + fl1 = fl2;
>> }
>> + if (!pid1)
>> + exit(0);
>> + else
>> + exit(1);
> nit: maybe just
> exit(!!pid1);
>
> Reviewed-by: Petr Vorel <pvorel@suse.cz>
>
> I suggest further tiny space cleanups.
Yes, merge with tiny space cleanups.
Best Regards
Yang Xu
>
> You can download it or use diff below.
> https://github.com/pevik/ltp/raw/4788c24a97c2f0885a2da3a8930f27d2f15f93d3/testcases/kernel/syscalls/fork/fork03.c
>
> Kind regards,
> Petr
>
> diff --git testcases/kernel/syscalls/fork/fork03.c testcases/kernel/syscalls/fork/fork03.c
> index 072f12797..9f04c113b 100644
> --- testcases/kernel/syscalls/fork/fork03.c
> +++ testcases/kernel/syscalls/fork/fork03.c
> @@ -1,20 +1,18 @@
> // SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * Copyright (c) International Business Machines Corp., 2001
> - *
> - * AUTHOR
> - * 07/2001 Ported by Wayne Boyer
> + * Copyright (c) Linux Test Project, 2003-2023
> + * Author: 2001 Ported by Wayne Boyer
> */
>
> /*\
> *[Description]
> *
> * Check that child process can use a large text space and do a large number
> - * of operations. In this situation, Check for pid == 0 in child and check
> - * for pid > 0 in parent after wait.
> + * of operations. In this situation, check for PID == 0 in child and check
> + * for PID > 0 in parent after wait.
> */
>
> -#include <sys/types.h>
> #include <unistd.h>
> #include <sys/wait.h>
> #include <stdlib.h>
> @@ -36,22 +34,23 @@ static void verify_fork(void)
> fl1 = fl2 - fl2;
> fl1 = fl2;
> }
> - if (!pid1)
> - exit(0);
> - else
> - exit(1);
> +
> + exit(!!pid1);
> }
>
> - tst_res(TINFO, "process id in parent of child from fork : %d", pid1);
> + tst_res(TINFO, "process id in parent of child from fork: %d", pid1);
> pid2 = SAFE_WAIT(&status);
> +
> if (pid1 != pid2) {
> - tst_res(TFAIL, "pids don't match : %d vs %d", pid1, pid2);
> + tst_res(TFAIL, "pids don't match: %d vs %d", pid1, pid2);
> return;
> }
> +
> if ((status >> 8) != 0) {
> tst_res(TFAIL, "child exited with failure");
> return;
> }
> +
> tst_res(TPASS, "test PASSED");
> }
>
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-25 14:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-02 9:55 [LTP] [PATCH] syscalls/fork03: Convert into new api Yang Xu
2023-06-21 12:44 ` Petr Vorel
2023-06-25 14:48 ` Yang Xu (Fujitsu)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).