Improve num requests per piece status output

diff --git a/peerconn.go b/peerconn.go
index 1721663c56ec3fbcd469a2ccff7e8093018deae8..a5d078e00c1743f0e26cea63366ec4c8c3fb5f2a 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -8,6 +8,7 @@ import (
        "io"
        "math/rand"
        "net"
+       "sort"
        "strconv"
        "strings"
        "sync"
@@ -366,8 +367,19 @@ func (cn *Peer) writeStatus(w io.Writer, t *Torrent) {
                cn.downloadRate()/(1<<10),
        )
        fmt.Fprintf(w, "    requested pieces:")
+       type pieceNumRequestsType struct {
+               piece       pieceIndex
+               numRequests int
+       }
+       var pieceNumRequests []pieceNumRequestsType
        for piece, count := range cn.numRequestsByPiece() {
-               fmt.Fprintf(w, " %v (%v)", piece, count)
+               pieceNumRequests = append(pieceNumRequests, pieceNumRequestsType{piece, count})
+       }
+       sort.Slice(pieceNumRequests, func(i, j int) bool {
+               return pieceNumRequests[i].piece < pieceNumRequests[j].piece
+       })
+       for _, elem := range pieceNumRequests {
+               fmt.Fprintf(w, " %v(%v)", elem.piece, elem.numRequests)
        }
        fmt.Fprintf(w, "\n")
 }