-
-
Notifications
You must be signed in to change notification settings - Fork 397
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[core] Allow the StreamingPicker to pick any piece
A prior change to ensure pieces from within the high, or low priority range were always prioritised ahead of pieces from the 'not important at all' range accidentally made the picker not chooose pieces from the 'not important at all' set. This would have little significance for real world streaming scenarios as the 'not important at all' set are pieces which come are before the current file position, i.e. pieces the media player would not try to use. Fixes #425
- Loading branch information
1 parent
4961054
commit c9e31cf
Showing
2 changed files
with
119 additions
and
22 deletions.
There are no files selected for viewing
109 changes: 109 additions & 0 deletions
109
src/MonoTorrent.Tests/Client/StreamingPieceRequesterTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| // | ||
| // StreamingPieceRequesterTests.cs | ||
| // | ||
| // Authors: | ||
| // Alan McGovern [email protected] | ||
| // | ||
| // Copyright (C) 2021 Alan McGovern | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // | ||
|
|
||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
|
|
||
| using MonoTorrent.Client.Messages; | ||
| using MonoTorrent.Client.Messages.Standard; | ||
|
|
||
| using NUnit.Framework; | ||
|
|
||
| namespace MonoTorrent.Client.PiecePicking | ||
| { | ||
| [TestFixture] | ||
| public class StreamingPieceRequesterTests | ||
| { | ||
| class TorrentData : ITorrentData | ||
| { | ||
| public IList<ITorrentFileInfo> Files { get; } = TorrentFileInfo.Create (Piece.BlockSize * 8, 1024 * 1024 * 8); | ||
| public int PieceLength => Piece.BlockSize * 8; | ||
| public long Size => Files[0].Length; | ||
| } | ||
|
|
||
| [Test] | ||
| public void PickFromBeforeHighPrioritySet () | ||
| { | ||
| var data = new TorrentData (); | ||
| var ignoringBitfield = new MutableBitField (data.PieceCount ()) | ||
| .SetAll (true) | ||
| .Set (0, false); | ||
|
|
||
| var requester = new StreamingPieceRequester (); | ||
| requester.Initialise (data, new[] { ignoringBitfield }); | ||
| requester.SeekToPosition (data.Files[0], data.PieceLength * 3); | ||
|
|
||
| var peer = PeerId.CreateNull (ignoringBitfield.Length, true, false, true); | ||
| requester.AddRequests (peer, Array.Empty<IPeerWithMessaging> ()); | ||
| Assert.AreEqual (2, peer.AmRequestingPiecesCount); | ||
|
|
||
| var requests = GetRequests (peer); | ||
| Assert.AreEqual (2, requests.Count); | ||
| Assert.IsTrue (requests.All (r => r.PieceIndex == 0)); | ||
| } | ||
|
|
||
| [Test] | ||
| public void PickHighestPriority () | ||
| { | ||
| var data = new TorrentData (); | ||
| var ignoringBitfield = new MutableBitField (data.PieceCount ()) | ||
| .SetAll (false); | ||
|
|
||
| var requester = new StreamingPieceRequester (); | ||
| requester.Initialise (data, new[] { ignoringBitfield }); | ||
| requester.SeekToPosition (data.Files[0], data.PieceLength * 3); | ||
|
|
||
| var peer = PeerId.CreateNull (ignoringBitfield.Length, true, false, true); | ||
| requester.AddRequests (peer, Array.Empty<IPeerWithMessaging> ()); | ||
| Assert.AreEqual (4, peer.AmRequestingPiecesCount); | ||
|
|
||
| var requests = GetRequests (peer); | ||
| Assert.AreEqual (4, requests.Count); | ||
| Assert.IsTrue (requests.All (r => r.PieceIndex == 3)); | ||
| } | ||
|
|
||
| static List<RequestMessage> GetRequests (PeerId peer) | ||
| { | ||
| List<RequestMessage> results = new List<RequestMessage> (); | ||
| while (peer.MessageQueue.QueueLength > 0) { | ||
| var message = peer.MessageQueue.TryDequeue (); | ||
| if (message is RequestMessage r) { | ||
| results.Add (r); | ||
| } else if (message is RequestBundle bundle) { | ||
| foreach (var inner in bundle.ToRequestMessages ()) | ||
| if (inner is RequestMessage req) | ||
| results.Add (req); | ||
| } | ||
| } | ||
| return results; | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters