| Message ID | 20240126040139.2534873-1-ruansy.fnst@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] fdatasync01: Convert to new API | expand |
Hi! > +// 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 is GPL-2.0 not GPL-2.0-or-later and we can't change license for the old tests unless it's a complete rewrite. > - * 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) Linux Test Project, 2003-2024 > */ > -/********************************************************** > - * > - * TEST IDENTIFIER : fdatasync01 > - * > - * EXECUTED BY : Any user > - * > - * TEST TITLE : Basic test for fdatasync(2) > - * > - * TEST CASE TOTAL : 1 > - * > - * AUTHOR : Madhu T L <madhu.tarikere@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 fdatasync(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. > - * Create a temp directory and cd to it > - * Initialize filename and open it in write mode for each child process. > - * > - * Test: > - * Loop if the proper options are given. > - * Execute system call > - * Check return code, if system call failed (return=-1) > - * Issue FAIL message with errno. > - * Otherwise, Issue PASS message. > - * > - * Cleanup: > - * Print errno log and/or timing stats if options given > - * Remove temporary directory and all files in it. > - * > - * USAGE: <for command-line> > - * fdatasync01 [-c n] [-e] [-f] [-h] [-i n] [-I x] [-p] [-P x] [-t] > - * where, -c n : Run n copies concurrently. > - * -e : Turn on errno logging. > - * -f : Turn off functional testing > - * -h : Show help screen > - * -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. > + > +/*\ > + * [Description] > * > - ****************************************************************/ > -#include <errno.h> > -#include <sys/types.h> > -#include <sys/stat.h> > -#include <fcntl.h> > -#include <unistd.h> > -#include "test.h" > + * Basic test for fdatasync(). Call fdatasync() on a fd and expect it to pass. > + */ > > -static int fd; > -static char filename[30]; > -static void setup(void); > -static void cleanup(void); > +#include "tst_test.h" > > -char *TCID = "fdatasync01"; > -int TST_TOTAL = 1; > +static int fd; > +static char pfilename[30]; > > -int main(int argc, char **argv) > +static void run(void) > { > - int lc; > - > - tst_parse_opts(argc, argv, NULL, NULL); > - > - setup(); > - > - for (lc = 0; TEST_LOOPING(lc); lc++) { > - > - /* reset tst_count in case we are looping */ > - tst_count = 0; > - > - /* Test the system call */ > - TEST(fdatasync(fd)); > - > - /* check return code */ > - if (TEST_RETURN == -1) { > - tst_resm(TFAIL, "fdatasync() failed, errno=%d : %s", > - TEST_ERRNO, strerror(TEST_ERRNO)); > - } else { > - /* No Functional verification yet */ > - tst_resm(TPASS, "fdatasync() successful"); > - } > - } > - > - /* perform global cleanup and exit */ > - cleanup(); > - > - tst_exit(); > - > + TST_EXP_PASS(fdatasync(fd), "fdatasync(%d)", fd); > } > > -/* setup() - performs all ONE TIME setup for this test */ > -void setup(void) > +static void setup(void) > { > - > - tst_sig(NOFORK, DEF_HANDLER, cleanup); > - > - /* Pause if that option was specified > - * TEST_PAUSE contains the code to fork the test with the -c option. > - */ > - TEST_PAUSE; > - > - tst_tmpdir(); > - > /* Initialize unique filename for each child process */ Such comments are useless and should be just removed. > - if (sprintf(filename, "fdatasync_%d", getpid()) <= 0) { > - tst_brkm(TBROK, cleanup, "Failed to initialize filename"); > - } > - if ((fd = open(filename, O_CREAT | O_WRONLY, 0777)) == -1) { //mode must be specified when O_CREATE is in the flag > - tst_brkm(TBROK, cleanup, "open() failed"); > - } > - if ((write(fd, filename, strlen(filename) + 1)) == -1) { > - tst_brkm(TBROK, cleanup, "write() failed"); > - } > + sprintf(pfilename, "fdatasync_%d", getpid()); > + > + /* mode must be specified when O_CREATE is in the flag */ Here as well. > + fd = SAFE_OPEN(pfilename, O_CREAT | O_WRONLY, 0777); > + SAFE_WRITE(SAFE_WRITE_ALL, fd, pfilename, strlen(pfilename) + 1); > } > > -/* > - * cleanup() > - * performs all ONE TIME cleanup for this test at > - * completion or premature exit > - */ > -void cleanup(void) > +static void cleanup(void) > { > - /* > - * print timing stats if that option was specified. > - * print errno log if that option was specified. > - */ > close(fd); It would be slightly better to close the fd only if it was opened and with SAFE_CLOSE() i.e. if (fd > 0) SAFE_CLOSE(fd); > - > - tst_rmdir(); > - > } > + > +static struct tst_test test = { > + .needs_tmpdir = 1, > + .test_all = run, > + .setup = setup, > + .cleanup = cleanup, I suppose that it would make sense to run this test for .all_filesystems as well. > +}; > -- > 2.34.1 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp
diff --git a/testcases/kernel/syscalls/fdatasync/fdatasync01.c b/testcases/kernel/syscalls/fdatasync/fdatasync01.c index 24a91785c..ba4375b68 100644 --- a/testcases/kernel/syscalls/fdatasync/fdatasync01.c +++ b/testcases/kernel/syscalls/fdatasync/fdatasync01.c @@ -1,155 +1,43 @@ +// 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) Linux Test Project, 2003-2024 */ -/********************************************************** - * - * TEST IDENTIFIER : fdatasync01 - * - * EXECUTED BY : Any user - * - * TEST TITLE : Basic test for fdatasync(2) - * - * TEST CASE TOTAL : 1 - * - * AUTHOR : Madhu T L <madhu.tarikere@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 fdatasync(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. - * Create a temp directory and cd to it - * Initialize filename and open it in write mode for each child process. - * - * Test: - * Loop if the proper options are given. - * Execute system call - * Check return code, if system call failed (return=-1) - * Issue FAIL message with errno. - * Otherwise, Issue PASS message. - * - * Cleanup: - * Print errno log and/or timing stats if options given - * Remove temporary directory and all files in it. - * - * USAGE: <for command-line> - * fdatasync01 [-c n] [-e] [-f] [-h] [-i n] [-I x] [-p] [-P x] [-t] - * where, -c n : Run n copies concurrently. - * -e : Turn on errno logging. - * -f : Turn off functional testing - * -h : Show help screen - * -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. + +/*\ + * [Description] * - ****************************************************************/ -#include <errno.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> -#include "test.h" + * Basic test for fdatasync(). Call fdatasync() on a fd and expect it to pass. + */ -static int fd; -static char filename[30]; -static void setup(void); -static void cleanup(void); +#include "tst_test.h" -char *TCID = "fdatasync01"; -int TST_TOTAL = 1; +static int fd; +static char pfilename[30]; -int main(int argc, char **argv) +static void run(void) { - int lc; - - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - /* reset tst_count in case we are looping */ - tst_count = 0; - - /* Test the system call */ - TEST(fdatasync(fd)); - - /* check return code */ - if (TEST_RETURN == -1) { - tst_resm(TFAIL, "fdatasync() failed, errno=%d : %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - } else { - /* No Functional verification yet */ - tst_resm(TPASS, "fdatasync() successful"); - } - } - - /* perform global cleanup and exit */ - cleanup(); - - tst_exit(); - + TST_EXP_PASS(fdatasync(fd), "fdatasync(%d)", fd); } -/* setup() - performs all ONE TIME setup for this test */ -void setup(void) +static void setup(void) { - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - /* Pause if that option was specified - * TEST_PAUSE contains the code to fork the test with the -c option. - */ - TEST_PAUSE; - - tst_tmpdir(); - /* Initialize unique filename for each child process */ - if (sprintf(filename, "fdatasync_%d", getpid()) <= 0) { - tst_brkm(TBROK, cleanup, "Failed to initialize filename"); - } - if ((fd = open(filename, O_CREAT | O_WRONLY, 0777)) == -1) { //mode must be specified when O_CREATE is in the flag - tst_brkm(TBROK, cleanup, "open() failed"); - } - if ((write(fd, filename, strlen(filename) + 1)) == -1) { - tst_brkm(TBROK, cleanup, "write() failed"); - } + sprintf(pfilename, "fdatasync_%d", getpid()); + + /* mode must be specified when O_CREATE is in the flag */ + fd = SAFE_OPEN(pfilename, O_CREAT | O_WRONLY, 0777); + SAFE_WRITE(SAFE_WRITE_ALL, fd, pfilename, strlen(pfilename) + 1); } -/* - * cleanup() - * performs all ONE TIME cleanup for this test at - * completion or premature exit - */ -void cleanup(void) +static void cleanup(void) { - /* - * print timing stats if that option was specified. - * print errno log if that option was specified. - */ close(fd); - - tst_rmdir(); - } + +static struct tst_test test = { + .needs_tmpdir = 1, + .test_all = run, + .setup = setup, + .cleanup = cleanup, +};
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com> --- .../kernel/syscalls/fdatasync/fdatasync01.c | 164 +++--------------- 1 file changed, 26 insertions(+), 138 deletions(-)