Merge pull request #308 from CortexFoundation/dev

piece analyse

backend/handler.go

@@ -55,6 +55,7 @@ import (
 	//xlog "github.com/anacrolix/log"
 	//"github.com/anacrolix/missinggo/v2/filecache"
 	"github.com/anacrolix/torrent"
+	"github.com/anacrolix/torrent/analysis"
 	"github.com/anacrolix/torrent/bencode"
 	"github.com/anacrolix/torrent/iplist"
 	"github.com/anacrolix/torrent/metainfo"
@@ -615,6 +616,7 @@ func NewTorrentManager(config *params.Config, fsid uint64, cache, compress bool)
 	if err != nil {
 		return nil, err
 	}
+	fc.SetCapacity(10 << 30)
 	cfg.DefaultStorage = storage.NewResourcePieces(fc.AsResourceProvider())*/
 
 	cfg.DefaultStorage = storage.NewMMap(config.DataDir)
@@ -623,22 +625,25 @@ func NewTorrentManager(config *params.Config, fsid uint64, cache, compress bool)
 	//cfg.DisableEncryption = true
 	//cfg.HTTPUserAgent = "Cortex"
 	cfg.Seed = true
-	//cfg.Debug=true
 
 	cfg.EstablishedConnsPerTorrent = int(math.Min(float64(runtime.NumCPU()*2), float64(50))) //4 //len(config.DefaultTrackers)
 	cfg.HalfOpenConnsPerTorrent = cfg.EstablishedConnsPerTorrent / 2
 
 	cfg.ListenPort = config.Port
-	if config.Quiet {
-		//cfg.Logger = xlog.Discard
+	if !config.Quiet {
+		var pieceOrdering analysis.PeerUploadOrder
+		pieceOrdering.Init()
+		pieceOrdering.Install(&cfg.Callbacks)
+
+		//cfg.Debug=true
 	}
-	//cfg.Debug = true
 	cfg.DropDuplicatePeerIds = true
 	cfg.Bep20 = params.ClientVersion //"-COLA01-"
 	//id := strconv.FormatUint(fsid, 16)[0:14]
 	//cfg.PeerID = "cortex" + id
 	//cfg.ListenHost = torrent.LoopbackListenHost
 	//cfg.DhtStartingNodes = dht.GlobalBootstrapAddrs //func() ([]dht.Addr, error) { return nil, nil }
+
 	cfg.ConfigureAnacrolixDhtServer = func(cfg *dht.ServerConfig) {
 		cfg.InitNodeId()
 		if cfg.PeerStore == nil {

cmd/server/main.go

@@ -80,6 +80,7 @@ func run(conf *Config) error {
 	config.Port = 0
 	config.Server = true
 	config.Wormhole = false
+	config.Quiet = false
 
 	//config.DisableUTP = false
 

go.mod

@@ -10,12 +10,12 @@ require (
 	github.com/anacrolix/log v0.13.2-0.20221123232138-02e2764801c3
 	github.com/anacrolix/missinggo/v2 v2.7.1
 	github.com/anacrolix/tagflag v1.3.1-0.20210717093243-41ae76143afa
-	github.com/anacrolix/torrent v1.48.1-0.20230123215249-d47739db0c59
+	github.com/anacrolix/torrent v1.48.1-0.20230130214106-5a185c45c08c
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/deckarep/golang-set/v2 v2.1.0
 	github.com/dustin/go-humanize v1.0.0
-	github.com/edsrzf/mmap-go v1.1.0
+	github.com/edsrzf/mmap-go v1.1.1-0.20220903035803-8e5d0fe06024
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
@@ -32,6 +32,8 @@ require (
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
 )
 
+require github.com/elliotchance/orderedmap v1.4.0 // indirect
+
 require (
 	crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
 	github.com/RoaringBitmap/roaring v1.2.3 // indirect

go.sum

@@ -84,8 +84,8 @@ github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pm
 github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8=
 github.com/anacrolix/tagflag v1.3.1-0.20210717093243-41ae76143afa h1:ObMmvS9ysQI9zKRPbLbPzR6I77l1Eiie2u9I3whKlJI=
 github.com/anacrolix/tagflag v1.3.1-0.20210717093243-41ae76143afa/go.mod h1:PSF7SW1eKAti6ZaqkGMzKZ6K4y4G2j8rEAmwpu6fo9Q=
-github.com/anacrolix/torrent v1.48.1-0.20230123215249-d47739db0c59 h1:J3AQJ8m9igbvzv2atm6SDMO+YFNGpQVR0xnE/aapThg=
-github.com/anacrolix/torrent v1.48.1-0.20230123215249-d47739db0c59/go.mod h1:CSREuKRFlbHifecdogdFDt+geYf5MnDQyRPg+1O8W8E=
+github.com/anacrolix/torrent v1.48.1-0.20230130214106-5a185c45c08c h1:dLLwhIfTfKt8TY3wUWEfac+Vm3DKOxxWE5TSY56ETrs=
+github.com/anacrolix/torrent v1.48.1-0.20230130214106-5a185c45c08c/go.mod h1:CSREuKRFlbHifecdogdFDt+geYf5MnDQyRPg+1O8W8E=
 github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA=
 github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96/go.mod h1:Wa6n8cYIdaG35x15aH3Zy6d03f7P728QfdcDeD/IEOs=
 github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4=
@@ -154,9 +154,11 @@ github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJ
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
-github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
+github.com/edsrzf/mmap-go v1.1.1-0.20220903035803-8e5d0fe06024 h1:Ih54x9IH1Fh2C/t6SZlXAFftvgY+OitbxP+jvYjzbqM=
+github.com/edsrzf/mmap-go v1.1.1-0.20220903035803-8e5d0fe06024/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
+github.com/elliotchance/orderedmap v1.4.0 h1:wZtfeEONCbx6in1CZyE6bELEt/vFayMvsxqI5SgsR+A=
+github.com/elliotchance/orderedmap v1.4.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=