X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=piece.go;h=e08b2609690e385663c4df716d22d05ab3c7808b;hb=3901c3144bba7445c77465709e450db0f74f7ad8;hp=30ac229787eb82fe594317b1510120b5c5929df1;hpb=63f3e8d3dea55f9e01146d164c339e57e0c948cf;p=btrtrc.git

diff --git a/piece.go b/piece.go
index 30ac2297..e08b2609 100644
--- a/piece.go
+++ b/piece.go
@@ -18,9 +18,6 @@ type Piece struct {
 	t     *Torrent
 	index pieceIndex
 	files []*File
-	// Chunks we've written to since the last check. The chunk offset and
-	// length can be determined by the request chunkSize in use.
-	_dirtyChunks bitmap.Bitmap
 
 	readerCond chansync.BroadcastCond
 
@@ -31,7 +28,10 @@ type Piece struct {
 
 	publicPieceState PieceState
 	priority         piecePriority
-	availability     int64
+	// Availability adjustment for this piece relative to len(Torrent.connsWithAllPieces). This is
+	// incremented for any piece a peer has when a peer has a piece, Torrent.haveInfo is true, and
+	// the Peer isn't recorded in Torrent.connsWithAllPieces.
+	relativeAvailability int
 
 	// This can be locked when the Client lock is taken, but probably not vice versa.
 	pendingWritesMutex sync.Mutex
@@ -55,8 +55,14 @@ func (p *Piece) Storage() storage.Piece {
 	return p.t.storage.Piece(p.Info())
 }
 
+func (p *Piece) Flush() {
+	if p.t.storage.Flush != nil {
+		_ = p.t.storage.Flush()
+	}
+}
+
 func (p *Piece) pendingChunkIndex(chunkIndex chunkIndexType) bool {
-	return !p._dirtyChunks.Contains(bitmap.BitIndex(chunkIndex))
+	return !p.chunkIndexDirty(chunkIndex)
 }
 
 func (p *Piece) pendingChunk(cs ChunkSpec, chunkSize pp.Integer) bool {
@@ -64,24 +70,29 @@ func (p *Piece) pendingChunk(cs ChunkSpec, chunkSize pp.Integer) bool {
 }
 
 func (p *Piece) hasDirtyChunks() bool {
-	return p._dirtyChunks.Len() != 0
+	return p.numDirtyChunks() != 0
 }
 
-func (p *Piece) numDirtyChunks() pp.Integer {
-	return pp.Integer(p._dirtyChunks.Len())
+func (p *Piece) numDirtyChunks() chunkIndexType {
+	return chunkIndexType(roaringBitmapRangeCardinality[RequestIndex](
+		&p.t.dirtyChunks,
+		p.requestIndexOffset(),
+		p.t.pieceRequestIndexOffset(p.index+1)))
 }
 
 func (p *Piece) unpendChunkIndex(i chunkIndexType) {
-	p._dirtyChunks.Add(bitmap.BitIndex(i))
+	p.t.dirtyChunks.Add(p.requestIndexOffset() + i)
+	p.t.updatePieceRequestOrder(p.index)
 	p.readerCond.Broadcast()
 }
 
 func (p *Piece) pendChunkIndex(i RequestIndex) {
-	p._dirtyChunks.Remove(bitmap.BitIndex(i))
+	p.t.dirtyChunks.Remove(p.requestIndexOffset() + i)
+	p.t.updatePieceRequestOrder(p.index)
 }
 
-func (p *Piece) numChunks() pp.Integer {
-	return pp.Integer(p.t.pieceNumChunks(p.index))
+func (p *Piece) numChunks() chunkIndexType {
+	return p.t.pieceNumChunks(p.index)
 }
 
 func (p *Piece) incrementPendingWrites() {
@@ -110,12 +121,12 @@ func (p *Piece) waitNoPendingWrites() {
 	p.pendingWritesMutex.Unlock()
 }
 
-func (p *Piece) chunkIndexDirty(chunk pp.Integer) bool {
-	return p._dirtyChunks.Contains(bitmap.BitIndex(chunk))
+func (p *Piece) chunkIndexDirty(chunk chunkIndexType) bool {
+	return p.t.dirtyChunks.Contains(p.requestIndexOffset() + chunk)
 }
 
-func (p *Piece) chunkIndexSpec(chunk pp.Integer) ChunkSpec {
-	return chunkIndexSpec(chunk, p.length(), p.chunkSize())
+func (p *Piece) chunkIndexSpec(chunk chunkIndexType) ChunkSpec {
+	return chunkIndexSpec(pp.Integer(chunk), p.length(), p.chunkSize())
 }
 
 func (p *Piece) numDirtyBytes() (ret pp.Integer) {
@@ -141,7 +152,7 @@ func (p *Piece) chunkSize() pp.Integer {
 	return p.t.chunkSize
 }
 
-func (p *Piece) lastChunkIndex() pp.Integer {
+func (p *Piece) lastChunkIndex() chunkIndexType {
 	return p.numChunks() - 1
 }
 
@@ -160,10 +171,10 @@ func (p *Piece) VerifyData() {
 	if p.hashing {
 		target++
 	}
-	//log.Printf("target: %d", target)
+	// log.Printf("target: %d", target)
 	p.t.queuePieceCheck(p.index)
 	for {
-		//log.Printf("got %d verifies", p.numVerifies)
+		// log.Printf("got %d verifies", p.numVerifies)
 		if p.numVerifies >= target {
 			break
 		}
@@ -188,7 +199,7 @@ func (p *Piece) SetPriority(prio piecePriority) {
 	p.t.cl.lock()
 	defer p.t.cl.unlock()
 	p.priority = prio
-	p.t.updatePiecePriority(p.index)
+	p.t.updatePiecePriority(p.index, "Piece.SetPriority")
 }
 
 func (p *Piece) purePriority() (ret piecePriority) {
@@ -209,7 +220,7 @@ func (p *Piece) purePriority() (ret piecePriority) {
 }
 
 func (p *Piece) uncachedPriority() (ret piecePriority) {
-	if p.t.pieceComplete(p.index) || p.t.pieceQueuedForHash(p.index) || p.t.hashingPiece(p.index) {
+	if p.hashing || p.marking || p.t.pieceComplete(p.index) || p.queuedForHash() {
 		return PiecePriorityNone
 	}
 	return p.purePriority()
@@ -230,22 +241,17 @@ func (p *Piece) completion() (ret storage.Completion) {
 }
 
 func (p *Piece) allChunksDirty() bool {
-	return p._dirtyChunks.Len() == bitmap.BitRange(p.numChunks())
+	return p.numDirtyChunks() == p.numChunks()
 }
 
 func (p *Piece) State() PieceState {
 	return p.t.PieceState(p.index)
 }
 
-func (p *Piece) iterUndirtiedChunks(f func(cs chunkIndexType)) {
-	for i := chunkIndexType(0); i < chunkIndexType(p.numChunks()); i++ {
-		if p.chunkIndexDirty(pp.Integer(i)) {
-			continue
-		}
-		f(i)
-	}
+func (p *Piece) requestIndexOffset() RequestIndex {
+	return p.t.pieceRequestIndexOffset(p.index)
 }
 
-func (p *Piece) requestIndexOffset() RequestIndex {
-	return RequestIndex(p.index) * p.t.chunksPerRegularPiece()
+func (p *Piece) availability() int {
+	return len(p.t.connsWithAllPieces) + p.relativeAvailability
 }