Skip to content

Added an ImapToken cache to try and reduce ImapToken allocations #1630

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.

Sign up for GitHub

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Added an ImapToken cache to try and reduce ImapToken allocations #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aef2936
Added an ImapToken cache to try and reduce ImapToken allocations
jstedfast Aug 26, 2023
a18ff54
Modified the ImapToken caching logic to include qstring tokens
jstedfast Aug 26, 2023
3f1a5c7
Updated ImapStream, ImapEngine, and ImapCommand to reuse ByteArrayBui…
jstedfast Aug 27, 2023
90139ed
Modified ByteArrayBuilder.Clear() to downsize its buffer if it has gr…
jstedfast Aug 27, 2023
a86e4fa
Updated ImapTokenCache to be able to handle non-ASCII tokens
jstedfast Sep 4, 2023
6f9f873
Optimized ImapTokenCache.GetOrAdd() by fast-pathing charset conversion
jstedfast Sep 4, 2023
e002172
Removed unnecessary cache locking
jstedfast Sep 4, 2023
ce66da9
Fixed ImapTokenCache to properly equate non-ASCII tokens
jstedfast Mar 2, 2024
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
22 changes: 20 additions & 2 deletions MailKit/ByteArrayBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,37 @@
using System;
using System.Text;
using System.Buffers;
using System.Runtime.CompilerServices;

namespace MailKit
{
class ByteArrayBuilder : IDisposable
{
readonly int initialCapacity;
byte[] buffer;
int length;

public ByteArrayBuilder (int initialCapacity)
public ByteArrayBuilder (int capacity)
{
buffer = ArrayPool<byte>.Shared.Rent (initialCapacity);
buffer = ArrayPool<byte>.Shared.Rent (capacity);
initialCapacity = capacity;
length = 0;
}

public int Length {
get { return length; }
}

public byte this[int index] {
get { return buffer[index]; }
}

public byte[] GetBuffer ()
{
return buffer;
}

[MethodImpl (MethodImplOptions.AggressiveInlining)]
void EnsureCapacity (int capacity)
{
if (capacity > buffer.Length) {
Expand All @@ -70,6 +83,11 @@ public void Append (byte[] text, int startIndex, int count)

public void Clear ()
{
if (buffer.Length > initialCapacity * 4) {
ArrayPool<byte>.Shared.Return (buffer);
buffer = ArrayPool<byte>.Shared.Rent (initialCapacity);
}

length = 0;
}

Expand Down
2 changes: 2 additions & 0 deletions MailKit/MailKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@

<ItemGroup>
<Compile Include="Net\Imap\AsyncImapClient.cs" />
<Compile Include="Net\Imap\HashCode.cs" Condition=" $(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0' " />
<Compile Include="Net\Imap\IImapClient.cs" />
<Compile Include="Net\Imap\IImapFolder.cs" />
<Compile Include="Net\Imap\ImapAuthenticationSecretDetector.cs" />
Expand Down Expand Up @@ -99,6 +100,7 @@
<Compile Include="Net\Imap\ImapSearchQueryOptimizer.cs" />
<Compile Include="Net\Imap\ImapStream.cs" />
<Compile Include="Net\Imap\ImapToken.cs" />
<Compile Include="Net\Imap\ImapTokenCache.cs" />
<Compile Include="Net\Imap\ImapUtils.cs" />
<Compile Include="Net\Pop3\AsyncPop3Client.cs" />
<Compile Include="Net\Pop3\IPop3Client.cs" />
Expand Down
2 changes: 2 additions & 0 deletions MailKit/MailKitLite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@

<ItemGroup>
<Compile Include="Net\Imap\AsyncImapClient.cs" />
<Compile Include="Net\Imap\HashCode.cs" Condition=" $(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0' " />
<Compile Include="Net\Imap\IImapClient.cs" />
<Compile Include="Net\Imap\IImapFolder.cs" />
<Compile Include="Net\Imap\ImapAuthenticationSecretDetector.cs" />
Expand Down Expand Up @@ -100,6 +101,7 @@
<Compile Include="Net\Imap\ImapSearchQueryOptimizer.cs" />
<Compile Include="Net\Imap\ImapStream.cs" />
<Compile Include="Net\Imap\ImapToken.cs" />
<Compile Include="Net\Imap\ImapTokenCache.cs" />
<Compile Include="Net\Imap\ImapUtils.cs" />
<Compile Include="Net\Pop3\AsyncPop3Client.cs" />
<Compile Include="Net\Pop3\IPop3Client.cs" />
Expand Down
Loading
Loading