setitimer01: Rewrite using new LTP API
PATCH 1/1 setitimer01: Rewrite using new LTP API
Signed-off-by Avinesh Kumar <[email protected]>
--- .../kernel/syscalls/setitimer/setitimer01.c | 162 +++--------------- 1 file changed, 27 insertions(+), 135 deletions(-)
testcases/kernel/syscalls/setitimer/setitimer01.c +27 -135
@@ -1,157 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* * 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 +* 03/2001 - Written by Wayne Boyer +* Copyright (c) 2022 SUSE LLC Avinesh Kumar <[email protected]> */ -/* -* NAME -* setitimer01.c -* -* DESCRIPTION -* setitimer01 - check that a resonable setitimer() call succeeds. -* -* ALGORITHM -* loop if that option was specified -* allocate needed space and set up needed values -* issue the system call -* check the errno value -* issue a PASS message if we get zero -* otherwise, the tests fails -* issue a FAIL message -* break any remaining tests -* call cleanup -* -* USAGE: <for command-line> -* setitimer01 [-c n] [-f] [-i n] [-I x] [-P x] [-t] -* where, -c n : Run n copies concurrently. -* -f : Turn off functionality Testing. -* -i n : Execute test n times. -* -I x : Execute test for x seconds. -* -P x : Pause for x seconds between iterations. -* -t : Turn on syscall timing. -* -* HISTORY -* 03/2001 - Written by Wayne Boyer +/*\ +* [Description] * -* RESTRICTIONS -* none +* Verify that setitimer(2) successfully sets the specified timer to +* the value provided in new_value argument. */ -#include "test.h" - -#include <errno.h> #include <sys/time.h> - -void cleanup (void ); -void setup (void ); - -char *TCID ="setitimer01" ; -int TST_TOTAL =1 ; +#include "tst_test.h" #define SEC0 0#define SEC1 20#define SEC2 40 -int main (int ac,char **av) +static void run (void ) { -int lc; -struct itimerval *value, *ovalue; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; - -/* allocate some space for the timer structures */ +struct itimerval *new_value, *old_value; -if ((value =malloc ((size_t )sizeof (struct itimerval ))) == -NULL ) { -tst_brkm (TBROK , cleanup,"value malloc failed" ); - } + new_value =SAFE_MALLOC (sizeof (struct itimerval )); + old_value =SAFE_MALLOC (sizeof (struct itimerval )); -if ((ovalue =malloc ((size_t )sizeof (struct itimerval ))) == -NULL ) { -tst_brkm (TBROK , cleanup,"ovalue malloc failed" ); - } + new_value->it_value.tv_sec =SEC1 ; + new_value->it_value.tv_usec =SEC0 ; + new_value->it_interval.tv_sec =0 ; + new_value->it_interval.tv_usec =0 ; -/* set up some reasonable values */ +TST_EXP_PASS (setitimer (ITIMER_REAL , new_value, old_value)); - value->it_value.tv_sec =SEC1 ; - value->it_value.tv_usec =SEC0 ; - value->it_interval.tv_sec =0 ; - value->it_interval.tv_usec =0 ; -/* -* issue the system call with the TEST() macro -* ITIMER_REAL = 0, ITIMER_VIRTUAL = 1 and ITIMER_PROF = 2 -*/ + new_value->it_value.tv_sec =SEC2 ; + new_value->it_value.tv_usec =SEC0 ; -TEST (setitimer (ITIMER_REAL , value, ovalue)); +TST_EXP_PASS_SILENT (setitimer (ITIMER_REAL , new_value, old_value)); -if (TEST_RETURN !=0 ) { -tst_resm (TFAIL ,"call failed - errno = %d - %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -continue ; - } - -/* -* call setitimer again with new values. -* the old values should be stored in ovalue -*/ - value->it_value.tv_sec =SEC2 ; - value->it_value.tv_usec =SEC0 ; - -if ((setitimer (ITIMER_REAL , value, ovalue)) ==-1 ) { -tst_brkm (TBROK , cleanup,"second setitimer " -"call failed" ); - } - -if (ovalue->it_value.tv_sec <=SEC1 ) { -tst_resm (TPASS ,"functionality is correct" ); - }else { -tst_brkm (TFAIL , cleanup,"old timer value is " -"not equal to expected value" ); - } - } - -cleanup (); -tst_exit (); -} - -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) -{ - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; +if ((old_value->it_value.tv_sec <=SEC1 ) && (old_value->it_value.tv_sec >SEC1 -5 )) +tst_res (TPASS ,"old_value correctly updated with previous timer value" ); +else +tst_res (TFAIL ,"old_value is not correctly updated with previous timer value" ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) -{ - -} +static struct tst_test test = { + .test_all = run +};
Signature · 5 lines
2.37.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hello,
Quoted 101 lines · Avinesh Kumar
Signed-off-by Avinesh Kumar <[email protected]>--- .../kernel/syscalls/setitimer/setitimer01.c | 162 +++--------------- 1 file changed, 27 insertions(+), 135 deletions(-)testcases/kernel/syscalls/setitimer/setitimer01.c +0
-0n ---
a/testcases/kernel/syscalls/setitimer/setitimer01.c+++b/testcases/kernel/syscalls/setitimer/setitimer01.ctestcases/kernel/syscalls/setitimer/setitimer01.c +9
-68@@ -1,157 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* * 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 +* 03/2001 - Written by Wayne Boyer +* Copyright (c) 2022 SUSE LLC Avinesh Kumar <[email protected]> */ -/* -* NAME -* setitimer01.c -* -* DESCRIPTION -* setitimer01 - check that a resonable setitimer() call succeeds. -* -* ALGORITHM -* loop if that option was specified -* allocate needed space and set up needed values -* issue the system call -* check the errno value -* issue a PASS message if we get zero -* otherwise, the tests fails -* issue a FAIL message -* break any remaining tests -* call cleanup -* -* USAGE: <for command-line> -* setitimer01 [-c n] [-f] [-i n] [-I x] [-P x] [-t] -* where, -c n : Run n copies concurrently. -* -f : Turn off functionality Testing. -* -i n : Execute test n times. -* -I x : Execute test for x seconds. -* -P x : Pause for x seconds between iterations. -* -t : Turn on syscall timing. -* -* HISTORY -* 03/2001 - Written by Wayne Boyer +/*\ +* [Description] * -* RESTRICTIONS -* none +* Verify that setitimer(2) successfully sets the specified timer to +* the value provided in new_value argument. */ -#include "test.h" - -#include <errno.h> #include <sys/time.h> - -void cleanup (void ); -void setup (void ); - -char *TCID ="setitimer01" ; -int TST_TOTAL =1 ; +#include "tst_test.h" #define SEC0 0#define SEC1 20#define SEC2 40 -int main (int ac,char **av) +static void run (void ) { -int lc; -struct itimerval *value, *ovalue; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ;
testcases/kernel/syscalls/setitimer/setitimer01.c line 27
Quoted 10 lines
testcases/kernel/syscalls/setitimer/setitimer01.c +3
-6- -/* allocate some space for the timer structures */ +struct itimerval *new_value, *old_value; -if ((value =malloc ((size_t )sizeof (struct itimerval ))) == -NULL ) { -tst_brkm (TBROK , cleanup,"value malloc failed" ); - } + new_value =SAFE_MALLOC (sizeof (struct itimerval )); + old_value =SAFE_MALLOC (sizeof (struct itimerval ));
Why (continue to) use malloc?
Ideally this can be changed to guarded buffers, but stack variables would also be fine.
Quoted 61 lines
testcases/kernel/syscalls/setitimer/setitimer01.c +8
-48-if ((ovalue =malloc ((size_t )sizeof (struct itimerval ))) == -NULL ) { -tst_brkm (TBROK , cleanup,"ovalue malloc failed" ); - } + new_value->it_value.tv_sec =SEC1 ; + new_value->it_value.tv_usec =SEC0 ; + new_value->it_interval.tv_sec =0 ; + new_value->it_interval.tv_usec =0 ; -/* set up some reasonable values */ +TST_EXP_PASS (setitimer (ITIMER_REAL , new_value, old_value)); - value->it_value.tv_sec =SEC1 ; - value->it_value.tv_usec =SEC0 ; - value->it_interval.tv_sec =0 ; - value->it_interval.tv_usec =0 ; -/* -* issue the system call with the TEST() macro -* ITIMER_REAL = 0, ITIMER_VIRTUAL = 1 and ITIMER_PROF = 2 -*/ + new_value->it_value.tv_sec =SEC2 ; + new_value->it_value.tv_usec =SEC0 ; -TEST (setitimer (ITIMER_REAL , value, ovalue)); +TST_EXP_PASS_SILENT (setitimer (ITIMER_REAL , new_value, old_value)); -if (TEST_RETURN !=0 ) { -tst_resm (TFAIL ,"call failed - errno = %d - %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -continue ; - } - -/* -* call setitimer again with new values. -* the old values should be stored in ovalue -*/ - value->it_value.tv_sec =SEC2 ; - value->it_value.tv_usec =SEC0 ; - -if ((setitimer (ITIMER_REAL , value, ovalue)) ==-1 ) { -tst_brkm (TBROK , cleanup,"second setitimer " -"call failed" ); - } - -if (ovalue->it_value.tv_sec <=SEC1 ) { -tst_resm (TPASS ,"functionality is correct" ); - }else { -tst_brkm (TFAIL , cleanup,"old timer value is " -"not equal to expected value" ); - } - } - -cleanup (); -tst_exit (); -} - -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void )
testcases/kernel/syscalls/setitimer/setitimer01.c
Quoted 10 lines
testcases/kernel/syscalls/setitimer/setitimer01.c +4
-5-{ - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; +if ((old_value->it_value.tv_sec <=SEC1 ) && (old_value->it_value.tv_sec >SEC1 -5 )) +tst_res (TPASS ,"old_value correctly updated with previous timer value" ); +else + tst_res(TFAIL, "old_value is not correctly updated with previous timer value");
The itimerval memory is leaked here if we use -i.
Quoted 15 lines
testcases/kernel/syscalls/setitimer/setitimer01.c +3
-8} -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) -{ - -} +static struct tst_test test = { + .test_all = run +};Signature · 1 line
2.37.3
Otherwise looks good.
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp