opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00
Code Issues Projects Releases Wiki Activity

fixing race in testutil port

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-12-23 17:59:35 -08:00
parent fd2875f2ed
commit c43e8fa35b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
util/testutil/gen.go
View File

@ -6,6 +6,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"sync"
"testing" "testing"
ci "github.com/jbenet/go-ipfs/crypto" ci "github.com/jbenet/go-ipfs/crypto"
@ -49,17 +50,24 @@ func RandLocalTCPAddress() ma.Multiaddr {
// most ports above 10000 aren't in use by long running processes, so yay. // most ports above 10000 aren't in use by long running processes, so yay.
// (maybe there should be a range of "loopback" ports that are guaranteed // (maybe there should be a range of "loopback" ports that are guaranteed
// to be open for the process, but naturally can only talk to self.) // to be open for the process, but naturally can only talk to self.)
if lastPort == 0 {
lastPort = 10000 + SeededRand.Intn(50000)
}
lastPort++
addr := fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", lastPort) lastPort.Lock()
if lastPort.port == 0 {
lastPort.port = 10000 + SeededRand.Intn(50000)
}
port := lastPort.port
lastPort.port++
lastPort.Unlock()
addr := fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", port)
maddr, _ := ma.NewMultiaddr(addr) maddr, _ := ma.NewMultiaddr(addr)
return maddr return maddr
} }
var lastPort = 0 var lastPort = struct {
port int
sync.Mutex
}{}
// PeerNetParams is a struct to bundle together the four things // PeerNetParams is a struct to bundle together the four things
// you need to run a connection with a peer: id, 2keys, and addr. // you need to run a connection with a peer: id, 2keys, and addr.