gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

tests: find_available_port start search from next port

Browse Source 
i.e. don't start the search from scratch hitting the used ones again.
this will also reduce the likelihood of collisions (if there are any
left) by increasing the time until we re-use a port we did use in the
past.
This commit is contained in:
Oran Agra 2020-05-27 16:12:30 +03:00
parent e258a1c087
commit 1cf33a46d5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/support/util.tcl
View File

@ -344,21 +344,26 @@ proc roundFloat f {
format "%.10g" $f format "%.10g" $f
} }
set ::last_port_attempted 0
proc find_available_port {start count} { proc find_available_port {start count} {
for {set j $start} {$j < $start+$count} {incr j} { set port [expr $::last_port_attempted + 1]
if {[catch {set fd1 [socket 127.0.0.1 $j]}] && for {set attempts 0} {$attempts < $count} {incr attempts} {
[catch {set fd2 [socket 127.0.0.1 [expr $j+10000]]}]} { if {$port < $start || $port >= $start+$count} {
return $j set port $start
}
if {[catch {set fd1 [socket 127.0.0.1 $port]}] &&
[catch {set fd2 [socket 127.0.0.1 [expr $port+10000]]}]} {
set ::last_port_attempted $port
return $port
} else { } else {
catch { catch {
close $fd1 close $fd1
close $fd2 close $fd2
} }
} }
incr port
} }
if {$j == $start+$count} { error "Can't find a non busy port in the $start-[expr {$start+$count-1}] range."
error "Can't find a non busy port in the $start-[expr {$start+$count-1}] range."
}
} }
# Test if TERM looks like to support colors # Test if TERM looks like to support colors