ltp-aiodio/dio_append: fix dio_append()
PATCH 1/1 ltp-aiodio/dio_append: fix dio_append()
When running the dio_append test in the ltp-aiodiio.part4 test item, there was a problem that the file could not be created, but the test result was PASS. To this end, the following operations have been added.
1. create the directory where the file is located.
2. rewrite the dio_append API. Add relevant return values.
--- testcases/kernel/io/ltp-aiodio/dio_append.c | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)
testcases/kernel/io/ltp-aiodio/dio_append.c +19 -7
@@ -75,7 +75,7 @@ int read_eof(char *filename)return 0 ; } -void dio_append (char *filename) +int dio_append (char *filename) {int fd;void *bufptr;
@@ -86,14 +86,14 @@ void dio_append(char *filename)if (fd <0 ) {perror ("cannot create file" ); -return ; +return 1 ; }TEST (posix_memalign (&bufptr,4096 ,64 *1024 ));if (TEST_RETURN ) {tst_resm (TBROK |TRERRNO ,"cannot malloc aligned memory" );close (fd); -return ; +return 1 ; }memset (bufptr,0 ,64 *1024 );
@@ -102,17 +102,29 @@ void dio_append(char *filename)fprintf (stderr,"write %d returned %d\n" , i, w); } } +return 0 ; }int main (void ) { -char filename[PATH_MAX ]; +char filename[PATH_MAX ], filepath[PATH_MAX -5 ];int pid[NUM_CHILDREN ];int num_children =1 ;int i; +int ret =-1 ; -snprintf (filename,sizeof (filename),"%s/aiodio/file" , +snprintf (filepath,sizeof (filepath),"%s/aiodio" ,getenv ("TMP" ) ?getenv ("TMP" ) :"/tmp" ); + +if (access (filepath,F_OK ) ==-1 ) { +char command[PATH_MAX +10 ]; + +snprintf (command,sizeof (command),"mkdir -p %s" , filepath); +if (system (command) !=0 ) +return 1 ; + } + +snprintf (filename,sizeof (filename),"%s/file" , filepath);printf ("Begin dio_append test...\n" );
@@ -134,10 +146,10 @@ int main(void)* Parent appends to end of file using direct i/o */ -dio_append (filename); + ret =dio_append (filename);for (i =0 ; i < num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +return ret; }
Signature · 1 line
2.27.0
PATCH 1/1 ltp-aiodio/dio_append: fix dio_append()
Hi dong
Quoted 2 lines
When running the
dio_appendtest in the ltp-aiodiio.part4 test item, there was a problem that the file could not be created, but the test result was PASS. To this end, the following operations have been added.
1. create the directory where the file is located.
Why need to create directory?
Quoted 53 lines
2. rewrite the
dio_appendAPI. Add relevant return values.Signed-off-by dongshijiang<[email protected]>--- testcases/kernel/io/ltp-aiodio/dio_append.c | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)testcases/kernel/io/ltp-aiodio/dio_append.c +6
-4@@ -75,7 +75,7 @@ int read_eof(char *filename)return 0 ; } -void dio_append (char *filename) +int dio_append (char *filename) {int fd;void *bufptr;@@ -86,14 +86,14 @@ void dio_append(char *filename)if (fd<0 ) {perror ("cannot create file" ); -return ; +return 1 ; }TEST (posix_memalign (&bufptr,4096 ,64 *1024 ));if (TEST_RETURN ) {tst_resm (TBROK |TRERRNO ,"cannot malloc aligned memory" );close (fd); -return ; +return 1 ; }memset (bufptr,0 ,64 *1024 );@@ -102,17 +102,29 @@ void dio_append(char *filename)fprintf (stderr,"write %d returned %d\n" , i, w); } } +return 0 ; }int main (void ) { -char filename[PATH_MAX ]; +char filename[PATH_MAX ], filepath[PATH_MAX -5 ];int pid[NUM_CHILDREN ];int num_children =1 ;int i; +int ret =-1 ;
testcases/kernel/io/ltp-aiodio/dio_append.c void dio_append(char *filename) · line 124
Quoted 10 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +8
-1-snprintf (filename,sizeof (filename),"%s/aiodio/file" , +snprintf (filepath,sizeof (filepath),"%s/aiodio" ,getenv ("TMP" ) ?getenv ("TMP" ) :"/tmp" ); + +if (access (filepath,F_OK ) ==-1 ) { +char command[PATH_MAX +10 ]; + +snprintf (command,sizeof (command),"mkdir -p %s" , filepath); +if (system (command) !=0 ) +return 1 ;
just only call mkdir syscall instead of command.
Quoted 19 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +5
-2+ } + +snprintf (filename,sizeof (filename),"%s/file" , filepath);printf ("Begin dio_append test...\n" );@@ -134,10 +146,10 @@ int main(void)* Parent appends to end of file using direct i/o */ -dio_append (filename); + ret =dio_append (filename);for (i =0 ; i< num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +return ret; }
Hi xuyang
1. if not create directory, in the function dio_append The open file returns a failure, Because the directory "aiodio" does not exist.
2. The mkdir command is called to recursively create directories
-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?3? 18:05
???: James Dong (???) <[email protected]>
??: [email protected]
??: Re: [LTP] [PATCH] ltp-aiodio/dio_append: fix dio_append()
Hi dong
Quoted 2 lines
When running the
dio_appendtest in the ltp-aiodiio.part4 test item, there was a problem that the file could not be created, but the test result was PASS. To this end, the following operations have been added.
1. create the directory where the file is located.
Why need to create directory?
Quoted 53 lines
2. rewrite the
dio_appendAPI. Add relevant return values.Signed-off-by dongshijiang<[email protected]>--- testcases/kernel/io/ltp-aiodio/dio_append.c | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)testcases/kernel/io/ltp-aiodio/dio_append.c +6
-4@@ -75,7 +75,7 @@ int read_eof(char *filename)return 0 ; } -void dio_append (char *filename) +int dio_append (char *filename) {int fd;void *bufptr;@@ -86,14 +86,14 @@ void dio_append(char *filename)if (fd<0 ) {perror ("cannot create file" ); -return ; +return 1 ; }TEST (posix_memalign (&bufptr,4096 ,64 *1024 ));if (TEST_RETURN ) {tst_resm (TBROK |TRERRNO ,"cannot malloc aligned memory" );close (fd); -return ; +return 1 ; }memset (bufptr,0 ,64 *1024 );@@ -102,17 +102,29 @@ void dio_append(char *filename)fprintf (stderr,"write %d returned %d\n" , i, w); } } +return 0 ; }int main (void ) { -char filename[PATH_MAX ]; +char filename[PATH_MAX ], filepath[PATH_MAX -5 ];int pid[NUM_CHILDREN ];int num_children =1 ;int i; +int ret =-1 ;
testcases/kernel/io/ltp-aiodio/dio_append.c void dio_append(char *filename) · line 124
Quoted 10 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +8
-1-snprintf (filename,sizeof (filename),"%s/aiodio/file" , +snprintf (filepath,sizeof (filepath),"%s/aiodio" ,getenv ("TMP" ) ?getenv ("TMP" ) :"/tmp" ); + +if (access (filepath,F_OK ) ==-1 ) { +char command[PATH_MAX +10 ]; + +snprintf (command,sizeof (command),"mkdir -p %s" , filepath); +if (system (command) !=0 ) +return 1 ;
just only call mkdir syscall instead of command.
Quoted 19 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +5
-2+ } + +snprintf (filename,sizeof (filename),"%s/file" , filepath);printf ("Begin dio_append test...\n" );@@ -134,10 +146,10 @@ int main(void)* Parent appends to end of file using direct i/o */ -dio_append (filename); + ret =dio_append (filename);for (i =0 ; i< num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +return ret; }
Hi Dong
Please see ltp/testcases/kernel/io/ltp-aiodio/README
it said "
Run the ltp-aiodio.sh file to execute all the tests. The tests can also be run individually, just execute the program and the excepted params will be output. No scripts were created to run the test standalone."
So use runltp to excute ltp-aiodio.part4 wasn't supported.
Zorro and Cyril also discuss about ltp-aiodio directory/file non-existed problem. Please see the following url.
https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
Best Regards
Yang Xu
Quoted 98 lines
Hi xuyang
1. if not create directory, in the functiondio_appendThe open file returns a failure, Because the directory "aiodio" does not exist.
2. The mkdir command is called to recursively create directories-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?3? 18:05
???: James Dong (???)<[email protected]>
??: [email protected]
??: Re: [LTP] [PATCH] ltp-aiodio/dio_append: fixdio_append()Hi dong
Quoted 2 lines
When running the
dio_appendtest in the ltp-aiodiio.part4 test item, there was a problem that the file could not be created, but the test result was PASS. To this end, the following operations have been added.
1. create the directory where the file is located.Why need to create directory?
Quoted 53 lines
2. rewrite the
dio_appendAPI. Add relevant return values.Signed-off-by dongshijiang<[email protected]>--- testcases/kernel/io/ltp-aiodio/dio_append.c | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)testcases/kernel/io/ltp-aiodio/dio_append.c +6
-4@@ -75,7 +75,7 @@ int read_eof(char *filename)return 0 ; } -void dio_append (char *filename) +int dio_append (char *filename) {int fd;void *bufptr;@@ -86,14 +86,14 @@ void dio_append(char *filename)if (fd<0 ) {perror ("cannot create file" ); -return ; +return 1 ; }TEST (posix_memalign (&bufptr,4096 ,64 *1024 ));if (TEST_RETURN ) {tst_resm (TBROK |TRERRNO ,"cannot malloc aligned memory" );close (fd); -return ; +return 1 ; }memset (bufptr,0 ,64 *1024 );@@ -102,17 +102,29 @@ void dio_append(char *filename)fprintf (stderr,"write %d returned %d\n" , i, w); } } +return 0 ; }int main (void ) { -char filename[PATH_MAX ]; +char filename[PATH_MAX ], filepath[PATH_MAX -5 ];int pid[NUM_CHILDREN ];int num_children =1 ;int i; +int ret =-1 ;testcases/kernel/io/ltp-aiodio/dio_append.c void dio_append(char *filename) · line 124
Quoted 10 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +8
-1-snprintf (filename,sizeof (filename),"%s/aiodio/file" , +snprintf (filepath,sizeof (filepath),"%s/aiodio" ,getenv ("TMP" ) ?getenv ("TMP" ) :"/tmp" ); + +if (access (filepath,F_OK ) ==-1 ) { +char command[PATH_MAX +10 ]; + +snprintf (command,sizeof (command),"mkdir -p %s" , filepath); +if (system (command) !=0 ) +return 1 ;just only call mkdir syscall instead of command.
Quoted 19 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +5
-2+ } + +snprintf (filename,sizeof (filename),"%s/file" , filepath);printf ("Begin dio_append test...\n" );@@ -134,10 +146,10 @@ int main(void)* Parent appends to end of file using direct i/o */ -dio_append (filename); + ret =dio_append (filename);for (i =0 ; i< num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +return ret; }
Hi xuyang
Thank you very much for your reply, but I think we should add the judgment of the return value in the "dio_append" function, because the final return value is 0 regardless of whether the test item passes or not, and 0 means PASS.
-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?4? 9:44
???: James Dong (???) <[email protected]>
??: [email protected]
??: Re: ??: [LTP] [PATCH] ltp-aiodio/dio_append: fix dio_append()
Hi Dong
Please see ltp/testcases/kernel/io/ltp-aiodio/README
it said "
Run the ltp-aiodio.sh file to execute all the tests. The tests can also be run individually, just execute the program and the excepted params will be output. No scripts were created to run the test standalone."
So use runltp to excute ltp-aiodio.part4 wasn't supported.
Zorro and Cyril also discuss about ltp-aiodio directory/file non-existed problem. Please see the following url.
https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
Best Regards
Yang Xu
Quoted 99 lines
Hi xuyang
1. if not create directory, in the functiondio_appendThe open file returns a failure, Because the directory "aiodio" does not exist.
2. The mkdir command is called to recursively create directories-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?3? 18:05
???: James Dong (???)<[email protected]>
??: [email protected]
??: Re: [LTP] [PATCH] ltp-aiodio/dio_append: fixdio_append()Hi dong
Quoted 2 lines
When running the
dio_appendtest in the ltp-aiodiio.part4 test item, there was a problem that the file could not be created, but the test result was PASS. To this end, the following operations have been added.
1. create the directory where the file is located.Why need to create directory?
Quoted 54 lines
2. rewrite the
dio_appendAPI. Add relevant return values.Signed-off-by dongshijiang<[email protected]>--- testcases/kernel/io/ltp-aiodio/dio_append.c | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)testcases/kernel/io/ltp-aiodio/dio_append.c +6
-4@@ -75,7 +75,7 @@ int read_eof(char *filename)return 0 ; } -void dio_append (char *filename) +int dio_append (char *filename) {int fd;void *bufptr;@@ -86,14 +86,14 @@ void dio_append(char *filename)if (fd<0 ) {perror ("cannot create file" ); -return ; +return 1 ; }TEST (posix_memalign (&bufptr,4096 ,64 *1024 ));if (TEST_RETURN ) {tst_resm (TBROK |TRERRNO ,"cannot malloc aligned memory" );close (fd); -return ; +return 1 ; }memset (bufptr,0 ,64 *1024 );@@ -102,17 +102,29 @@ void dio_append(char *filename)fprintf (stderr,"write %d returned %d\n" , i, w); } } +return 0 ; }int main (void ) { -char filename[PATH_MAX ]; +char filename[PATH_MAX ], filepath[PATH_MAX -5 ];int pid[NUM_CHILDREN ];int num_children =1 ;int i; +int ret =-1 ;testcases/kernel/io/ltp-aiodio/dio_append.c void dio_append(char *filename) · line 124
Quoted 10 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +8
-1-snprintf (filename,sizeof (filename),"%s/aiodio/file" , +snprintf (filepath,sizeof (filepath),"%s/aiodio" ,getenv ("TMP" ) ?getenv ("TMP" ) :"/tmp" ); + +if (access (filepath,F_OK ) ==-1 ) { +char command[PATH_MAX +10 ]; + +snprintf (command,sizeof (command),"mkdir -p %s" , filepath); +if (system (command) !=0 ) +return 1 ;just only call mkdir syscall instead of command.
Quoted 19 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +5
-2+ } + +snprintf (filename,sizeof (filename),"%s/file" , filepath);printf ("Begin dio_append test...\n" );@@ -134,10 +146,10 @@ int main(void)* Parent appends to end of file using direct i/o */ -dio_append (filename); + ret =dio_append (filename);for (i =0 ; i< num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +return ret; }
Hi Dong
Quoted 3 lines
Hi xuyang
Thank you very much for your reply, but I think we should add the judgment of the return value in the "
dio_append" function, because the final return value is 0 regardless of whether the test item passes or not, and 0 means PASS.
IMO, I don't like perror or printf function and use return value to tell runltp that this case failed. LTP has tst_res() function with different flag and ltp new test framework can check pass/fail/conf number in lib/tst_test.c do_exit function.
A generic fix shound use tst_resm(TFAIL,) and tst_exit function.
testcases/kernel/io/ltp-aiodio/dio_append.c +3 -3
@@ -85,7 +85,7 @@ void dio_append(char *filename) fd =open (filename,O_DIRECT |O_WRONLY |O_CREAT ,0666 );if (fd <0 ) { -perror ("cannot create file" ); +tst_resm (TFAIL ,"cannot create file %s" , filename);return ; }
@@ -99,7 +99,7 @@ void dio_append(char *filename)memset (bufptr,0 ,64 *1024 );for (i =0 ; i <1000 ; i++) {if ((w =write (fd, bufptr,64 *1024 )) !=64 *1024 ) { -fprintf (stderr,"write %d returned %d\n" , i, w); +tst_resm (TFAIL ,"write %d returned %d" , i, w); } } }
@@ -139,5 +139,5 @@ int main(void)for (i =0 ; i < num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +tst_exit (); }
It also need sto use setup and cleanup function. But it is old test api. I guess we can use new api to do it.
@Cyril, Petr, Li
I think it is time to convert the whole ltp-aiodio cases into new api and we still can use ltp-aiodio.sh.
Best Regards
Yang Xu
Quoted 121 lines
-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?4? 9:44
???: James Dong (???)<[email protected]>
??: [email protected]
??: Re: ??: [LTP] [PATCH] ltp-aiodio/dio_append: fixdio_append()Hi Dong
Please see ltp/testcases/kernel/io/ltp-aiodio/README
it said "
Run theltp-aiodio.shfile to execute all the tests. The tests can also be run individually, just execute the program and the excepted params will be output. No scripts were created to run the test standalone."So use runltp to excute ltp-aiodio.part4 wasn't supported.
Zorro and Cyril also discuss about ltp-aiodio directory/file non-existed problem. Please see the following url.
https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/Best Regards
Yang XuQuoted 99 lines
Hi xuyang
1. if not create directory, in the functiondio_appendThe open file returns a failure, Because the directory "aiodio" does not exist.
2. The mkdir command is called to recursively create directories-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?3? 18:05
???: James Dong (???)<[email protected]>
??: [email protected]
??: Re: [LTP] [PATCH] ltp-aiodio/dio_append: fixdio_append()Hi dong
Quoted 2 lines
When running the
dio_appendtest in the ltp-aiodiio.part4 test item, there was a problem that the file could not be created, but the test result was PASS. To this end, the following operations have been added.
1. create the directory where the file is located.Why need to create directory?
Quoted 54 lines
2. rewrite the
dio_appendAPI. Add relevant return values.Signed-off-by dongshijiang<[email protected]>--- testcases/kernel/io/ltp-aiodio/dio_append.c | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)testcases/kernel/io/ltp-aiodio/dio_append.c +6
-4@@ -75,7 +75,7 @@ int read_eof(char *filename)return 0 ; } -void dio_append (char *filename) +int dio_append (char *filename) {int fd;void *bufptr;@@ -86,14 +86,14 @@ void dio_append(char *filename)if (fd<0 ) {perror ("cannot create file" ); -return ; +return 1 ; }TEST (posix_memalign (&bufptr,4096 ,64 *1024 ));if (TEST_RETURN ) {tst_resm (TBROK |TRERRNO ,"cannot malloc aligned memory" );close (fd); -return ; +return 1 ; }memset (bufptr,0 ,64 *1024 );@@ -102,17 +102,29 @@ void dio_append(char *filename)fprintf (stderr,"write %d returned %d\n" , i, w); } } +return 0 ; }int main (void ) { -char filename[PATH_MAX ]; +char filename[PATH_MAX ], filepath[PATH_MAX -5 ];int pid[NUM_CHILDREN ];int num_children =1 ;int i; +int ret =-1 ;testcases/kernel/io/ltp-aiodio/dio_append.c void dio_append(char *filename) · line 124
Quoted 10 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +8
-1-snprintf (filename,sizeof (filename),"%s/aiodio/file" , +snprintf (filepath,sizeof (filepath),"%s/aiodio" ,getenv ("TMP" ) ?getenv ("TMP" ) :"/tmp" ); + +if (access (filepath,F_OK ) ==-1 ) { +char command[PATH_MAX +10 ]; + +snprintf (command,sizeof (command),"mkdir -p %s" , filepath); +if (system (command) !=0 ) +return 1 ;just only call mkdir syscall instead of command.
Quoted 19 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +5
-2+ } + +snprintf (filename,sizeof (filename),"%s/file" , filepath);printf ("Begin dio_append test...\n" );@@ -134,10 +146,10 @@ int main(void)* Parent appends to end of file using direct i/o */ -dio_append (filename); + ret =dio_append (filename);for (i =0 ; i< num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +return ret; }
Hi xuyang
Thank you very much for your reply, I understand
-----????-----
???: [email protected] [mailto:[email protected]]
????: 2021?6?4? 11:53
???: James Dong (???) <[email protected]>; Cyril Hrubis <[email protected]>; Petr Vorel <[email protected]>; Li Wang <[email protected]> ??: [email protected]
??: Re: ??: ??: [LTP] [PATCH] ltp-aiodio/dio_append: fix dio_append()
Hi Dong
Quoted 3 lines
Hi xuyang
Thank you very much for your reply, but I think we should add the judgment of the return value in the "
dio_append" function, because the final return value is 0 regardless of whether the test item passes or not, and 0 means PASS.
IMO, I don't like perror or printf function and use return value to tell runltp that this case failed. LTP has tst_res() function with different flag and ltp new test framework can check pass/fail/conf number in lib/tst_test.c do_exit function.
A generic fix shound use tst_resm(TFAIL,) and tst_exit function.
testcases/kernel/io/ltp-aiodio/dio_append.c +3 -3
@@ -85,7 +85,7 @@ void dio_append(char *filename) fd =open (filename,O_DIRECT |O_WRONLY |O_CREAT ,0666 );if (fd <0 ) { -perror ("cannot create file" ); +tst_resm (TFAIL ,"cannot create file %s" , filename);return ; }
@@ -99,7 +99,7 @@ void dio_append(char *filename)memset (bufptr,0 ,64 *1024 );for (i =0 ; i <1000 ; i++) {if ((w =write (fd, bufptr,64 *1024 )) !=64 *1024 ) { -fprintf (stderr,"write %d returned %d\n" , i, w); +tst_resm (TFAIL ,"write %d returned %d" , i, w); } } }
@@ -139,5 +139,5 @@ int main(void)for (i =0 ; i < num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +tst_exit (); }
It also need sto use setup and cleanup function. But it is old test api. I guess we can use new api to do it.
@Cyril, Petr, Li
I think it is time to convert the whole ltp-aiodio cases into new api and we still can use ltp-aiodio.sh.
Best Regards
Yang Xu
Quoted 122 lines
-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?4? 9:44
???: James Dong (???)<[email protected]>
??: [email protected]
??: Re: ??: [LTP] [PATCH] ltp-aiodio/dio_append: fixdio_append()Hi Dong
Please see ltp/testcases/kernel/io/ltp-aiodio/README
it said "
Run theltp-aiodio.shfile to execute all the tests. The tests can also be run individually, just execute the program and the excepted params will be output. No scripts were created to run the test standalone."So use runltp to excute ltp-aiodio.part4 wasn't supported.
Zorro and Cyril also discuss about ltp-aiodio directory/file non-existed problem. Please see the following url.
https://patchwork.ozlabs.org/project/ltp/patch/20210601155427.996321-1
[email protected]/Best Regards
Yang XuQuoted 99 lines
Hi xuyang
1. if not create directory, in the functiondio_appendThe open file returns a failure, Because the directory "aiodio" does not exist.
2. The mkdir command is called to recursively create directories-----????-----
???: [email protected] [mailto:[email protected]] ????: 2021?6?3? 18:05
???: James Dong (???)<[email protected]>
??: [email protected]
??: Re: [LTP] [PATCH] ltp-aiodio/dio_append: fixdio_append()Hi dong
Quoted 2 lines
When running the
dio_appendtest in the ltp-aiodiio.part4 test item, there was a problem that the file could not be created, but the test result was PASS. To this end, the following operations have been added.
1. create the directory where the file is located.Why need to create directory?
Quoted 54 lines
2. rewrite the
dio_appendAPI. Add relevant return values.Signed-off-by dongshijiang<[email protected]>--- testcases/kernel/io/ltp-aiodio/dio_append.c | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)testcases/kernel/io/ltp-aiodio/dio_append.c +6
-4@@ -75,7 +75,7 @@ int read_eof(char *filename)return 0 ; } -void dio_append (char *filename) +int dio_append (char *filename) {int fd;void *bufptr;@@ -86,14 +86,14 @@ void dio_append(char *filename)if (fd<0 ) {perror ("cannot create file" ); -return ; +return 1 ; }TEST (posix_memalign (&bufptr,4096 ,64 *1024 ));if (TEST_RETURN ) {tst_resm (TBROK |TRERRNO ,"cannot malloc aligned memory" );close (fd); -return ; +return 1 ; }memset (bufptr,0 ,64 *1024 );@@ -102,17 +102,29 @@ void dio_append(char *filename)fprintf (stderr,"write %d returned %d\n" , i, w); } } +return 0 ; }int main (void ) { -char filename[PATH_MAX ]; +char filename[PATH_MAX ], filepath[PATH_MAX -5 ];int pid[NUM_CHILDREN ];int num_children =1 ;int i; +int ret =-1 ;testcases/kernel/io/ltp-aiodio/dio_append.c void dio_append(char *filename) · line 124
Quoted 10 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +8
-1-snprintf (filename,sizeof (filename),"%s/aiodio/file" , +snprintf (filepath,sizeof (filepath),"%s/aiodio" ,getenv ("TMP" ) ?getenv ("TMP" ) :"/tmp" ); + +if (access (filepath,F_OK ) ==-1 ) { +char command[PATH_MAX +10 ]; + +snprintf (command,sizeof (command),"mkdir -p %s" , filepath); +if (system (command) !=0 ) +return 1 ;just only call mkdir syscall instead of command.
Quoted 19 lines
testcases/kernel/io/ltp-aiodio/dio_append.c +5
-2+ } + +snprintf (filename,sizeof (filename),"%s/file" , filepath);printf ("Begin dio_append test...\n" );@@ -134,10 +146,10 @@ int main(void)* Parent appends to end of file using direct i/o */ -dio_append (filename); + ret =dio_append (filename);for (i =0 ; i< num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +return ret; }
Hi Xu, Dong,
Quoted 9 lines
Hi Dong
Quoted 3 lines
Hi xuyang
Thank you very much for your reply, but I think we should add the judgment of the return value in the "
dio_append" function, because the final return value is 0 regardless of whether the test item passes or not, and 0 means PASS.IMO, I don't like perror or printf function and use return value to tell runltp that this case failed. LTP has
tst_res()function with different flag and ltp new test framework can check pass/fail/conf number inlib/tst_test.cdo_exitfunction.
+1
Quoted 29 lines
A generic fix shound use
tst_resm(TFAIL,)andtst_exitfunction.testcases/kernel/io/ltp-aiodio/dio_append.c +3
-3@@ -85,7 +85,7 @@ void dio_append(char *filename) fd =open (filename,O_DIRECT |O_WRONLY |O_CREAT ,0666 );if (fd <0 ) { -perror ("cannot create file" ); +tst_resm (TFAIL ,"cannot create file %s" , filename);return ; }@@ -99,7 +99,7 @@ void dio_append(char *filename)memset (bufptr,0 ,64 *1024 );for (i =0 ; i <1000 ; i++) {if ((w =write (fd, bufptr,64 *1024 )) !=64 *1024 ) { -fprintf (stderr,"write %d returned %d\n" , i, w); +tst_resm (TFAIL ,"write %d returned %d" , i, w); } } }@@ -139,5 +139,5 @@ int main(void)for (i =0 ; i < num_children; i++) {kill (pid[i],SIGTERM ); } -return 0 ; +tst_exit (); }
Quoted 5 lines
It also need sto use setup and cleanup function. But it is old test api. I guess we can use new api to do it.
@Cyril, Petr, Li
I think it is time to convert the whole ltp-aiodio cases into new api
+1. Although these tests fail on mainline, thus it's a question how to fix them. Also they might are already covered in xfstests [1], it'd be better to ask in fstests ML [2].
Quoted 1 line
and we still can use
ltp-aiodio.sh.
If we decide to keep aiodio, it might be worth to tranform this somehow into runltp-ng [3].
Kind regards,
Petr
[1] https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/
[2] https://lore.kernel.org/fstests/
[3] https://github.com/metan-ucw/runltp-ng
Quoted 2 lines
Best Regards
Yang Xu
...