dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Performance improvements in piece requesting

This commit is contained in:
Matt Joiner 2021-09-16 00:12:24 +10:00
parent 2b443d695b
commit a4697497aa
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
request-strategy/order.go
View File

@ -206,7 +206,7 @@ func Run(input Input) map[PeerId]PeerNextRequestState {
}
// Checks that a sorted peersForPiece slice makes sense.
func ensureValidSortedPeersForPieceRequests(peers peersForPieceSorter) {
func ensureValidSortedPeersForPieceRequests(peers *peersForPieceSorter) {
if !sort.IsSorted(peers) {
panic("not sorted")
}
@ -235,19 +235,19 @@ type peersForPieceSorter struct {
p requestablePiece
}
func (me peersForPieceSorter) Len() int {
func (me *peersForPieceSorter) Len() int {
return len(me.peersForPiece)
}
func (me peersForPieceSorter) Swap(i, j int) {
func (me *peersForPieceSorter) Swap(i, j int) {
me.peersForPiece[i], me.peersForPiece[j] = me.peersForPiece[j], me.peersForPiece[i]
}
func (me peersForPieceSorter) Less(_i, _j int) bool {
func (me *peersForPieceSorter) Less(_i, _j int) bool {
i := me.peersForPiece[_i]
j := me.peersForPiece[_j]
req := me.req
p := me.p
p := &me.p
byHasRequest := func() multiless.Computation {
ml := multiless.New()
if req != nil {
@ -281,6 +281,9 @@ func (me peersForPieceSorter) Less(_i, _j int) bool {
j.DownloadRate,
i.DownloadRate,
)
if ml.Ok() {
return ml.Less()
}
ml = ml.AndThen(byHasRequest)
return ml.Int64(
int64(j.Age), int64(i.Age),