[LTP] [PATCH v2 1/2] syscalls/sched_getparam{01, 02}: Convert to new API and cleanup
Xiao Yang
yangx.jy@cn.fujitsu.com
Tue Jan 26 03:26:30 CET 2021
Also merge sched_getparam02 into sched_getparam01.
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
V1->V2:
Remove unused spaces & lines and use TST_EXP_PASS_SILENT.
runtest/syscalls | 1 -
.../kernel/syscalls/sched_getparam/.gitignore | 1 -
.../sched_getparam/sched_getparam01.c | 165 +++++------------
.../sched_getparam/sched_getparam02.c | 172 ------------------
4 files changed, 49 insertions(+), 290 deletions(-)
delete mode 100644 testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
diff --git a/runtest/syscalls b/runtest/syscalls
index 576eacf83..55391fd79 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1140,7 +1140,6 @@ sched_get_priority_min01 sched_get_priority_min01
sched_get_priority_min02 sched_get_priority_min02
sched_getparam01 sched_getparam01
-sched_getparam02 sched_getparam02
sched_getparam03 sched_getparam03
sched_rr_get_interval01 sched_rr_get_interval01
diff --git a/testcases/kernel/syscalls/sched_getparam/.gitignore b/testcases/kernel/syscalls/sched_getparam/.gitignore
index d1a7402e7..b7f9fd029 100644
--- a/testcases/kernel/syscalls/sched_getparam/.gitignore
+++ b/testcases/kernel/syscalls/sched_getparam/.gitignore
@@ -1,3 +1,2 @@
/sched_getparam01
-/sched_getparam02
/sched_getparam03
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
index 82e97713b..06a87ac64 100644
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
+++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
@@ -1,137 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
- *
- * 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.
- *
+ * * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
*/
-/**********************************************************
- *
- * TEST IDENTIFIER : sched_getparam01
- *
- * EXECUTED BY : anyone
- *
- * TEST TITLE : Basic test for sched_getparam(2)
- *
- * TEST CASE TOTAL : 1
- *
- * AUTHOR : Saji Kumar.V.R <saji.kumar@wipro.com>
- *
- * SIGNALS
- * Uses SIGUSR1 to pause before test if option set.
- * (See the parse_opts(3) man page).
- *
- * DESCRIPTION
- * This is a Phase I test for the sched_getparam(2) system call.
- * It is intended to provide a limited exposure of the system call.
- *
- * Setup:
- * Setup signal handling.
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper options are given.
- * Execute system call
- * Check return code, if system call failed (return=-1)
- * Log the errno and Issue a FAIL message.
- * Otherwise, Issue a PASS message.
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
+
+/*\
+ * [DESCRIPTION]
*
- * USAGE: <for command-line>
- * sched_getparam01 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-h] [-f] [-p]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -h : Show help screen
- * -f : Turn off functional testing
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -p : Pause for SIGUSR1 before starting
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
+ * Verify that:
*
- ****************************************************************/
+ * - sched_getparam(2) gets correct scheduling parameters for
+ * the specified process:
+ * - If pid is zero, sched_getparam(2) gets the scheduling parameters
+ * for the calling process.
+ * - If pid is not zero, sched_getparam(2) gets the scheduling
+ * parameters for the specified [pid] process.
+\*/
#include <errno.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
#include <sched.h>
-#include "test.h"
-
-static void setup();
-static void cleanup();
+#include "tst_test.h"
-char *TCID = "sched_getparam01";
-int TST_TOTAL = 1;
+static pid_t pids[2] = {0, 0};
-static struct sched_param param;
-
-int main(int ac, char **av)
+static void verify_sched_getparam(unsigned int n)
{
-
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- param.sched_priority = 100;
+ pid_t child_pid;
+ struct sched_param param = {
+ .sched_priority = 100,
+ };
+
+ child_pid = SAFE_FORK();
+ if (!child_pid) {
+ TST_EXP_PASS_SILENT(sched_getparam(pids[n], ¶m),
+ "sched_getparam(%d)", pids[n]);
+ if (!TST_PASS)
+ exit(1);
/*
- * Call sched_getparam(2) with pid=0 sothat it will
- * get the scheduling parameters for the calling process
+ * For normal process, scheduling policy is SCHED_OTHER.
+ * For this scheduling policy, only allowed priority value is 0.
*/
- TEST(sched_getparam(0, ¶m));
-
- /*
- * Check return code & priority. For normal process,
- * scheduling policy is SCHED_OTHER. For this scheduling
- * policy, only allowed priority value is 0. So we should
- * get 0 for priority value
- */
- if ((TEST_RETURN == 0) && (param.sched_priority == 0)) {
- tst_resm(TPASS, "sched_getparam() returned %ld",
- TEST_RETURN);
- } else {
- tst_resm(TFAIL, "Test Failed, sched_getparam()"
- "returned %ld, errno = %d : %s; returned "
- "process priority value is %d", TEST_RETURN,
- TEST_ERRNO, strerror(TEST_ERRNO),
- param.sched_priority);
+ if (param.sched_priority) {
+ tst_res(TFAIL,
+ "sched_getparam(%d) got wrong sched_priority %d, expected 0",
+ pids[n], param.sched_priority);
+ exit(1);
}
- }
- cleanup();
- tst_exit();
+ tst_res(TPASS, "sched_getparam(%d) got expected sched_priority 0", pids[n]);
+ exit(0);
+ }
+ tst_reap_children();
}
-/* setup() - performs all ONE TIME setup for this test */
-void setup(void)
+static void setup(void)
{
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
+ pids[1] = getpid();
}
-/*
- *cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+ .forks_child = 1,
+ .setup = setup,
+ .tcnt = ARRAY_SIZE(pids),
+ .test = verify_sched_getparam,
+};
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
deleted file mode 100644
index 1bbf686ae..000000000
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
- *
- * 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.
- *
- */
-/**********************************************************
- *
- * TEST IDENTIFIER : sched_getparam02
- *
- * EXECUTED BY : anyone
- *
- * TEST TITLE : Get scheduling parametes for parent process
- *
- * TEST CASE TOTAL : 1
- *
- * AUTHOR : Saji Kumar.V.R <saji.kumar@wipro.com>
- *
- * SIGNALS
- * Uses SIGUSR1 to pause before test if option set.
- * (See the parse_opts(3) man page).
- *
- * DESCRIPTION
- * Verifies functionality of sched_getparam() for a process other than
- * current process (ie, pid != 0). Here we get the scheduling parameters
- * for parent process.
- *
- * Setup:
- * Setup signal handling.
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper options are given.
- * fork a child
- *
- * CHILD:
- * Gets the scheduling parameters for parent process
- * If successfull,
- * TEST passed
- * else
- * TEST failed.
- *
- * PARENT:
- * wait for child to finish
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- *
- * USAGE: <for command-line>
- * sched_getparam02 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-h] [-f] [-p]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -h : Show help screen
- * -f : Turn off functional testing
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -p : Pause for SIGUSR1 before starting
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
- *
- ****************************************************************/
-
-#include <errno.h>
-#include <sched.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include "test.h"
-
-static void setup();
-static void cleanup();
-
-char *TCID = "sched_getparam02";
-int TST_TOTAL = 1;
-
-static struct sched_param param;
-
-int main(int ac, char **av)
-{
-
- int lc;
- int status;
- pid_t child_pid;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- switch (child_pid = FORK_OR_VFORK()) {
-
- case -1:
- /* fork() failed */
- tst_resm(TFAIL, "fork() failed");
- continue;
-
- case 0:
- /* Child */
- param.sched_priority = 100;
-
- /*
- * Call sched_getparam(2) with pid = getppid() sothat
- * it will get the scheduling parameters for parent
- * process
- */
- TEST(sched_getparam(getppid(), ¶m));
-
- /*
- * Check return code & priority. For normal process,
- * scheduling policy is SCHED_OTHER. For this
- * scheduling policy, only allowed priority value is 0.
- * So we should get 0 for priority value
- */
- if (TEST_RETURN == 0 && param.sched_priority == 0)
- exit(0);
- else {
- tst_resm(TWARN, "sched_getparam()"
- "returned %ld, errno = %d : %s;"
- " returned process priority value"
- " is %d", TEST_RETURN, TEST_ERRNO,
- strerror(TEST_ERRNO),
- param.sched_priority);
- exit(1);
- }
-
- default:
- /* Parent */
- if ((waitpid(child_pid, &status, 0)) < 0) {
- tst_resm(TFAIL, "wait() failed");
- continue;
- }
- if ((WIFEXITED(status)) && (WEXITSTATUS(status) == 0))
- tst_resm(TPASS, "Test Passed");
- else
- tst_resm(TFAIL, "Test Failed");
- }
-
- }
-
- cleanup();
- tst_exit();
-}
-
-/* setup() - performs all ONE TIME setup for this test */
-void setup(void)
-{
-
- tst_sig(FORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
-}
-
-/*
- *cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
-{
-}
--
2.25.1
More information about the ltp
mailing list