all: replace RWMutex with Mutex in places where RLock is not used (#21622)

pull/21699/head
mr_franklin 4 years ago committed by GitHub
parent 32341f88e3
commit c37e68e7c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      accounts/keystore/file_cache.go
  2. 2
      core/chain_indexer.go
  3. 2
      eth/downloader/downloader.go
  4. 3
      eth/downloader/downloader_test.go
  5. 2
      les/txrelay.go
  6. 2
      miner/unconfirmed.go

@ -32,7 +32,7 @@ import (
type fileCache struct { type fileCache struct {
all mapset.Set // Set of all files from the keystore folder all mapset.Set // Set of all files from the keystore folder
lastMod time.Time // Last time instance when a file was modified lastMod time.Time // Last time instance when a file was modified
mu sync.RWMutex mu sync.Mutex
} }
// scan performs a new scan on the given directory, compares against the already // scan performs a new scan on the given directory, compares against the already

@ -94,7 +94,7 @@ type ChainIndexer struct {
throttling time.Duration // Disk throttling to prevent a heavy upgrade from hogging resources throttling time.Duration // Disk throttling to prevent a heavy upgrade from hogging resources
log log.Logger log log.Logger
lock sync.RWMutex lock sync.Mutex
} }
// NewChainIndexer creates a new chain indexer to do background processing on // NewChainIndexer creates a new chain indexer to do background processing on

@ -153,7 +153,7 @@ type Downloader struct {
cancelWg sync.WaitGroup // Make sure all fetcher goroutines have exited. cancelWg sync.WaitGroup // Make sure all fetcher goroutines have exited.
quitCh chan struct{} // Quit channel to signal termination quitCh chan struct{} // Quit channel to signal termination
quitLock sync.RWMutex // Lock to prevent double closes quitLock sync.Mutex // Lock to prevent double closes
// Testing hooks // Testing hooks
syncInitHook func(uint64, uint64) // Method to call upon initiating a new sync run syncInitHook func(uint64, uint64) // Method to call upon initiating a new sync run

@ -411,7 +411,6 @@ func (dl *downloadTester) dropPeer(id string) {
type downloadTesterPeer struct { type downloadTesterPeer struct {
dl *downloadTester dl *downloadTester
id string id string
lock sync.RWMutex
chain *testChain chain *testChain
missingStates map[common.Hash]bool // State entries that fast sync should not return missingStates map[common.Hash]bool // State entries that fast sync should not return
} }
@ -1601,7 +1600,7 @@ func TestRemoteHeaderRequestSpan(t *testing.T) {
{15000, 13006, {15000, 13006,
[]int{14823, 14839, 14855, 14871, 14887, 14903, 14919, 14935, 14951, 14967, 14983, 14999}, []int{14823, 14839, 14855, 14871, 14887, 14903, 14919, 14935, 14951, 14967, 14983, 14999},
}, },
//Remote is pretty close to us. We don't have to fetch as many // Remote is pretty close to us. We don't have to fetch as many
{1200, 1150, {1200, 1150,
[]int{1149, 1154, 1159, 1164, 1169, 1174, 1179, 1184, 1189, 1194, 1199}, []int{1149, 1154, 1159, 1164, 1169, 1174, 1179, 1184, 1189, 1194, 1199},
}, },

@ -35,7 +35,7 @@ type lesTxRelay struct {
txPending map[common.Hash]struct{} txPending map[common.Hash]struct{}
peerList []*serverPeer peerList []*serverPeer
peerStartPos int peerStartPos int
lock sync.RWMutex lock sync.Mutex
stop chan struct{} stop chan struct{}
retriever *retrieveManager retriever *retrieveManager

@ -50,7 +50,7 @@ type unconfirmedBlocks struct {
chain chainRetriever // Blockchain to verify canonical status through chain chainRetriever // Blockchain to verify canonical status through
depth uint // Depth after which to discard previous blocks depth uint // Depth after which to discard previous blocks
blocks *ring.Ring // Block infos to allow canonical chain cross checks blocks *ring.Ring // Block infos to allow canonical chain cross checks
lock sync.RWMutex // Protects the fields from concurrent access lock sync.Mutex // Protects the fields from concurrent access
} }
// newUnconfirmedBlocks returns new data structure to track currently unconfirmed blocks. // newUnconfirmedBlocks returns new data structure to track currently unconfirmed blocks.

Loading…
Cancel
Save