From a0d13ad6f33a7e12dbc11c2c190a9cb981266606 Mon Sep 17 00:00:00 2001 From: "alan.mcgovern" Date: Tue, 31 Jan 2023 19:45:34 +0000 Subject: [PATCH 1/2] [core] Ratelimiters should allow requests larger than chunk size If the ratelimiter is set to download at 15kB/sec or less, the amount of data in the ratelimit will always be less than the size of one block. In this case, we should allow the request to succeed. Once there's negative data left in the allowance, deny requests. As the ratelimiter is topped up over time, future requests will be unblocked. --- .../RateLimiter.cs | 2 +- .../RateLimiterTests.cs | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs diff --git a/src/MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiter.cs b/src/MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiter.cs index c4967e38b..284e6b85d 100644 --- a/src/MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiter.cs +++ b/src/MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiter.cs @@ -79,7 +79,7 @@ public bool TryProcess (long amount) long c; do { c = Interlocked.Read (ref chunks); - if (c < amount) + if (c < 0) return false; } while (Interlocked.CompareExchange (ref chunks, c - amount, c) != c); diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs new file mode 100644 index 000000000..5f8065ee3 --- /dev/null +++ b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs @@ -0,0 +1,64 @@ +// +// RateLimiterTests.cs +// +// Authors: +// Alan McGovern alan.mcgovern@gmail.com +// +// Copyright (C) 2019 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 System.Net; +using System.Threading.Tasks; + +using MonoTorrent.BEncoding; +using MonoTorrent.Connections; +using MonoTorrent.Messages; +using MonoTorrent.Messages.Peer; +using MonoTorrent.Messages.Peer.Libtorrent; +using MonoTorrent.Trackers; + +using NUnit.Framework; + +namespace MonoTorrent.Client.RateLimiters +{ + [TestFixture] + public class RateLimiterTests + { + [Test] + public void ChunkSizeLargerThanRateLimit () + { + var rateLimiter = new RateLimiter (); + rateLimiter.UpdateChunks (10, 10, 10); + + // We can process any size chunk as long as there's some rate limit left + Assert.IsTrue (rateLimiter.TryProcess (11)); + + // Once the entire rate limit has been consumed, no chunks can be processed + Assert.IsFalse (rateLimiter.TryProcess (1)); + + } + } +} From b8f5e5bf129b4025bbd5400aa0c61d70fe53bac0 Mon Sep 17 00:00:00 2001 From: Alan McGovern Date: Tue, 31 Jan 2023 19:56:36 +0000 Subject: [PATCH 2/2] Update src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs --- .../MonoTorrent.Client.RateLimiters/RateLimiterTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs index 5f8065ee3..6209ff09b 100644 --- a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs +++ b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.RateLimiters/RateLimiterTests.cs @@ -4,7 +4,7 @@ // Authors: // Alan McGovern alan.mcgovern@gmail.com // -// Copyright (C) 2019 Alan McGovern +// Copyright (C) 2023 Alan McGovern // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the