testlib: improve test_bind function
PATCH 1/1 testlib: improve test_bind function
Try to bind again if the errno is EADDRINUSE. Some tests failed to run sometimes, here is one snapshot:
...
test_sockopt.c 25 PASS : setsockopt(SCTP_PEER_ADDR_PARAMS) - one-to-many style invalid hb demand test_sockopt.c 26 BROK : bind: Address already in use
DUMP_CORE ../../src/testlib/sctputil.h: 145
...
test_1_to_1_sendmsg.c 10 PASS : sendmsg() on a closed association - EPIPE test_1_to_1_sendmsg.c 11 BROK : bind: Address already in use DUMP_CORE ../../src/testlib/sctputil.h: 145
The reason is that it closed a socket and then created a new socket to bind the same socket address as before, which was not released yet.
--- src/testlib/sctputil.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
src/testlib/sctputil.h +20 -3
@@ -72,6 +72,10 @@ typedef union {#endif #define SCTP_TESTPORT_2 (SCTP_TESTPORT_1+1) +#ifndef MAX_BIND_RETRYS +#define MAX_BIND_RETRYS 10 +#endif +#define SCTP_IP_BCAST htonl(0xffffffff)#define SCTP_IP_LOOPBACK htonl(0x7f000001)
@@ -140,9 +144,22 @@ static inline int test_socket(int domain, int type, int protocol)static inline int test_bind (int sk,struct sockaddr *addr,socklen_t addrlen) { -int error =bind (sk, addr, addrlen); - if (-1 = error) -tst_brkm (TBROK , tst_exit,"bind: %s" ,strerror (errno)); +int error =0 , i =0 ; + +do { +if (i >0 )sleep (1 );/* sleep a while before new try... */ + + error =bind (sk, addr, addrlen); + if (-1 = error && errno != EADDRINUSE) { +tst_brkm (TBROK , tst_exit,"bind: %s" ,strerror (errno)); + } + + i++; +if (i >=MAX_BIND_RETRYS ) { +tst_brkm (TBROK , tst_exit,"bind: %s" ,strerror (errno)); + } + }while (error <0 && i <MAX_BIND_RETRYS ); +return error; }
Signature · 1 line
2.14.5
Xin Long
maintainerQuoted 10 lines · Jianwen Ji
Try to bind again if the errno is EADDRINUSE. Some tests failed to run sometimes, here is one snapshot:
...
test_sockopt.c25 PASS :setsockopt(SCTP_PEER_ADDR_PARAMS)- one-to-many style invalid hb demandtest_sockopt.c26 BROK : bind: Address already in use
DUMP_CORE../../src/testlib/sctputil.h: 145
Quoted 5 lines
...
test_1_to_1_sendmsg.c10 PASS :sendmsg()on a closed association - EPIPEtest_1_to_1_sendmsg.c11 BROK : bind: Address already in useDUMP_CORE../../src/testlib/sctputil.h: 145
The patch itself works, but there's a warning when I was compiling:
In file included from sctputil.c:54:
./sctputil.h: In function ‘test_bind’:
./sctputil.h:150:14: warning: implicit declaration of function ‘sleep’ [-Wimplicit-function-declaration]
if (i > 0) sleep(1); /* sleep a while before new try... */
^~~~~
caused by the lack of '#include <unistd.h>' in src/testlib/sctputil.h
Quoted 54 lines
The reason is that it closed a socket and then created a new socket to bind the same socket address as before, which was not released yet.
Signed-off-by Jianwen Ji <[email protected]>--- src/testlib/sctputil.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)src/testlib/sctputil.h +20
-4@@ -72,6 +72,10 @@ typedef union {#endif #define SCTP_TESTPORT_2 (SCTP_TESTPORT_1+1) +#ifndef MAX_BIND_RETRYS +#define MAX_BIND_RETRYS 10 +#endif +#define SCTP_IP_BCAST htonl(0xffffffff)#define SCTP_IP_LOOPBACK htonl(0x7f000001)@@ -140,9 +144,22 @@ static inline int test_socket(int domain, int type, int protocol)static inline int test_bind (int sk,struct sockaddr *addr,socklen_t addrlen) { -int error =bind (sk, addr, addrlen); -if (-1 == error) -tst_brkm (TBROK , tst_exit,"bind: %s" ,strerror (errno)); +int error =0 , i =0 ; + +do { +if (i >0 )sleep (1 );/* sleep a while before new try... */ + + error =bind (sk, addr, addrlen); +if (-1 == error && errno !=EADDRINUSE ) { +tst_brkm (TBROK , tst_exit,"bind: %s" ,strerror (errno)); + } + + i++; +if (i >=MAX_BIND_RETRYS ) { +tst_brkm (TBROK , tst_exit,"bind: %s" ,strerror (errno)); + } + }while (error <0 && i <MAX_BIND_RETRYS ); +return error; } --2.14.5