Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Ratelimiters should allow requests larger than chunk size #617

Merged
merged 2 commits into from
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
//
// RateLimiterTests.cs
//
// Authors:
// Alan McGovern [email protected]
//
// 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
// "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));

}
}
}