Fix deadlock due to incorrect mutex #91
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Runchao Han <[email protected]>
This reverts commit 4e0f9f5.
SebastianElvis
approved these changes
Oct 24, 2022
types/btccache.go
Outdated
Comment on lines
48
to
53
| if b.size() >= b.maxEntries { | ||
| b.blocks = b.blocks[1:] | ||
| } | ||
|
|
||
| b.blocks = append(b.blocks, ib) | ||
| return nil |
There was a problem hiding this comment.
Suggested change
| if b.size() >= b.maxEntries { | |
| b.blocks = b.blocks[1:] | |
| } | |
| b.blocks = append(b.blocks, ib) | |
| return nil | |
| return b.add(ib) |
| } | ||
|
|
||
| // Reverse reverses the order of blocks in cache in place. Thread-safe. | ||
| func (b *BTCCache) Reverse() error { | ||
| b.Lock() | ||
| defer b.Unlock() | ||
|
|
There was a problem hiding this comment.
Ditto, you can just do
return b.reverse()
types/btccache.go
Outdated
| return nil | ||
| } | ||
|
|
||
| // Lock free version of Add |
There was a problem hiding this comment.
Lock-free has its own meaning. So perhaps just say "thread-unsafe" here.
types/btccache.go
Outdated
| func (b *BTCCache) Size() uint64 { | ||
| b.RLock() | ||
| defer b.RUnlock() | ||
|
|
||
| return uint64(len(b.blocks)) | ||
| } | ||
|
|
||
| func (b *BTCCache) reverse() error { | ||
| // lock free version of Size |
types/btccache.go
Outdated
| @@ -94,6 +112,15 @@ func (b *BTCCache) reverse() error { | |||
| return nil | |||
| } | |||
|
|
|||
| // lock free version of reverse | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.