syscalls/sched_get_priority_max01: Convert to new
PATCH v2 1/2 syscalls/sched_get_priority_max01: Convert to new
--- .../sched_get_priority_max01.c | 143 +++--------------- 1 file changed, 22 insertions(+), 121 deletions(-)
testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c +22 -121
@@ -1,142 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * 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_get_priority_max01 -* -* EXECUTED BY : anyone -* -* TEST TITLE : Basic test for sched_get_priority_max(2) -* -* TEST CASE TOTAL : 3 -* -* AUTHOR : Saji Kumar.V.R <[email protected]> -* -* SIGNALS -* Uses SIGUSR1 to pause before test if option set. -* (See the parse_opts(3) man page). + +/*\ +* [Description] * -* DESCRIPTION * This is a Phase I test for the sched_get_priority_max(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 -* -* USAGE: <for command-line> -* sched_get_priority_max01 [-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. -* -****************************************************************/ +* Obtain different maximum priority scheduling strategies and compare +* them with the expected value. +*/ #include <errno.h> #include <sched.h> -#include "test.h" - -static void setup (); -static void cleanup (); - -char *TCID ="sched_get_priority_max01" ; +#include "lapi/syscalls.h" +#include "tst_test.h" -static struct test_case_t { +static struct test_case {char *desc;int policy;int retval; -} test_cases[] = { - { -"Test for SCHED_OTHER" ,SCHED_OTHER ,0 }, { -"Test for SCHED_FIFO" ,SCHED_FIFO ,99 }, { -"Test for SCHED_RR" ,SCHED_RR ,99 } +} tcases[] = { + {"SCHED_OTHER" ,SCHED_OTHER ,0 }, + {"SCHED_FIFO" ,SCHED_FIFO ,99 }, + {"SCHED_RR" ,SCHED_RR ,99 } }; -int TST_TOTAL =sizeof (test_cases) /sizeof (test_cases[0 ]); - -int main (int ac,char **av) +static void run_test (unsigned int nr) { -int lc, ind; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; +struct test_case *tc = &tcases[nr]; -for (ind =0 ; ind <TST_TOTAL ; ind++) { -/* -* Call sched_get_priority_max(2) -*/ -TEST (sched_get_priority_max (test_cases[ind].policy)); - -if (TEST_RETURN == test_cases[ind].retval) { -tst_resm (TPASS ,"%s Passed" , - test_cases[ind].desc); - }else { -tst_resm (TFAIL |TTERRNO ,"%s Failed, " -"sched_get_priority_max() returned %ld" , - test_cases[ind].desc,TEST_RETURN ); - } - } - } - -/* cleanup and exit */ -cleanup (); - -tst_exit (); +TST_EXP_VAL (tst_syscall (__NR_sched_get_priority_max, tc->policy), + tc->retval,"test for %s" , tc->desc); } -/* setup() - performs all ONE TIME setup for this test */ -void setup (void ) -{ - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -} - -/* -*cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -*/ -void cleanup (void ) -{ +static struct tst_test test = { + .tcnt =ARRAY_SIZE (tcases), + .test = run_test, +}; -}
--
2.20.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi sujiaxun,
Review line 3
Quoted 5 lines
+++
b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c(quoted diff) +1
-0@@ -1,142 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
FYI You could add your or LTP copyright. Which one you prefer?
Review line 7
Quoted 5 lines
(quoted diff) +2
-1+/*\ + * [Description] * - * DESCRIPTION * This is a Phase I test for the sched_get_priority_max(2) system call.
I suggest to change it to
+ * Basic test for the sched_get_priority_max(2) system call.
+ * Obtain different maximum priority scheduling strategies and compare
+ * them with the expected value.
FYI metadata are:
https://github.com/linux-test-project/ltp/releases/download/20210121/metadata.20210121.html
https://github.com/linux-test-project/ltp/releases/download/20210121/metadata.20210121.pdf
You can run make in metadata/ if you're curious what output you do with [Description]. The output will be in docparse/metadata.html and/or docparse/metadata.pdf.
Quoted 50 lines
(quoted diff) +6
-37- * 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 - * - * USAGE: <for command-line> - * sched_get_priority_max01 [-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. - * - ****************************************************************/ + * Obtain different maximum priority scheduling strategies and compare + * them with the expected value. + */ #include <errno.h> #include <sched.h> -#include "test.h" - -static void setup(); -static void cleanup(); - -char *TCID = "sched_get_priority_max01"; +#include "lapi/syscalls.h" +#include "tst_test.h" -static struct test_case_t { +static struct test_case { char *desc; int policy; int retval;
Review line 25
Quoted 10 lines
(quoted diff) +4
-5-} test_cases[] = { - { - "Test for SCHED_OTHER", SCHED_OTHER, 0}, { - "Test for SCHED_FIFO", SCHED_FIFO, 99}, { - "Test for SCHED_RR", SCHED_RR, 99} +} tcases[] = { + {"SCHED_OTHER", SCHED_OTHER, 0}, + {"SCHED_FIFO", SCHED_FIFO, 99}, + {"SCHED_RR", SCHED_RR, 99} };
FYI if string is the same as constant, you can use macro:
#define POLICY_DESC(x) .desc = #x, .policy = x
static struct test_case {
char *desc;
int policy;
int retval;
} tcases[] = {
{POLICY_DESC(SCHED_OTHER), 0},
{POLICY_DESC(SCHED_FIFO), 99},
{POLICY_DESC(SCHED_RR), 99}
};Thus if you agree, I'm going to merge with this diff below.
kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c +10 -8
@@ -1,14 +1,16 @@// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved. +* Copyright (c) 2021 sujiaxun <[email protected]> */ /*\ * [Description] * -* This is a Phase I test for the sched_get_priority_max(2) system call. -* Obtain different maximum priority scheduling strategies and compare -* them with the expected value. +* Basic test for the sched_get_priority_max(2) system call. +* +* Obtain different maximum priority scheduling strategies and compare +* them with the expected value. */ #include <errno.h>
@@ -16,14 +18,16 @@#include "lapi/syscalls.h" #include "tst_test.h" +#define POLICY_DESC (x) .desc = #x, .policy = x +static struct test_case {char *desc;int policy;int retval; } tcases[] = { - {"SCHED_OTHER" ,SCHED_OTHER ,0 }, - {"SCHED_FIFO" ,SCHED_FIFO ,99 }, - {"SCHED_RR" ,SCHED_RR ,99 } + {POLICY_DESC (SCHED_OTHER ),0 }, + {POLICY_DESC (SCHED_FIFO ),99 }, + {POLICY_DESC (SCHED_RR ),99 } };static void run_test (unsigned int nr)
@@ -33,11 +37,9 @@ static void run_test(unsigned int nr)TST_EXP_VAL (tst_syscall (__NR_sched_get_priority_max, tc->policy), tc->retval,"test for %s" , tc->desc); - }static struct tst_test test = { .tcnt =ARRAY_SIZE (tcases), .test = run_test, }; -
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi sujiaxun,
merged. Thanks!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 7 lines · Petr Vorel
Hi sujiaxun,
merged. Thanks!
Kind regards,
Petr
I'm sorry, but I have been dealing with other things some time ago and have not been able to reply in time. Thank you for helping modify and merge.
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 10 lines · Petr Vorel
Quoted 6 lines
Hi sujiaxun,
merged. Thanks!
Kind regards,
PetrI'm sorry, but I have been dealing with other things some time ago and have not been able to reply in time. Thank you for helping modify and merge.
You're welcome. Thanks for working on LTP.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp