fix: piece下载死锁

JiahuiZhuo · Feb 28, 2020 · b0bd2a7 · b0bd2a7
1 parent ee4ff7d
commit b0bd2a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/protocol/bt/torrent/peer_conn.go b/protocol/bt/torrent/peer_conn.go
@@ -212,6 +212,8 @@ func (pc *peerConn) downloadPiece(index int) error {
 		select {
 		case pc.blockQueueCh <- nil:
 			break
+		case err := <-pc.downloadedCh:
+			return err
 		case err := <-pc.disconnectCh:
 			return err
 		}

diff --git a/protocol/bt/torrent/torrent.go b/protocol/bt/torrent/torrent.go
@@ -2,7 +2,6 @@ package torrent
 
 import (
 	"errors"
-	"fmt"
 	"github.com/monkeyWie/gopeed/protocol/bt/metainfo"
 	log "github.com/sirupsen/logrus"
 	"time"
@@ -43,7 +42,6 @@ func (t *Torrent) Download(path string) {
 		index := t.pieces.getReady()
 		// 没有待下载的piece了
 		if index == -1 {
-			fmt.Println("wait piece")
 			if <-t.completeCh {
 				// 下载完成
 				break