Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion accounts/keystore/file_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
type fileCache struct {
all mapset.Set // Set of all files from the keystore folder
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
Expand Down
2 changes: 1 addition & 1 deletion core/chain_indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ type ChainIndexer struct {
throttling time.Duration // Disk throttling to prevent a heavy upgrade from hogging resources

log log.Logger
lock sync.RWMutex
lock sync.Mutex
}

// NewChainIndexer creates a new chain indexer to do background processing on
Expand Down
2 changes: 1 addition & 1 deletion eth/downloader/downloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ type Downloader struct {
cancelWg sync.WaitGroup // Make sure all fetcher goroutines have exited.

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
syncInitHook func(uint64, uint64) // Method to call upon initiating a new sync run
Expand Down
3 changes: 1 addition & 2 deletions eth/downloader/downloader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,6 @@ func (dl *downloadTester) dropPeer(id string) {
type downloadTesterPeer struct {
dl *downloadTester
id string
lock sync.RWMutex
chain *testChain
missingStates map[common.Hash]bool // State entries that fast sync should not return
}
Expand Down Expand Up @@ -1601,7 +1600,7 @@ func TestRemoteHeaderRequestSpan(t *testing.T) {
{15000, 13006,
[]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,
[]int{1149, 1154, 1159, 1164, 1169, 1174, 1179, 1184, 1189, 1194, 1199},
},
Expand Down
2 changes: 1 addition & 1 deletion les/txrelay.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type lesTxRelay struct {
txPending map[common.Hash]struct{}
peerList []*serverPeer
peerStartPos int
lock sync.RWMutex
lock sync.Mutex
stop chan struct{}

retriever *retrieveManager
Expand Down
2 changes: 1 addition & 1 deletion miner/unconfirmed.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type unconfirmedBlocks struct {
chain chainRetriever // Blockchain to verify canonical status through
depth uint // Depth after which to discard previous blocks
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.
Expand Down