pipe07: close /proc/self/fd after counting fds
v2 cover pipe07: close /proc/self/fd after counting fds
Leaving the directory fd open will count against the max number of fds opened, so the final expected count will be off when (max_fds - record_open_fds()) is even.
v1->v2:
Split patch into bugfix and refactor
Fix bug in refactor that caused exp_num_pipes to not round down to nearest even integer
Edward Liaw (2):
pipe07: close /proc/self/fd after counting fds
pipe07: refactor exp_num_pipes
testcases/kernel/syscalls/pipe/pipe07.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
--
2.42.0.582.g8ccd20d70d-goog
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/2 pipe07: close /proc/self/fd after counting fds
Leaving the directory fd open will count against the max number of fds opened, so the final expected count will be off when (max_fds - record_open_fds()) is even.
--- testcases/kernel/syscalls/pipe/pipe07.c | 2 ++ 1 file changed, 2 insertions(+)
testcases/kernel/syscalls/pipe/pipe07.c +2 -0
@@ -45,6 +45,8 @@ static int record_open_fds(void) opened_fds[num_opened_fds++] = fd; } +SAFE_CLOSEDIR (dir); +return num_opened_fds; }
Signature · 5 lines
2.42.0.582.g8ccd20d70d-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 2/2 pipe07: refactor exp_num_pipes
In reply to Edward Liaw via ltpMove doubling the exp_num_pipes into the value.
--- testcases/kernel/syscalls/pipe/pipe07.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/pipe/pipe07.c +3 -3
@@ -58,8 +58,8 @@ static void setup(void)tst_res (TINFO ,"getdtablesize() = %d" , max_fds); pipe_fds =SAFE_MALLOC (max_fds *sizeof (int )); - exp_num_pipes = (max_fds -record_open_fds ()) /2 ; -tst_res (TINFO ,"expected max fds to be opened by pipe(): %d" , exp_num_pipes *2 ); + exp_num_pipes = (max_fds -record_open_fds ()) /2 *2 ; +tst_res (TINFO ,"expected max fds to be opened by pipe(): %d" , exp_num_pipes); }static void run (void )
@@ -75,7 +75,7 @@ static void run(void) }while (!TST_RET );TST_EXP_EQ_LI (errno,EMFILE ); -TST_EXP_EQ_LI (exp_num_pipes *2 , num_pipe_fds); +TST_EXP_EQ_LI (exp_num_pipes, num_pipe_fds);for (int i =0 ; i < num_pipe_fds; i++)SAFE_CLOSE (pipe_fds[i]);
Signature · 5 lines
2.42.0.582.g8ccd20d70d-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/2] pipe07: refactor exp_num_pipes
Hi Edward,
Thanks, merged.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp