WIP optimize p2p k-bucket refresh #85
Closed
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
Shitaibin
suggested changes
May 17, 2019
vntp2p/discovery.go
Outdated
| // 刷新K桶 | ||
| } | ||
| } | ||
| //func (vdht *VNTDht) loop(ctx context.Context) { |
| } | ||
|
|
||
| // lookup |
vntp2p/dial.go
Outdated
| } | ||
| } | ||
|
|
||
| //update loopupNode, if need more, launch loopup task |
There was a problem hiding this comment.
update loopupNode —> lookupNode，可以开启goland错字提示
vntp2p/dial.go
Outdated
|
|
||
| //update loopupNode, if need more, launch loopup task | ||
| s.lookupNode = s.lookupNode[:copy(s.lookupNode, s.lookupNode[i:])] | ||
| if len(s.lookupNode) < needdial && !s.lookupRunning { |
| @@ -146,7 +162,8 @@ func (s *taskstate) taskDone(t task) { | |||
| case *dialTask: | |||
| delete(s.dialmap, t.target) | |||
| case *lookupTask: | |||
| log.Debug("taskDone", "lookupTask") | |||
| s.lookupRunning = false | |||
There was a problem hiding this comment.
lookupRunning这个变量起不到作用。newTasks可能建立了多个lookup task，但每一个lookup task执行完，都会执行task done，这就造成有1个task 执行完，这个标记又被设置为false了。
目的是所有lookup都执行完才是一轮lookup done，然后下次执行new task的时候，如果发现连接数不够，才是开启下一轮lookup。
建议：把lookupRunning改成lookupCount，因为存在并发，使用原子操作，创建时+1，每个lookup task执行完，可以自己减一，原子操作使用sync.atomic
go func() { t.Do(ctx, server); taskdone <- t }()
func (s *taskstate) taskDone(t task) {
switch t := t.(type) {
case *dialTask:
delete(s.dialmap, t.target)
case *lookupTask:
s.lookupRunning = false
s.lookupNode = append(s.lookupNode, t.targets...)
}
}
Shitaibin
suggested changes
May 17, 2019
vntp2p/dial.go
Outdated
| @@ -196,7 +213,22 @@ func (t *dialTask) dial(ctx context.Context, server *Server, target peer.ID, pid | |||
| } | |||
|
|
|||
| func (t *lookupTask) Do(ctx context.Context, server *Server) { | |||
| time.Sleep(1 * time.Second) | |||
| //give sometime for this lookup task | |||
| nextLoopup := server.lastLookup.Add(4 * time.Second) | |||
vntp2p/server.go
Outdated
| peerFeed event.Feed | ||
| loopWG sync.WaitGroup | ||
| cancel context.CancelFunc | ||
| lastLookup time.Time |
Shitaibin
changed the title
…nto optimize_local
…into optimize_local
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.
Fixes # . optimize p2p k-bucket refresh
Changes proposed in this pull request:
@Shitaibin