forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/pss: race condition fixed

Browse source
This commit is contained in:
Vlad 2019-03-10 12:56:51 +04:00
parent acc14baba2
commit 3105ab6be4
1 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
swarm/pss/prox_test.go
View file

@ -47,10 +47,11 @@ var (
mu sync.Mutex // keeps handlerDone in sync mu sync.Mutex // keeps handlerDone in sync
sim *simulation.Simulation sim *simulation.Simulation
handlerDone bool // set to true on termination of the simulation run mx sync.Mutex // prevents data race for the test variables
handlerDone bool // set to true on termination of the simulation run
requiredMessages int requiredMessages int
allowedMessages int allowedMessages int
messageCount int messageCount int
kademlias map[enode.ID]*network.Kademlia kademlias map[enode.ID]*network.Kademlia
nodeAddrs map[enode.ID][]byte // make predictable overlay addresses from the generated random enode ids nodeAddrs map[enode.ID][]byte // make predictable overlay addresses from the generated random enode ids
@ -70,10 +71,9 @@ func resetTestVariables() {
handlerDone = false handlerDone = false
requiredMessages = 0 requiredMessages = 0
allowedMessages = 0 allowedMessages = 0
messageCount = 0
msgs = nil msgs = nil
sim = nil sim = nil
resetMsgCount()
kademlias = make(map[enode.ID]*network.Kademlia) kademlias = make(map[enode.ID]*network.Kademlia)
nodeAddrs = make(map[enode.ID][]byte) nodeAddrs = make(map[enode.ID][]byte)
recipients = make(map[int][]enode.ID) recipients = make(map[int][]enode.ID)
@ -87,6 +87,25 @@ func resetTestVariables() {
msgC = make(chan handlerNotification) msgC = make(chan handlerNotification)
} }
func getMsgCount() int {
mx.Lock()
defer mx.Unlock()
return messageCount
}
func resetMsgCount() {
mx.Lock()
messageCount = 0
mx.Unlock()
}
func incrementMsgCount() int {
mx.Lock()
defer mx.Unlock()
messageCount++
return messageCount
}
func isDone() bool { func isDone() bool {
mu.Lock() mu.Lock()
defer mu.Unlock() defer mu.Unlock()
@ -226,8 +245,9 @@ func testProxNetwork(t *testing.T) {
// context deadline exceeded // context deadline exceeded
// however, it might just mean that not all possible messages are received // however, it might just mean that not all possible messages are received
// now we must check if all required messages are received // now we must check if all required messages are received
log.Debug("TestProxNetwork finnished", "rcv", messageCount) cnt := getMsgCount()
if messageCount < requiredMessages { log.Debug("TestProxNetwork finnished", "rcv", cnt)
if cnt < requiredMessages {
t.Fatal(result.Error) t.Fatal(result.Error)
} }
} }
@ -319,8 +339,8 @@ func handlerChannelListener(ctx context.Context) {
func nodeMsgHandler(config *adapters.NodeConfig) *handler { func nodeMsgHandler(config *adapters.NodeConfig) *handler {
return &handler{ return &handler{
f: func(msg []byte, p *p2p.Peer, asymmetric bool, keyid string) error { f: func(msg []byte, p *p2p.Peer, asymmetric bool, keyid string) error {
messageCount++ cnt := incrementMsgCount()
log.Debug("nodeMsgHandler rcv", "cnt", messageCount) log.Debug("nodeMsgHandler rcv", "cnt", cnt)
// using simple serial in message body, makes it easy to keep track of who's getting what // using simple serial in message body, makes it easy to keep track of who's getting what
serial, c := binary.Uvarint(msg) serial, c := binary.Uvarint(msg)