syscalls/pread01: Convert to new API
PATCH 1/1 syscalls/pread01: Convert to new API
--- testcases/kernel/syscalls/pwrite/pwrite01.c | 336 +++++----------------------- 1 file changed, 57 insertions(+), 279 deletions(-)
testcases/kernel/syscalls/pwrite/pwrite01.c +57 -279
@@ -1,86 +1,23 @@ +// 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 +* Copyright (c) International Business Machines Corp., 2001 +* 07/2001 Ported by Wayne Boyer */ -/* -* Test Name: pwrite01 +/*\ +* [Description] * -* Test Description: * Verify the functionality of pwrite() by writing known data using pwrite() * to the file at various specified offsets and later read from the file from * various specified offsets, comparing the data written aganist the data * read using read(). -* -* Expected Result: -* pwrite() should succeed to write the expected no. of bytes of data and -* the data written at specified offsets should match aganist the data read -* from that offset. -* -* Algorithm: -* Setup: -* Setup signal handling. -* Create temporary directory. -* 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, -* Verify the Functionality of system call -* if successful, -* Issue Functionality-Pass message. -* Otherwise, -* Issue Functionality-Fail message. -* Cleanup: -* Print errno log and/or timing stats if options given -* Delete the temporary directory created. -* -* Usage: <for command-line> -* pwrite01 [-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 -* 07/2001 Ported by Wayne Boyer -* -* RESTRICTIONS: -* None. */ -#define _XOPEN_SOURCE 500 - -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> #include <stdlib.h> -#include <string.h> #include <inttypes.h> +#include "tst_test.h" +#include "tst_safe_prw.h" -#include "test.h" -#include "safe_macros.h" - -#define _XOPEN_SOURCE 500#define TEMPFILE "pwrite_file"#define K1 1024#define K2 (K1 * 2)
@@ -88,249 +25,90 @@#define K4 (K1 * 4)#define NBUFS 4 -char *TCID ="pwrite01" ; -int TST_TOTAL =1 ; -int fildes;/* file descriptor for tempfile */ -char *write_buf[NBUFS ];/* buffer to hold data to be written */ +static int fildes; +char *write_buf[NBUFS ]; +char *read_buf[NBUFS ]; -void setup ();/* Main setup function of test */ -void cleanup ();/* cleanup function for the test */ -void l_seek (int ,off_t ,int ,off_t );/* function to call lseek() */ -void init_buffers ();/* function to initialize/allocate buffers */ -void check_file_contents ();/* function to verify the contents of file */ - -int main (int ac,char **av) +static void l_seek (int fdesc,off_t offset,int whence,off_t checkoff) { -int lc; -int nwrite;/* no. of bytes written by pwrite() */ - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; - -/* -* Call pwrite() to write K1 bytes of data (0's) at offset 0 -* of temporary file -*/ - nwrite =pwrite (fildes, write_buf[0 ],K1 ,0 ); +off_t offloc; -/* Check for the return value of pwrite() */ -if (nwrite !=K1 ) { -tst_resm (TFAIL ,"pwrite() at offset 0 failed, errno=%d " -": %s" , errno,strerror (errno)); -continue ; - } - -/* We should still be at offset 0. */ -l_seek (fildes,0 ,SEEK_CUR ,0 ); - -/* -* Now, lseek() to a non K boundary, -* just to be different. -*/ -l_seek (fildes,K1 /2 ,SEEK_SET ,K1 /2 ); - -/* -* Again, pwrite() K1 of data (2's) at offset K2 of -* temporary file. -*/ - nwrite =pwrite (fildes, write_buf[2 ],K1 ,K2 ); -if (nwrite !=K1 ) { -tst_resm (TFAIL ,"pwrite() failed to " -"write at %d off. on %s, errno=%d : %s" , -K2 ,TEMPFILE , errno,strerror (errno)); -continue ; - } - -/* We should still be at our non K boundary. */ -l_seek (fildes,0 ,SEEK_CUR ,K1 /2 ); + offloc =SAFE_LSEEK (fdesc, offset, whence); +if (offloc != checkoff) { +tst_res (TFAIL ,"return = %" PRId64", expected %" PRId64, + (int64_t ) offloc, (int64_t ) checkoff); + } +} -/* lseek() to an offset of K3. */ -l_seek (fildes,K3 ,SEEK_SET ,K3 ); +static void check_file_contents (void ) +{ +int count, err_flg =0 ; -/* -* Using write(), write of K1 of data (3's) which -* should take place at an offset of K3, -* moving the file pointer to K4. -*/ - nwrite =write (fildes, write_buf[3 ],K1 ); -if (nwrite !=K1 ) { -tst_resm (TFAIL ,"write() failed: nwrite=%d, errno=%d : " -"%s" , nwrite, errno,strerror (errno)); -continue ; - } +for (count =0 ; count <NBUFS ; count++) { +l_seek (fildes, count *K1 ,SEEK_SET , count *K1 ); -/* We should be at offset K4. */ -l_seek (fildes,0 ,SEEK_CUR ,K4 ); +SAFE_READ (1 , fildes, read_buf[count],K1 ); -/* Again, pwrite() K1 of data (1's) at offset K1. */ - nwrite =pwrite (fildes, write_buf[1 ],K1 ,K1 ); -if (nwrite !=K1 ) { -tst_resm (TFAIL ,"pwrite() failed to write at " -"%d off. on %s, errno=%d : %s" , -K1 ,TEMPFILE , errno,strerror (errno)); -continue ; +if (memcmp (write_buf[count], read_buf[count],K1 ) !=0 ) { +tst_res (TFAIL ,"read/write buffer[%d] data mismatch" , count); + err_flg++; } - -/* -* Check the contents of temporary file -* to which data written using pwrite(). -* Compare the data read with the original -* write_buf[] contents. -*/ -check_file_contents (); - -/* reset to offset 0 in case we are looping */ -l_seek (fildes,0 ,SEEK_SET ,0 ); - } -cleanup (); -tst_exit (); +if (!err_flg) +tst_res (TPASS ,"Functionality of pwrite() successful" ); } -/* -* setup() - performs all ONE TIME setup for this test. -* -* Initialize/allocate read/write buffers. -* Create a temporary directory and a file under it and -*/ -void setup (void ) +static void verify_pwrite (void ) { +SAFE_PWRITE (1 , fildes, write_buf[0 ],K1 ,0 ); +l_seek (fildes,0 ,SEEK_CUR ,0 ); +l_seek (fildes,K1 /2 ,SEEK_SET ,K1 /2 ); -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +SAFE_PWRITE (1 , fildes, write_buf[2 ],K1 ,K2 ); +l_seek (fildes,0 ,SEEK_CUR ,K1 /2 ); +l_seek (fildes,K3 ,SEEK_SET ,K3 ); -TEST_PAUSE ; +SAFE_WRITE (1 , fildes, write_buf[3 ],K1 ); +l_seek (fildes,0 ,SEEK_CUR ,K4 ); -/* Allocate/Initialize the write buffer with known data */ -init_buffers (); +SAFE_PWRITE (1 , fildes, write_buf[1 ],K1 ,K1 ); -tst_tmpdir (); +check_file_contents (); -/* Creat a temporary file used for mapping */ -if ((fildes =open (TEMPFILE ,O_RDWR |O_CREAT ,0666 )) <0 ) { -tst_brkm (TBROK , cleanup,"open() on %s Failed, errno=%d : %s" , -TEMPFILE , errno,strerror (errno)); - } +l_seek (fildes,0 ,SEEK_SET ,0 ); } -/* -* init_buffers() - allocate/Initialize write_buf array. -* -* Allocate write buffer. -* Fill the write buffer with the following data like, -* write_buf[0] has 0's, write_buf[1] has 1's, write_buf[2] has 2's -* write_buf[3] has 3's. -*/ -void init_buffers (void ) +static void setup (void ) { -int count;/* counter variable for loop */ +int count; -/* Allocate and Initialize write buffer with known data */ for (count =0 ; count <NBUFS ; count++) { - write_buf[count] =malloc (K1 ); - -if (write_buf[count] ==NULL ) { -tst_brkm (TBROK ,NULL ,"malloc() failed " ); - } + write_buf[count] =SAFE_MALLOC (K1 ); + read_buf[count] =SAFE_MALLOC (K1 );memset (write_buf[count], count,K1 ); } -} -/* -* l_seek() - local front end to lseek(). -* -* "checkoff" is the offset@which we believe we should be at. -* Used to validate pread/pwrite don't move the offset. -*/ -void l_seek (int fdesc,off_t offset,int whence,off_t checkoff) -{ -off_t offloc;/* offset ret. from lseek() */ - -if ((offloc =lseek (fdesc, offset, whence)) != checkoff) { -tst_resm (TWARN ,"lseek returned %" PRId64", expected %" PRId64, - (int64_t ) offloc, (int64_t ) checkoff); -tst_brkm (TBROK |TERRNO , cleanup,"lseek() on %s Failed" , -TEMPFILE ); - } + fildes =SAFE_OPEN (TEMPFILE ,O_RDWR |O_CREAT ,0666 ); } -/* -* check_file_contents() - Check the contents of the file we wrote with -* pwrite()'s. -* The contents of the file are verified by using a plain read() and -* Compare the data read with the original write_buf[] contents. -*/ -void check_file_contents (void ) -{ -int count, err_flg =0 ;/* index variable and error flag */ -int nread;/* return value of read() */ -off_t offloc;/* offset. ret. by lseek() */ -char *read_buf;/* buffer to hold read data */ - -/* Allocate space for read buffer */ - read_buf =malloc (K1 ); -if (read_buf ==NULL ) { -tst_brkm (TBROK , cleanup,"malloc() failed on read buffer" ); - } - -/* Seek to app. location of file and read the data, compare it */ -for (count =0 ; count <NBUFS ; count++) { -/* Seek to specified offset position from beginning */ - offloc =lseek (fildes, count *K1 ,SEEK_SET ); -if (offloc != (count *K1 )) { -tst_brkm (TBROK |TERRNO , cleanup, -"lseek() failed: offloc=%" PRId64, - (int64_t ) offloc); - } - -/* Read the data from file into a buffer */ - nread =read (fildes, read_buf,K1 ); -if (nread !=K1 ) { -tst_brkm (TBROK |TERRNO , cleanup, -"read() failed: nread=%d" , nread); - } - -/* Compare the read data with the data written using pwrite */ -if (memcmp (write_buf[count], read_buf,K1 ) !=0 ) { -tst_resm (TFAIL ,"read/write buffer data mismatch" ); - err_flg++; - } - } - -/* If no erros, Test successful */ -if (!err_flg) { -tst_resm (TPASS ,"Functionality of pwrite() successful" ); - } - -/* Release the memory allocated before return */ -free (read_buf); -} - -/* -* cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -* -* Deallocate the memory allocated to write buffer. -* Close the temporary file. -* Remove the temporary directory created. -*/ -void cleanup (void ) +static void cleanup (void ) {int count; -/* Free the memory allocated for the write buffer */ for (count =0 ; count <NBUFS ; count++) {free (write_buf[count]); +free (read_buf[count]); } -/* Close the temporary file */ -SAFE_CLOSE (NULL , fildes); - -tst_rmdir (); +if (fildes >0 ) +SAFE_CLOSE (fildes); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_pwrite, +};
Signature · 1 line
1.8.3.1
PATCH 1/1 syscalls/pread01: Convert to new API
Hi Dai,
LGTM, few notes below, I can fix everything before merge.
testcases/kernel/syscalls/pwrite/pwrite01.c line 3
Quoted 13 lines
Signed-off-by Dai Shili <[email protected]>--- testcases/kernel/syscalls/pwrite/pwrite01.c | 336 +++++----------------------- 1 file changed, 57 insertions(+), 279 deletions(-)testcases/kernel/syscalls/pwrite/pwrite01.c +2
-0@@ -1,86 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) International Business Machines Corp., 2001
As you haven't added your license, I'll add LTP project license.
Quoted 2 lines
testcases/kernel/syscalls/pwrite/pwrite01.c +1
-0+* 07/2001 Ported by Wayne Boyer */
...
Quoted 7 lines
+/*\
+ * [Description]
*
- * Test Description:* Verify the functionality of pwrite() by writing known data using pwrite() * to the file at various specified offsets and later read from the file from * various specified offsets, comparing the data written aganist the data
typo: aganist -> against. Going to fix it before merge.
Quoted 1 line
* read using
read().
...
testcases/kernel/syscalls/pwrite/pwrite01.c line 26
Quoted 7 lines
testcases/kernel/syscalls/pwrite/pwrite01.c +0
-1-#define _XOPEN_SOURCE 500#define TEMPFILE "pwrite_file"#define K1 1024#define K2 (K1 * 2)@@ -88,249 +25,90 @@#define K4 (K1 * 4)#define NBUFS 4
You kept using kilobyte constants. IMHO it'd be more readable just to use numeric (1024, 2048, 3072, 4096), but let's keep it.
testcases/kernel/syscalls/pwrite/pwrite01.c line 30
Quoted 7 lines
testcases/kernel/syscalls/pwrite/pwrite01.c +3
-4-char *TCID ="pwrite01" ; -int TST_TOTAL =1 ; -int fildes;/* file descriptor for tempfile */ -char *write_buf[NBUFS ];/* buffer to hold data to be written */ +static int fildes; +char *write_buf[NBUFS ]; +char *read_buf[NBUFS ];
write_buf and read_buf should also be static.
...
Quoted 18 lines
testcases/kernel/syscalls/pwrite/pwrite01.c +10
-4+static void verify_pwrite (void ) { +SAFE_PWRITE (1 , fildes, write_buf[0 ],K1 ,0 ); +l_seek (fildes,0 ,SEEK_CUR ,0 ); +l_seek (fildes,K1 /2 ,SEEK_SET ,K1 /2 ); -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +SAFE_PWRITE (1 , fildes, write_buf[2 ],K1 ,K2 ); +l_seek (fildes,0 ,SEEK_CUR ,K1 /2 ); +l_seek (fildes,K3 ,SEEK_SET ,K3 ); -TEST_PAUSE ; +SAFE_WRITE (1 , fildes, write_buf[3 ],K1 ); +l_seek (fildes,0 ,SEEK_CUR ,K4 ); -/* Allocate/Initialize the write buffer with known data */ -init_buffers (); +SAFE_PWRITE (1 , fildes, write_buf[1 ],K1 ,K1 );
testcases/kernel/syscalls/pwrite/pwrite01.c line 79
Quoted 10 lines
testcases/kernel/syscalls/pwrite/pwrite01.c +2
-6-tst_tmpdir (); +check_file_contents (); -/* Creat a temporary file used for mapping */ -if ((fildes =open (TEMPFILE ,O_RDWR |O_CREAT ,0666 )) <0 ) { -tst_brkm (TBROK , cleanup,"open() on %s Failed, errno=%d : %s" , -TEMPFILE , errno,strerror (errno)); - } +l_seek (fildes,0 ,SEEK_SET ,0 );
your code:
static void verify_pread(void)
{
SAFE_PREAD(1, fildes, read_buf[2], K1, K2);
l_seek(fildes, 0, SEEK_CUR, K4);
l_seek(fildes, 0, SEEK_SET, 0);
SAFE_PREAD(1, fildes, read_buf[3], K1, K3);
l_seek(fildes, 0, SEEK_CUR, 0);
SAFE_READ(1, fildes, read_buf[0], K1);
l_seek(fildes, 0, SEEK_CUR, K1);
SAFE_PREAD(1, fildes, read_buf[1], K1, K1);
l_seek(fildes, 0, SEEK_CUR, K1);
compare_bufers();
l_seek(fildes, K4, SEEK_SET, K4);
}nit: having blank line after each line?
how about something like:
static void verify_pread(void)
{
SAFE_PREAD(1, fildes, read_buf[2], K1, K2);
l_seek(fildes, 0, SEEK_CUR, K4);
l_seek(fildes, 0, SEEK_SET, 0);
SAFE_PREAD(1, fildes, read_buf[3], K1, K3);
l_seek(fildes, 0, SEEK_CUR, 0);
SAFE_READ(1, fildes, read_buf[0], K1);
l_seek(fildes, 0, SEEK_CUR, K1);
SAFE_PREAD(1, fildes, read_buf[1], K1, K1);
l_seek(fildes, 0, SEEK_CUR, K1);
compare_bufers();
l_seek(fildes, K4, SEEK_SET, K4);
}The rest LGTM.
Kind regards,
Petr
PATCH 1/1 syscalls/pread01: Convert to new API
Hi Dai,
Quoted 2 lines
...
Quoted 1 line
+static void
verify_pwrite(void)
...
Quoted 42 lines
your code:
static voidverify_pread(void){ SAFE_PREAD(1, fildes, read_buf[2], K1, K2); l_seek(fildes, 0, SEEK_CUR, K4); l_seek(fildes, 0, SEEK_SET, 0); SAFE_PREAD(1, fildes, read_buf[3], K1, K3); l_seek(fildes, 0, SEEK_CUR, 0); SAFE_READ(1, fildes, read_buf[0], K1); l_seek(fildes, 0, SEEK_CUR, K1); SAFE_PREAD(1, fildes, read_buf[1], K1, K1); l_seek(fildes, 0, SEEK_CUR, K1); compare_bufers(); l_seek(fildes, K4, SEEK_SET, K4); }nit: having blank line after each line?
how about something like:
static void
verify_pread(void){ SAFE_PREAD(1, fildes, read_buf[2], K1, K2); l_seek(fildes, 0, SEEK_CUR, K4); l_seek(fildes, 0, SEEK_SET, 0); SAFE_PREAD(1, fildes, read_buf[3], K1, K3); l_seek(fildes, 0, SEEK_CUR, 0); SAFE_READ(1, fildes, read_buf[0], K1); l_seek(fildes, 0, SEEK_CUR, K1);
Quoted 7 lines
SAFE_PREAD(1, fildes, read_buf[1], K1, K1); l_seek(fildes, 0, SEEK_CUR, K1); compare_bufers(); l_seek(fildes, K4, SEEK_SET, K4); }
I'm sorry, this was meant to be mentioned at patch, which changes pread01.c [1], not here. I got confused by your wrong subject. But most of the code is similar, thus can apply here.
[1] https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
Quoted 4 lines
The rest LGTM.
Kind regards,
Petr
PATCH 1/1 syscalls/pread01: Convert to new API
In reply to Dai ShiliHi Dai,
also subject mentions pread01 instead of pwrite01 (copy paste error, can be changed during merge).
Kind regards,
Petr
PATCH 1/1 syscalls/pread01: Convert to new API
In reply to Dai ShiliHi Dai,
Quoted 1 line
testcases/kernel/syscalls/pwrite/pwrite01.c +0
-0
...
testcases/kernel/syscalls/pwrite/pwrite01.c line 13
Quoted 10 lines
testcases/kernel/syscalls/pwrite/pwrite01.c +2
-3-/* -* Test Name: pwrite01 +/*\ +* [Description] * -* Test Description: * Verify the functionality of pwrite() by writing known data using pwrite() * to the file at various specified offsets and later read from the file from * various specified offsets, comparing the data written aganist the data * read using read().
You kept 2 spaces between * and text. That'll lead in docparse formatting (which uses markdown) to formatted as code, which is wrong. It must be without space:
/*\
* [Description]
*
* Verify the functionality of pwrite() by writing known data using pwrite()
* to the file at various specified offsets and later read from the file from
* various specified offsets, comparing the data written aganist the data
* read using read().
*/
Again, I have already prepared fixes, just wait for others to review.
Kind regards,
Petr
PATCH 1/1 syscalls/pread01: Convert to new API
Hi Petr
Quoted 27 lines
Hi Dai,
Quoted 1 line
testcases/kernel/syscalls/pwrite/pwrite01.c +0
-0...
testcases/kernel/syscalls/pwrite/pwrite01.c line 13
Quoted 10 lines
testcases/kernel/syscalls/pwrite/pwrite01.c +2
-3-/* -* Test Name: pwrite01 +/*\ +* [Description] * -* Test Description: * Verify the functionality of pwrite() by writing known data using pwrite() * to the file at various specified offsets and later read from the file from * various specified offsets, comparing the data written aganist the data * read using read(). You kept 2 spaces between * and text. That'll lead in docparse formatting (which uses markdown) to formatted as code, which is wrong. It must be without space:
/*\
* [Description]
*
* Verify the functionality ofpwrite()by writing known data usingpwrite()
* to the file at various specified offsets and later read from the file from
* various specified offsets, comparing the data written aganist the data
* read usingread().
*/
Quoted 1 line
Again, I have already prepared fixes, just wait for others to review.
In fact, I have reviewed these patches in internal before Dan sent these patches to ltp. So you can add my Reviewed-by tag for her pread and pwrite patches.
Best Regards
Yang Xu
Quoted 4 lines
Kind regards,
Petr
PATCH 1/1 syscalls/pread01: Convert to new API
Hi Xu, Dai,
...
Quoted 4 lines
Quoted 1 line
Again, I have already prepared fixes, just wait for others to review.
In fact, I have reviewed these patches in internal before Dan sent these patches to ltp. So you can add my Reviewed-by tag for her pread and pwrite patches.
Nice, both merged.
Thanks!
Kind regards,
Petr