Add holepunching stats and tests

[btrtrc.git] / torrent-piece-request-order.go

diff --git a/torrent-piece-request-order.go b/torrent-piece-request-order.go
index 7b1ef97855b2cf66225b5b383b86c9478eec2d40..17206679e86919c8fa79a77326e927d8e9a7496f 100644 (file)
--- a/torrent-piece-request-order.go
+++ b/torrent-piece-request-order.go
@@ -5,6 +5,9 @@ import (
 )
 
 func (t *Torrent) updatePieceRequestOrder(pieceIndex int) {
+       if t.storage == nil {
+               return
+       }
        t.cl.pieceRequestOrder[t.clientPieceRequestOrderKey()].Update(
                t.pieceRequestOrderKey(pieceIndex),
                t.requestStrategyPieceOrderState(pieceIndex))
@@ -18,6 +21,9 @@ func (t *Torrent) clientPieceRequestOrderKey() interface{} {
 }
 
 func (t *Torrent) deletePieceRequestOrder() {
+       if t.storage == nil {
+               return
+       }
        cpro := t.cl.pieceRequestOrder
        key := t.clientPieceRequestOrderKey()
        pro := cpro[key]
@@ -30,17 +36,23 @@ func (t *Torrent) deletePieceRequestOrder() {
 }
 
 func (t *Torrent) initPieceRequestOrder() {
+       if t.storage == nil {
+               return
+       }
        if t.cl.pieceRequestOrder == nil {
                t.cl.pieceRequestOrder = make(map[interface{}]*request_strategy.PieceRequestOrder)
        }
        key := t.clientPieceRequestOrderKey()
        cpro := t.cl.pieceRequestOrder
        if cpro[key] == nil {
-               cpro[key] = request_strategy.NewPieceOrder()
+               cpro[key] = request_strategy.NewPieceOrder(request_strategy.NewAjwernerBtree(), t.numPieces())
        }
 }
 
 func (t *Torrent) addRequestOrderPiece(i int) {
+       if t.storage == nil {
+               return
+       }
        t.cl.pieceRequestOrder[t.clientPieceRequestOrderKey()].Add(
                t.pieceRequestOrderKey(i),
                t.requestStrategyPieceOrderState(i))