ptest: Various memory fixes and enhancements
cover ptest: Various memory fixes and enhancements
This patch series provides some memory management fixes and corrected return code handling for ptest-runner2.
Adrian Freihofer (4):
git: Extend the gitignore
mem: Fix memleak for ptest_opts
mem: Simplify memory management
mem: Refactor ptest_list cleanup
Lukasz Majewski (1):
main: Do not return number of failed tests when calling ptest-runner
.gitignore | 3 +++ main.c | 33 ++++++++++++++++++++++++++++----- ptest_list.c | 13 ++++--------- ptest_list.h | 8 +------- tests/ptest_list.c | 13 +++++++------ tests/utils.c | 22 +++++++++++----------- utils.c | 11 ++++------- 7 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 .gitignore
Signature · 1 line
2.20.1
PATCH 1/5 git: Extend the gitignore
From: Adrian Freihofer <[email protected]>
--- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore
.gitignore new file +3 -0
@@ -0,0 +1,3 @@ +*.o +ptest-runner +ptest-runner-test
Signature · 1 line
2.20.1
Anibal Limon
AppliedRe: [yocto] [ptest-runner 1/5] git: Extend the gitignore
Applied, Thanks!, Anibal.
Quoted 24 lines · ?ukasz Majewski
From: Adrian Freihofer <[email protected]>
Signed-off-by Adrian Freihofer <[email protected]>--- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore.gitignore new file +3
-1@@ -0,0 +1,3 @@ +*.o +ptest-runner +ptest-runner-test --2.20.1
PATCH 2/5 mem: Fix memleak for ptest_opts
In reply to ?ukasz MajewskiFrom: Adrian Freihofer <[email protected]>
make && valgrind -s --leak-check=full ./ptest-runner -d tests/data2
==4154029== HEAP SUMMARY:
==4154029== in use at exit: 20 bytes in 2 blocks
==4154029== total heap usage: 45 allocs, 43 frees, 42,909 bytes allocated
==4154029==
==4154029== 20 (8 direct, 12 indirect) bytes in 1 blocks are definitely lost in loss record 2 of 2
==4154029== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154029== by 0x40252D: str2array (main.c:70) ==4154029== by 0x402768: main (main.c:119)
==4154029==
==4154029== LEAK SUMMARY:
==4154029== definitely lost: 8 bytes in 1 blocks
==4154029== indirectly lost: 12 bytes in 1 blocks
==4154029== possibly lost: 0 bytes in 0 blocks
==4154029== still reachable: 0 bytes in 0 blocks
==4154029== suppressed: 0 bytes in 0 blocks
==4154029==
==4154029== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
With this patch valgrind reports 0 errors.
--- main.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
main.c +20 -1
@@ -84,6 +84,25 @@ str2array(char *str, const char *delim, int *num)return array; } +void cleanup_ptest_opts (struct ptest_options *opts) +{ +for (int i=0 ; i < opts->dirs_no; i++) +free (opts->dirs[i]); + +free (opts->dirs); + opts->dirs =NULL ; + +if (opts->ptests) { +free (opts->ptests); + opts->ptests =NULL ; + } + +if (opts->xml_filename) { +free (opts->xml_filename); + opts->xml_filename =NULL ; + } +} +int main (int argc,char *argv[]) {
@@ -98,7 +117,7 @@ main(int argc, char *argv[])#endif struct ptest_list *head, *run; -struct ptest_options opts; + __attribute__ ((__cleanup__ (cleanup_ptest_opts)))struct ptest_options opts; opts.dirs =malloc (sizeof (char **) *1 );CHECK_ALLOCATION (opts.dirs,1 ,1 );
Signature · 1 line
2.20.1
Re: [yocto] [ptest-runner 2/5] mem: Fix memleak for ptest_opts
Hi,
In a normal execution this memleak doesn't have a bad effect in practical terms because at end of the program the memory will be free'd.
I'm fine to pick this patch.
Regards,
Anibal
Quoted 77 lines · ?ukasz Majewski
From: Adrian Freihofer <[email protected]>
make && valgrind -s --leak-check=full ./ptest-runner -d tests/data2
==4154029== HEAP SUMMARY:
==4154029== in use at exit: 20 bytes in 2 blocks
==4154029== total heap usage: 45 allocs, 43 frees, 42,909 bytes allocated
==4154029==
==4154029== 20 (8 direct, 12 indirect) bytes in 1 blocks are definitely lost in loss record 2 of 2==4154029== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154029== by 0x40252D: str2array (main.c:70) ==4154029== by 0x402768: main (main.c:119)==4154029==
==4154029== LEAK SUMMARY:
==4154029== definitely lost: 8 bytes in 1 blocks
==4154029== indirectly lost: 12 bytes in 1 blocks
==4154029== possibly lost: 0 bytes in 0 blocks
==4154029== still reachable: 0 bytes in 0 blocks
==4154029== suppressed: 0 bytes in 0 blocks
==4154029==
==4154029== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)With this patch valgrind reports 0 errors.
Signed-off-by Adrian Freihofer <[email protected]>--- main.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)main.c +20
-1@@ -84,6 +84,25 @@ str2array(char *str, const char *delim, int *num)return array; } +void cleanup_ptest_opts (struct ptest_options *opts) +{ +for (int i=0 ; i < opts->dirs_no; i++) +free (opts->dirs[i]); + +free (opts->dirs); + opts->dirs =NULL ; + +if (opts->ptests) { +free (opts->ptests); + opts->ptests =NULL ; + } + +if (opts->xml_filename) { +free (opts->xml_filename); + opts->xml_filename =NULL ; + } +} +int main (int argc,char *argv[]) {@@ -98,7 +117,7 @@ main(int argc, char *argv[])#endif struct ptest_list *head, *run; -struct ptest_options opts; + __attribute__ ((__cleanup__ (cleanup_ptest_opts)))struct ptest_options opts; opts.dirs =malloc (sizeof (char **) *1 );CHECK_ALLOCATION(opts.dirs, 1, 1);--
2.20.1
PATCH 3/5 mem: Simplify memory management
In reply to ?ukasz MajewskiFrom: Adrian Freihofer <[email protected]>
Removes the following warnings thrown by
make && valgrind -s --leak-check=full ./ptest-runner -d tests/data2
==4154390== Invalid write of size 8
==4154390== at 0x40360D: run_child (utils.c:357) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== Address 0x4a66440 is 0 bytes inside a block of size 2 alloc'd ==4154390== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154390== by 0x4035E4: run_child (utils.c:354) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== ==4154390== Invalid write of size 8 ==4154390== at 0x403618: run_child (utils.c:358) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== Address 0x4a66448 is 6 bytes after a block of size 2 alloc'd ==4154390== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154390== by 0x4035E4: run_child (utils.c:354) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== ==4154390== Syscall param execve(argv) points to unaddressable byte(s) ==4154390== at 0x4955C2B: execve (in /usr/lib64/libc-2.32.so) ==4154390== by 0x40365E: run_child (utils.c:368) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== Address 0x4a66442 is 0 bytes after a block of size 2 alloc'd ==4154390== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154390== by 0x4035E4: run_child (utils.c:354) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223)
--- utils.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
utils.c +1 -4
@@ -351,12 +351,9 @@ read_child(void *arg)static inline void run_child (char *run_ptest,int fd_stdout,int fd_stderr) { -char **argv =malloc (sizeof (char ) *2 ); +char *const argv[2 ] = {run_ptest,NULL };chdir (dirname (strdup (run_ptest))); - argv[0 ] = run_ptest; - argv[1 ] =NULL ; -dup2 (fd_stdout,STDOUT_FILENO );// XXX: Redirect stderr to stdout to avoid buffer ordering problems. dup2 (fd_stdout,STDERR_FILENO );
Signature · 1 line
2.20.1
Anibal Limon
AppliedRe: [yocto] [ptest-runner 3/5] mem: Simplify memory management
Applied, Thanks!,
Quoted 67 lines · ?ukasz Majewski
From: Adrian Freihofer <[email protected]>
Removes the following warnings thrown by
make && valgrind -s --leak-check=full ./ptest-runner -d tests/data2==4154390== Invalid write of size 8
==4154390== at 0x40360D: run_child (utils.c:357) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== Address 0x4a66440 is 0 bytes inside a block of size 2 alloc'd ==4154390== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154390== by 0x4035E4: run_child (utils.c:354) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== ==4154390== Invalid write of size 8 ==4154390== at 0x403618: run_child (utils.c:358) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== Address 0x4a66448 is 6 bytes after a block of size 2 alloc'd ==4154390== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154390== by 0x4035E4: run_child (utils.c:354) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== ==4154390== Syscall param execve(argv) points to unaddressable byte(s) ==4154390== at 0x4955C2B: execve (in /usr/lib64/libc-2.32.so) ==4154390== by 0x40365E: run_child (utils.c:368) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223) ==4154390== Address 0x4a66442 is 0 bytes after a block of size 2 alloc'd ==4154390== at 0x4839809: malloc (vg_replace_malloc.c:307) ==4154390== by 0x4035E4: run_child (utils.c:354) ==4154390== by 0x403C5B: run_ptests (utils.c:534) ==4154390== by 0x402C4D: main (main.c:223)Signed-off-by Adrian Freihofer <[email protected]>--- utils.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)utils.c +1
-4@@ -351,12 +351,9 @@ read_child(void *arg)static inline void run_child (char *run_ptest,int fd_stdout,int fd_stderr) { -char **argv =malloc (sizeof (char ) *2 ); +char *const argv[2 ] = {run_ptest,NULL };chdir (dirname (strdup (run_ptest))); - argv[0 ] = run_ptest; - argv[1 ] =NULL ; -dup2 (fd_stdout,STDOUT_FILENO );// XXX: Redirect stderr to stdout to avoid buffer ordering problems.
dup2(fd_stdout, STDERR_FILENO);--
2.20.1
PATCH 4/5 mem: Refactor ptest_list cleanup
In reply to ?ukasz MajewskiFrom: Adrian Freihofer <[email protected]>
Try to make memory management more robust by assigning always NULL to struct ptest_list pointers. It's a refactoring which probably improves the code but does not fix a concrete bug.
--- main.c | 9 +++++---- ptest_list.c | 13 ++++--------- ptest_list.h | 8 +------- tests/ptest_list.c | 13 +++++++------ tests/utils.c | 22 +++++++++++----------- utils.c | 6 +++--- 6 files changed, 31 insertions(+), 40 deletions(-)
main.c +5 -4
@@ -116,7 +116,8 @@ main(int argc, char *argv[])mtrace ();#endif -struct ptest_list *head, *run; +struct ptest_list *head =NULL ; +struct ptest_list *run =NULL ; __attribute__ ((__cleanup__ (cleanup_ptest_opts)))struct ptest_options opts; opts.dirs =malloc (sizeof (char **) *1 );
@@ -175,7 +176,7 @@ main(int argc, char *argv[]) head =NULL ;for (i =0 ; i < opts.dirs_no; i ++) { -struct ptest_list *tmp; +struct ptest_list *tmp =NULL ; tmp =get_available_ptests (opts.dirs[i], opts.timeout);if (tmp ==NULL ) {
@@ -211,7 +212,7 @@ main(int argc, char *argv[]) run =filter_ptests (head, opts.ptests, ptest_num);CHECK_ALLOCATION (run, (size_t ) ptest_num,1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }for (i =0 ; i < ptest_exclude_num; i++)
@@ -219,7 +220,7 @@ main(int argc, char *argv[]) rc =run_ptests (run, opts, argv[0 ], stdout, stderr); -ptest_list_free_all (run); +ptest_list_free_all (&run);return rc; }
ptest_list.c +4 -9
@@ -69,24 +69,19 @@ ptest_list_free(struct ptest_list *p)free (p); } -int -ptest_list_free_all (struct ptest_list *head) +void +ptest_list_free_all (struct ptest_list **head) { -int i =0 ;struct ptest_list *p, *q; -VALIDATE_PTR_RINT (head); - - p = head; + p = *head;while (p !=NULL ) { q = p; p = p->next;ptest_list_free (q); - i++; } - -return i; + *head =NULL ; }int
ptest_list.h +1 -7
@@ -36,12 +36,6 @@ x =NULL ; \ } while (0) -#define PTEST_LIST_FREE_ALL_CLEAN (x) \ - do { \ - ptest_list_free_all(x); \ - x = NULL; \ - } while (0) -#define PTEST_LIST_ITERATE_START (head, p) for (p = head->next; p != NULL; p = p->next) {#define PTEST_LIST_ITERATE_END }
@@ -58,7 +52,7 @@ struct ptest_list {extern struct ptest_list *ptest_list_alloc (void );extern void ptest_list_free (struct ptest_list *); -extern int ptest_list_free_all (struct ptest_list *); +extern void ptest_list_free_all (struct ptest_list **);extern int ptest_list_length (struct ptest_list *);extern struct ptest_list *ptest_list_search (struct ptest_list *,char *);
tests/ptest_list.c +7 -6
@@ -53,7 +53,7 @@ START_TEST(test_add) {struct ptest_list *head =ptest_list_alloc ();ck_assert (ptest_list_add (head,strdup ("perl" ),NULL ,1 ) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST
@@ -62,14 +62,15 @@ START_TEST(test_free_all)struct ptest_list *head =NULL ;int i; -ck_assert (ptest_list_free_all (head) ==-1 ); +ptest_list_free_all (&head); +ck_assert (head ==NULL );ck_assert (errno ==EINVAL ); head =ptest_list_alloc ();for (i =0 ; i < ptests_num; i++)ptest_list_add (head,strdup (ptest_names[i]),NULL ,1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST
@@ -87,7 +88,7 @@ START_TEST(test_length)ptest_list_add (head,strdup (ptest_names[i]),NULL ,1 );ck_assert_int_eq (ptest_list_length (head), ptests_num); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST
@@ -109,7 +110,7 @@ START_TEST(test_search)for (i = ptests_num -1 ; i >=0 ; i--)ck_assert (ptest_list_search (head, ptest_names[i]) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST
@@ -141,7 +142,7 @@ START_TEST(test_remove)ck_assert_int_eq (ptest_list_length (head), n);ck_assert (ptest_list_search (head,"busybox" ) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST
tests/utils.c +11 -11
@@ -88,13 +88,13 @@ START_TEST(test_get_available_ptests)for (i =0 ; ptests_not_found[i] !=NULL ; i++)ck_assert (ptest_list_search (head, ptests_not_found[i]) ==NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST START_TEST (test_print_ptests ) { -struct ptest_list *head; +struct ptest_list *head =NULL ;char *buf;size_t size =PRINT_PTEST_BUF_SIZE ;
@@ -116,14 +116,14 @@ START_TEST(test_print_ptests) head =ptest_list_alloc ();ck_assert (print_ptests (head, fp) ==1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); line =fgets (line_buf,PRINT_PTEST_BUF_SIZE , fp);ck_assert (line !=NULL );ck_assert (strcmp (line,PRINT_PTESTS_NOT_FOUND ) ==0 ); head =get_available_ptests (opts_directory,1 );ck_assert (print_ptests (head, fp) ==0 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); line =fgets (line_buf,PRINT_PTEST_BUF_SIZE , fp);ck_assert (line !=NULL );ck_assert (strcmp (line,PRINT_PTESTS_AVAILABLE ) ==0 );
@@ -144,7 +144,7 @@ END_TESTSTART_TEST (test_filter_ptests) {struct ptest_list *head =get_available_ptests (opts_directory,1 ); -struct ptest_list *head_new; +struct ptest_list *head_new =NULL ;char *ptest_not_exists[] = {"glib" , };
@@ -161,8 +161,8 @@ START_TEST(test_filter_ptests)ck_assert (head_new !=NULL );ck_assert (ptest_list_length (head_new) ==3 ); -ptest_list_free_all (head); -ptest_list_free_all (head_new); +ptest_list_free_all (&head); +ptest_list_free_all (&head_new); }END_TEST
@@ -191,7 +191,7 @@ START_TEST(test_run_ptests) rc =run_ptests (head, opts,"test_run_ptests" , fp_stdout, fp_stderr);ck_assert (rc ==0 ); -ptest_list_free_all (head); +ptest_list_free_all (&head);fclose (fp_stdout);free (buf_stdout);
@@ -227,7 +227,7 @@ START_TEST(test_run_timeout_duration_ptest)test_ptest_expected_failure (head, timeout,"hang" , search_for_timeout_and_duration); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST
@@ -255,7 +255,7 @@ START_TEST(test_run_fail_ptest)test_ptest_expected_failure (head, timeout,"fail" , search_for_fail); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST
@@ -354,7 +354,7 @@ test_ptest_expected_failure(struct ptest_list *head, const int timeout, char *prfp_stdout ); -PTEST_LIST_FREE_ALL_CLEAN (filtered); +ptest_list_free_all (&filtered); }fclose (fp_stdout);
utils.c +3 -3
@@ -110,7 +110,7 @@ get_ptest_file(char **ptest_file, struct stat *st_buf, const char *main_dir,struct ptest_list *get_available_ptests (const char *dir,int global_timeout) { -struct ptest_list *head; +struct ptest_list *head =NULL ;struct stat st_buf;int n, i;
@@ -212,7 +212,7 @@ get_available_ptests(const char *dir, int global_timeout)free (namelist);if (fail) { -PTEST_LIST_FREE_ALL_CLEAN (head); +ptest_list_free_all (&head); errno = saved_errno;break ; }
@@ -282,7 +282,7 @@ filter_ptests(struct ptest_list *head, char **ptests, int ptest_num) }if (fail) { -PTEST_LIST_FREE_ALL_CLEAN (head_new); +ptest_list_free_all (&head_new); errno = saved_errno; } }while (0 );
Signature · 1 line
2.20.1
Anibal Limon
AppliedRe: [yocto] [ptest-runner 4/5] mem: Refactor ptest_list cleanup
Indeed this change doesn't has a direct impact but is fine to me.
Applied, Thanks!
Quoted 315 lines · ?ukasz Majewski
From: Adrian Freihofer <[email protected]>
Try to make memory management more robust by assigning always NULL to struct
ptest_listpointers. It's a refactoring which probably improves the code but does not fix a concrete bug.Signed-off-by Adrian Freihofer <[email protected]>--- main.c | 9 +++++---- ptest_list.c | 13 ++++--------- ptest_list.h | 8 +------- tests/ptest_list.c | 13 +++++++------ tests/utils.c | 22 +++++++++++----------- utils.c | 6 +++--- 6 files changed, 31 insertions(+), 40 deletions(-)main.c +2
-1@@ -116,7 +116,8 @@ main(int argc, char *argv[])mtrace ();#endif -struct ptest_list *head, *run; +struct ptest_list *head =NULL ; +struct ptest_list *run =NULL ; __attribute__ ((__cleanup__ (cleanup_ptest_opts)))struct ptest_options opts;opts.dirs = malloc(sizeof(char **) * 1);main.c +3
-3@@ -175,7 +176,7 @@ main(int argc, char *argv[]) head =NULL ;for (i =0 ; i < opts.dirs_no; i ++) { -struct ptest_list *tmp; +struct ptest_list *tmp =NULL ; tmp =get_available_ptests (opts.dirs[i], opts.timeout);if (tmp ==NULL ) {@@ -211,7 +212,7 @@ main(int argc, char *argv[]) run =filter_ptests (head, opts.ptests, ptest_num);CHECK_ALLOCATION (run, (size_t ) ptest_num,1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }for (i =0 ; i < ptest_exclude_num; i++)@@ -219,7 +220,7 @@ main(int argc, char *argv[]) rc =run_ptests (run, opts, argv[0 ], stdout, stderr); -ptest_list_free_all (run); +ptest_list_free_all (&run);return rc; }ptest_list.c +4
-9@@ -69,24 +69,19 @@ ptest_list_free(struct ptest_list *p)free (p); } -int -ptest_list_free_all (struct ptest_list *head) +void +ptest_list_free_all (struct ptest_list **head) { -int i =0 ;struct ptest_list *p, *q; -VALIDATE_PTR_RINT (head); - - p = head; + p = *head;while (p !=NULL ) { q = p; p = p->next;ptest_list_free (q); - i++; } - -return i; + *head =NULL ; }int ptest_list.h +1
-7@@ -36,12 +36,6 @@ x =NULL ; \ } while (0) -#define PTEST_LIST_FREE_ALL_CLEAN (x) \ - do { \ - ptest_list_free_all(x); \ - x = NULL; \ - } while (0) -#define PTEST_LIST_ITERATE_START (head, p) for (p = head->next; p != NULL; p = p->next) {#define PTEST_LIST_ITERATE_END }@@ -58,7 +52,7 @@ struct ptest_list {extern struct ptest_list *ptest_list_alloc (void );extern void ptest_list_free (struct ptest_list *); -extern int ptest_list_free_all (struct ptest_list *); +extern void ptest_list_free_all (struct ptest_list **);extern int ptest_list_length (struct ptest_list *);extern struct ptest_list *ptest_list_search (struct ptest_list *,char *);tests/ptest_list.c +7
-6@@ -53,7 +53,7 @@ START_TEST(test_add) {struct ptest_list *head =ptest_list_alloc ();ck_assert (ptest_list_add (head,strdup ("perl" ),NULL ,1 ) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -62,14 +62,15 @@ START_TEST(test_free_all)struct ptest_list *head =NULL ;int i; -ck_assert (ptest_list_free_all (head) ==-1 ); +ptest_list_free_all (&head); +ck_assert (head ==NULL );ck_assert (errno ==EINVAL ); head =ptest_list_alloc ();for (i =0 ; i < ptests_num; i++)ptest_list_add (head,strdup (ptest_names[i]),NULL ,1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -87,7 +88,7 @@ START_TEST(test_length)ptest_list_add (head,strdup (ptest_names[i]),NULL ,1 );ck_assert_int_eq (ptest_list_length (head), ptests_num); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -109,7 +110,7 @@ START_TEST(test_search)for (i = ptests_num -1 ; i >=0 ; i--)ck_assert (ptest_list_search (head, ptest_names[i]) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -141,7 +142,7 @@ START_TEST(test_remove)ck_assert_int_eq (ptest_list_length (head), n);ck_assert (ptest_list_search (head,"busybox" ) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST tests/utils.c +2
-2@@ -88,13 +88,13 @@ START_TEST(test_get_available_ptests)for (i =0 ; ptests_not_found[i] !=NULL ; i++)ck_assert (ptest_list_search (head, ptests_not_found[i]) ==NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST START_TEST (test_print_ptests ) { -struct ptest_list *head; +struct ptest_list *head =NULL ;char *buf;size_t size = PRINT_PTEST_BUF_SIZE;tests/utils.c +6
-6@@ -116,14 +116,14 @@ START_TEST(test_print_ptests) head =ptest_list_alloc ();ck_assert (print_ptests (head, fp) ==1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); line =fgets (line_buf,PRINT_PTEST_BUF_SIZE , fp);ck_assert (line !=NULL );ck_assert (strcmp (line,PRINT_PTESTS_NOT_FOUND ) ==0 ); head =get_available_ptests (opts_directory,1 );ck_assert (print_ptests (head, fp) ==0 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); line =fgets (line_buf,PRINT_PTEST_BUF_SIZE , fp);ck_assert (line !=NULL );ck_assert (strcmp (line,PRINT_PTESTS_AVAILABLE ) ==0 );@@ -144,7 +144,7 @@ END_TESTSTART_TEST (test_filter_ptests) {struct ptest_list *head =get_available_ptests (opts_directory,1 ); -struct ptest_list *head_new; +struct ptest_list *head_new =NULL ;char *ptest_not_exists[] = {"glib" , };@@ -161,8 +161,8 @@ START_TEST(test_filter_ptests)ck_assert (head_new !=NULL );ck_assert (ptest_list_length (head_new) ==3 ); -ptest_list_free_all (head); -ptest_list_free_all (head_new); +ptest_list_free_all (&head); +ptest_list_free_all (&head_new); }END_TEST @@ -191,7 +191,7 @@ START_TEST(test_run_ptests) rc =run_ptests (head, opts,"test_run_ptests" , fp_stdout, fp_stderr);ck_assert (rc ==0 ); -ptest_list_free_all (head); +ptest_list_free_all (&head);fclose (fp_stdout);free(buf_stdout);tests/utils.c +2
-2@@ -227,7 +227,7 @@ START_TEST(test_run_timeout_duration_ptest)test_ptest_expected_failure (head, timeout,"hang" , search_for_timeout_and_duration); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -255,7 +255,7 @@ START_TEST(test_run_fail_ptest)test_ptest_expected_failure (head, timeout,"fail" , search_for_fail); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -354,7 +354,7 @@ test_ptest_expected_failure(struct ptest_list *head,const int timeout, char *pr
fp_stdout );tests/utils.c +1
-1-PTEST_LIST_FREE_ALL_CLEAN (filtered); +ptest_list_free_all (&filtered); }fclose (fp_stdout);utils.c +1
-1@@ -110,7 +110,7 @@ get_ptest_file(char **ptest_file, struct stat *st_buf,const char *main_dir, struct ptest_list * get_available_ptests(const char *dir, int global_timeout) { - struct ptest_list *head; + struct ptest_list *head = NULL;struct stat st_buf;int n, i;utils.c +1
-1@@ -212,7 +212,7 @@ get_available_ptests(const char *dir, int global_timeout)free (namelist );if (fail) { -PTEST_LIST_FREE_ALL_CLEAN (head); +ptest_list_free_all (&head); errno = saved_errno;break ;}utils.c +1
-1@@ -282,7 +282,7 @@ filter_ptests(struct ptest_list *head, char **ptests, int ptest_num) }if (fail) { -PTEST_LIST_FREE_ALL_CLEAN (head_new); +ptest_list_free_all (&head_new); errno = saved_errno; }} while (0);--
2.20.1
Re: [yocto] [ptest-runner 4/5] mem: Refactor ptest_list cleanup
Hi,
I tried to apply without success, looks like the patch is corrupted, can you send it again?, or share a git repo/branch.
Regards,
Anibal
Quoted 322 lines · Anibal Limon
Indeed this change doesn't has a direct impact but is fine to me.
Applied, Thanks!
Quoted 316 lines · ?ukasz Majewski
From: Adrian Freihofer <[email protected]>
Try to make memory management more robust by assigning always NULL to struct
ptest_listpointers. It's a refactoring which probably improves the code but does not fix a concrete bug.Signed-off-by Adrian Freihofer <[email protected]>--- main.c | 9 +++++---- ptest_list.c | 13 ++++--------- ptest_list.h | 8 +------- tests/ptest_list.c | 13 +++++++------ tests/utils.c | 22 +++++++++++----------- utils.c | 6 +++--- 6 files changed, 31 insertions(+), 40 deletions(-)main.c +2
-1@@ -116,7 +116,8 @@ main(int argc, char *argv[])mtrace ();#endif -struct ptest_list *head, *run; +struct ptest_list *head =NULL ; +struct ptest_list *run =NULL ; __attribute__ ((__cleanup__ (cleanup_ptest_opts)))struct ptest_options opts;opts.dirs = malloc(sizeof(char **) * 1);main.c +3
-3@@ -175,7 +176,7 @@ main(int argc, char *argv[]) head =NULL ;for (i =0 ; i < opts.dirs_no; i ++) { -struct ptest_list *tmp; +struct ptest_list *tmp =NULL ; tmp =get_available_ptests (opts.dirs[i], opts.timeout);if (tmp ==NULL ) {@@ -211,7 +212,7 @@ main(int argc, char *argv[]) run =filter_ptests (head, opts.ptests, ptest_num);CHECK_ALLOCATION (run, (size_t ) ptest_num,1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }for (i =0 ; i < ptest_exclude_num; i++)@@ -219,7 +220,7 @@ main(int argc, char *argv[]) rc =run_ptests (run, opts, argv[0 ], stdout, stderr); -ptest_list_free_all (run); +ptest_list_free_all (&run);return rc; }ptest_list.c +4
-9@@ -69,24 +69,19 @@ ptest_list_free(struct ptest_list *p)free (p); } -int -ptest_list_free_all (struct ptest_list *head) +void +ptest_list_free_all (struct ptest_list **head) { -int i =0 ;struct ptest_list *p, *q; -VALIDATE_PTR_RINT (head); - - p = head; + p = *head;while (p !=NULL ) { q = p; p = p->next;ptest_list_free (q); - i++; } - -return i; + *head =NULL ; }int ptest_list.h +1
-7@@ -36,12 +36,6 @@ x =NULL ; \ } while (0) -#define PTEST_LIST_FREE_ALL_CLEAN (x) \ - do { \ - ptest_list_free_all(x); \ - x = NULL; \ - } while (0) -#define PTEST_LIST_ITERATE_START (head, p) for (p = head->next; p != NULL; p = p->next) {#define PTEST_LIST_ITERATE_END }@@ -58,7 +52,7 @@ struct ptest_list {extern struct ptest_list *ptest_list_alloc (void );extern void ptest_list_free (struct ptest_list *); -extern int ptest_list_free_all (struct ptest_list *); +extern void ptest_list_free_all (struct ptest_list **);extern int ptest_list_length (struct ptest_list *);extern struct ptest_list *ptest_list_search (struct ptest_list *,char *);tests/ptest_list.c +7
-6@@ -53,7 +53,7 @@ START_TEST(test_add) {struct ptest_list *head =ptest_list_alloc ();ck_assert (ptest_list_add (head,strdup ("perl" ),NULL ,1 ) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -62,14 +62,15 @@ START_TEST(test_free_all)struct ptest_list *head =NULL ;int i; -ck_assert (ptest_list_free_all (head) ==-1 ); +ptest_list_free_all (&head); +ck_assert (head ==NULL );ck_assert (errno ==EINVAL ); head =ptest_list_alloc ();for (i =0 ; i < ptests_num; i++)ptest_list_add (head,strdup (ptest_names[i]),NULL ,1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -87,7 +88,7 @@ START_TEST(test_length)ptest_list_add (head,strdup (ptest_names[i]),NULL ,1 );ck_assert_int_eq (ptest_list_length (head), ptests_num); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -109,7 +110,7 @@ START_TEST(test_search)for (i = ptests_num -1 ; i >=0 ; i--)ck_assert (ptest_list_search (head, ptest_names[i]) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -141,7 +142,7 @@ START_TEST(test_remove)ck_assert_int_eq (ptest_list_length (head), n);ck_assert (ptest_list_search (head,"busybox" ) !=NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST tests/utils.c +2
-2@@ -88,13 +88,13 @@ START_TEST(test_get_available_ptests)for (i =0 ; ptests_not_found[i] !=NULL ; i++)ck_assert (ptest_list_search (head, ptests_not_found[i]) ==NULL ); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST START_TEST (test_print_ptests ) { -struct ptest_list *head; +struct ptest_list *head =NULL ;char *buf;size_t size = PRINT_PTEST_BUF_SIZE;tests/utils.c +6
-6@@ -116,14 +116,14 @@ START_TEST(test_print_ptests) head =ptest_list_alloc ();ck_assert (print_ptests (head, fp) ==1 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); line =fgets (line_buf,PRINT_PTEST_BUF_SIZE , fp);ck_assert (line !=NULL );ck_assert (strcmp (line,PRINT_PTESTS_NOT_FOUND ) ==0 ); head =get_available_ptests (opts_directory,1 );ck_assert (print_ptests (head, fp) ==0 ); -ptest_list_free_all (head); +ptest_list_free_all (&head); line =fgets (line_buf,PRINT_PTEST_BUF_SIZE , fp);ck_assert (line !=NULL );ck_assert (strcmp (line,PRINT_PTESTS_AVAILABLE ) ==0 );@@ -144,7 +144,7 @@ END_TESTSTART_TEST (test_filter_ptests) {struct ptest_list *head =get_available_ptests (opts_directory,1 ); -struct ptest_list *head_new; +struct ptest_list *head_new =NULL ;char *ptest_not_exists[] = {"glib" , };@@ -161,8 +161,8 @@ START_TEST(test_filter_ptests)ck_assert (head_new !=NULL );ck_assert (ptest_list_length (head_new) ==3 ); -ptest_list_free_all (head); -ptest_list_free_all (head_new); +ptest_list_free_all (&head); +ptest_list_free_all (&head_new); }END_TEST @@ -191,7 +191,7 @@ START_TEST(test_run_ptests) rc =run_ptests (head, opts,"test_run_ptests" , fp_stdout, fp_stderr);ck_assert (rc ==0 ); -ptest_list_free_all (head); +ptest_list_free_all (&head);fclose (fp_stdout);free(buf_stdout);tests/utils.c +2
-2@@ -227,7 +227,7 @@ START_TEST(test_run_timeout_duration_ptest)test_ptest_expected_failure (head, timeout,"hang" , search_for_timeout_and_duration); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -255,7 +255,7 @@ START_TEST(test_run_fail_ptest)test_ptest_expected_failure (head, timeout,"fail" , search_for_fail); -ptest_list_free_all (head); +ptest_list_free_all (&head); }END_TEST @@ -354,7 +354,7 @@ test_ptest_expected_failure(struct ptest_list *head,const int timeout, char *pr
fp_stdout );tests/utils.c +1
-1-PTEST_LIST_FREE_ALL_CLEAN (filtered); +ptest_list_free_all (&filtered); }fclose (fp_stdout);utils.c +1
-1@@ -110,7 +110,7 @@ get_ptest_file(char **ptest_file, struct stat *st_buf, const char *main_dir, struct ptest_list *get_available_ptests (const char *dir,int global_timeout) { -struct ptest_list *head; +struct ptest_list *head =NULL ;struct stat st_buf;int n, i;utils.c +1
-1@@ -212,7 +212,7 @@ get_available_ptests(const char *dir, int global_timeout)free (namelist );if (fail) { -PTEST_LIST_FREE_ALL_CLEAN (head); +ptest_list_free_all (&head); errno = saved_errno;break ;}utils.c +1
-1@@ -282,7 +282,7 @@ filter_ptests(struct ptest_list *head, char **ptests, int ptest_num) }if (fail) { -PTEST_LIST_FREE_ALL_CLEAN (head_new); +ptest_list_free_all (&head_new); errno = saved_errno; }} while (0);--
2.20.1
PATCH 5/5 main: Do not return number of failed tests when calling ptest-runner
In reply to ?ukasz MajewskiUp till now ptest-runner2 returns number of failed tests with its exit status code. Such use case is not recommended [1] and may cause issues when there are more than 256 tests to be executed.
To alleviate this issue the number of total tests with number of failed ones is printed before exit. To be more specific - failure of a single test doesn't indicate that the ptest-runner itself encounter any issue during its execution.
One can test this change with executing:
./ptest-runner -d tests/data fail
Links:
[1] - https://www.gnu.org/software/libc/manual/html_node/Exit-Status.html
--- main.c | 3 +++ 1 file changed, 3 insertions(+)
main.c +3 -0
@@ -219,6 +219,9 @@ main(int argc, char *argv[])ptest_list_remove (run, opts.exclude[i],1 ); rc =run_ptests (run, opts, argv[0 ], stdout, stderr); +fprintf (stdout,"TOTAL: %d FAIL: %d\n" ,ptest_list_length (run), rc); +if (rc >0 ) + rc =0 ;ptest_list_free_all (&run);
Signature · 1 line
2.20.1
Re: [ptest-runner 5/5] main: Do not return number of failed tests when calling ptest-runner
I would favor to keep non-zero exit value if any tests failed. We have relied on exit value since ptest started to support it, others may be doing that as well. This would be backward incompatible change, making tests silently fail. It is somewhat clumsy to try to parse failed tests from output, so non-zero rc was very welcome change to me.
Looking at other test runners, it is very common to return non-zero if any tests failed. (Some examples: pytest, python unittest, googletest, shunit2, robot framework.) See pytest exit codes for example: https://docs.pytest.org/en/latest/reference/exit-codes.html
Indeed the failed count is not a good exit value though because of rollover, should be fixed. Could consider using own rc for "any tests failed" differentiating from other errors.
- Tero
Re: [yocto] [ptest-runner 5/5] main: Do not return number of failed tests when calling ptest-runner
Hi all,
Just replied in other email about this situation, so yes for me is better at least return 1 when any test fails to make it backwards compatible and knows when some test fails.
Regards,
Anibal
Quoted 19 lines · Tero Kinnunen
I would favor to keep non-zero exit value if any tests failed. We have relied on exit value since ptest started to support it, others may be doing that as well. This would be backward incompatible change, making tests silently fail. It is somewhat clumsy to try to parse failed tests from output, so non-zero rc was very welcome change to me.
Looking at other test runners, it is very common to return non-zero if any tests failed. (Some examples: pytest, python unittest, googletest, shunit2, robot framework.) See pytest exit codes for example:
https://docs.pytest.org/en/latest/reference/exit-codes.htmlIndeed the failed count is not a good exit value though because of rollover, should be fixed. Could consider using own rc for "any tests failed" differentiating from other errors.
- Tero
Re: [yocto] [ptest-runner 5/5] main: Do not return number of failed tests when calling ptest-runner
In reply to ?ukasz MajewskiHi Lukasz
Also our test infrastructure expects an exit value not equal to 0 in case of a failed test.
Regards,
Adrian
Quoted 39 lines · ?ukasz Majewski
Up till now ptest-runner2 returns number of failed tests with its exit status code. Such use case is not recommended [1] and may cause issues when there are more than 256 tests to be executed.
To alleviate this issue the number of total tests with number of failed ones is printed before exit. To be more specific - failure of a single test doesn't indicate that the ptest-runner itself encounter any issue during its execution.
One can test this change with executing:
./ptest-runner -d tests/data failLinks:
[1] - https://www.gnu.org/software/libc/manual/html_node/Exit-Status.htmlSigned-off-by Lukasz Majewski <[email protected]>---
main.c | 3 +++1 file changed, 3 insertions(+)main.c +0
-0@@ -219,6 +219,9 @@ main(int argc, char *argv[]) ptest_list_remove(run, opts.exclude[i], 1);rc =
run_ptests(run, opts, argv[0], stdout, stderr);main.c +3
-0+fprintf (stdout,"TOTAL: %d FAIL: %d\n" ,ptest_list_length (run), rc); +if (rc >0 ) + rc =0 ;
ptest_list_free_all(&run);
Quoted 20 lines · ?ukasz Majewski
This patch series provides some memory management fixes and corrected return code handling for ptest-runner2.
Adrian Freihofer (4):
git: Extend the gitignore
mem: Fix memleak forptest_opts
mem: Simplify memory management
mem: Refactorptest_listcleanupLukasz Majewski (1):
main: Do not return number of failed tests when calling ptest-runner.gitignore | 3 +++ main.c | 33 ++++++++++++++++++++++++++++----- ptest_list.c | 13 ++++--------- ptest_list.h | 8 +------- tests/ptest_list.c | 13 +++++++------ tests/utils.c | 22 +++++++++++----------- utils.c | 11 ++++------- 7 files changed, 58 insertions(+), 45 deletions(-)
Quoted 6 lines
create mode 100644 .gitignore
Looks good to me.
Did you happen to check the compile with clang as well? If not, I may do that eventually.
Signature · 2 lines
# Randy MacLeod # Wind River Linux
Hi Randy,
Quoted 29 lines · ?ukasz Majewski
Quoted 21 lines
This patch series provides some memory management fixes and corrected return code handling for ptest-runner2.
Adrian Freihofer (4):
git: Extend the gitignore
mem: Fix memleak forptest_opts
mem: Simplify memory management
mem: Refactorptest_listcleanupLukasz Majewski (1):
main: Do not return number of failed tests when calling
ptest-runner.gitignore | 3 +++ main.c | 33 ++++++++++++++++++++++++++++----- ptest_list.c | 13 ++++--------- ptest_list.h | 8 +------- tests/ptest_list.c | 13 +++++++------ tests/utils.c | 22 +++++++++++----------- utils.c | 11 ++++------- 7 files changed, 58 insertions(+), 45 deletions(-)Quoted 6 lines
create mode 100644 .gitignore
Quoted 5 lines
Looks good to me.
Did you happen to check the compile with clang as well? If not, I may do that eventually.
No, I've just used gcc.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: [email protected]