From a3356b04179769c3ca0813f6f1766ee36884e975 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Fri, 22 May 2015 09:08:40 -0700
Subject: [PATCH] fix minor data race in bitswap
---
exchange/bitswap/bitswap.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index db7bc033f..27be53967 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -287,8 +287,10 @@ func (bs *Bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
if has, err := bs.blockstore.Has(block.Key()); err == nil && has {
bs.dupBlocksRecvd++
}
+ brecvd := bs.blocksRecvd
+ bdup := bs.dupBlocksRecvd
bs.counterLk.Unlock()
- log.Infof("got block %s from %s (%d,%d)", block, p, bs.blocksRecvd, bs.dupBlocksRecvd)
+ log.Infof("got block %s from %s (%d,%d)", block, p, brecvd, bdup)
hasBlockCtx, cancel := context.WithTimeout(ctx, hasBlockTimeout)
if err := bs.HasBlock(hasBlockCtx, block); err != nil {
--
GitLab