Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
62cd943c
Unverified
Commit
62cd943c
authored
Mar 27, 2020
by
gary rong
Committed by
GitHub
Mar 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
les: fix dead lock (#20828)
parent
d6c5f241
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
peer.go
les/peer.go
+1
-2
No files found.
les/peer.go
View file @
62cd943c
...
...
@@ -531,8 +531,6 @@ func (p *serverPeer) getTxRelayCost(amount, size int) uint64 {
// HasBlock checks if the peer has a given block
func
(
p
*
serverPeer
)
HasBlock
(
hash
common
.
Hash
,
number
uint64
,
hasState
bool
)
bool
{
p
.
lock
.
RLock
()
defer
p
.
lock
.
RUnlock
()
head
:=
p
.
headInfo
.
Number
var
since
,
recent
uint64
if
hasState
{
...
...
@@ -543,6 +541,7 @@ func (p *serverPeer) HasBlock(hash common.Hash, number uint64, hasState bool) bo
recent
=
p
.
chainRecent
}
hasBlock
:=
p
.
hasBlock
p
.
lock
.
RUnlock
()
return
head
>=
number
&&
number
>=
since
&&
(
recent
==
0
||
number
+
recent
+
4
>
head
)
&&
hasBlock
!=
nil
&&
hasBlock
(
hash
,
number
,
hasState
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment