Use RecyclableMemoryStream for MemoryStreams (#6371)

* Use RecyclableMemoryStream for MemoryStreams * Use regular MemoryStream for recorder * leaveOpen: true * Use for recorder also
NethermindEth · Dec 15, 2023 · 9bed546 · 9bed546
1 parent bce3244
commit 9bed546
Show file tree

Hide file tree

Showing 7 changed files with 159 additions and 131 deletions.
diff --git a/src/Nethermind/Directory.Packages.props b/src/Nethermind/Directory.Packages.props
@@ -44,6 +44,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
     <PackageVersion Include="Nethermind.Crypto.Pairings" Version="1.0.1" />

diff --git a/src/Nethermind/Nethermind.Core/Nethermind.Core.csproj b/src/Nethermind/Nethermind.Core/Nethermind.Core.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="Nethermind.Numerics.Int256" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Nethermind.Logging\Nethermind.Logging.csproj" />

diff --git a/src/Nethermind/Nethermind.Core/Resettables/RecyclableStream.cs b/src/Nethermind/Nethermind.Core/Resettables/RecyclableStream.cs
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Microsoft.IO;
+
+namespace Nethermind.Core.Resettables;
+
+public class RecyclableStream
+{
+    private static readonly RecyclableMemoryStreamManager _manager = new RecyclableMemoryStreamManager();
+    public static RecyclableMemoryStream GetStream(string tag) => _manager.GetStream(tag);
+}
diff --git a/src/Nethermind/Nethermind.JsonRpc.TraceStore/ParityLikeTraceSerializer.cs b/src/Nethermind/Nethermind.JsonRpc.TraceStore/ParityLikeTraceSerializer.cs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.IO.Compression;
+
+using Nethermind.Core.Resettables;
 using Nethermind.Evm.Tracing.ParityStyle;
 using Nethermind.Logging;
 using Nethermind.Serialization.Json;
@@ -49,8 +51,8 @@ public byte[] Serialize(IReadOnlyCollection<ParityLikeTxTrace> traces)
 
         CheckDepth(traces);
 
-        using MemoryStream output = new();
-        using (GZipStream compressionStream = new(output, CompressionMode.Compress))
+        using MemoryStream output = RecyclableStream.GetStream("Parity");
+        using (GZipStream compressionStream = new(output, CompressionMode.Compress, leaveOpen: true))
         {
             _jsonSerializer.Serialize(compressionStream, traces);
         }

diff --git a/src/Nethermind/Nethermind.JsonRpc/JsonRpcProcessor.cs b/src/Nethermind/Nethermind.JsonRpc/JsonRpcProcessor.cs
diff --git a/src/Nethermind/Nethermind.KeyStore/AesEncrypter.cs b/src/Nethermind/Nethermind.KeyStore/AesEncrypter.cs
@@ -5,6 +5,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
+
+using Nethermind.Core.Resettables;
 using Nethermind.KeyStore.Config;
 using Nethermind.Logging;
 
@@ -41,7 +43,7 @@ public byte[] Encrypt(byte[] content, byte[] key, byte[] iv, string cipherType)
                         }
                     case "aes-128-ctr":
                         {
-                            using var outputEncryptedStream = new MemoryStream();
+                            using var outputEncryptedStream = RecyclableStream.GetStream("aes-128-ctr-encrypt");
                             using var inputStream = new MemoryStream(content);
                             AesCtr(key, iv, inputStream, outputEncryptedStream);
                             outputEncryptedStream.Position = 0;
@@ -78,7 +80,7 @@ public byte[] Decrypt(byte[] cipher, byte[] key, byte[] iv, string cipherType)
                     case "aes-128-ctr":
                         {
                             using var outputEncryptedStream = new MemoryStream(cipher);
-                            using var outputDecryptedStream = new MemoryStream();
+                            using var outputDecryptedStream = RecyclableStream.GetStream("aes-128-ctr-decrypt");
                             AesCtr(key, iv, outputEncryptedStream, outputDecryptedStream);
                             outputDecryptedStream.Position = 0;
                             return outputDecryptedStream.ToArray();
@@ -96,9 +98,9 @@ public byte[] Decrypt(byte[] cipher, byte[] key, byte[] iv, string cipherType)
 
         private byte[] Execute(ICryptoTransform cryptoTransform, byte[] data)
         {
-            using (var memoryStream = new MemoryStream())
+            using (var memoryStream = RecyclableStream.GetStream(nameof(AesEncrypter)))
             {
-                using (var cryptoStream = new CryptoStream(memoryStream, cryptoTransform, CryptoStreamMode.Write))
+                using (var cryptoStream = new CryptoStream(memoryStream, cryptoTransform, CryptoStreamMode.Write, leaveOpen: true))
                 {
                     cryptoStream.Write(data, 0, data.Length);
                     cryptoStream.FlushFinalBlock();

diff --git a/src/Nethermind/Nethermind.Runner/JsonRpc/Startup.cs b/src/Nethermind/Nethermind.Runner/JsonRpc/Startup.cs
@@ -26,6 +26,7 @@
 using Nethermind.Config;
 using Nethermind.Core.Authentication;
 using Nethermind.Core.Extensions;
+using Nethermind.Core.Resettables;
 using Nethermind.HealthChecks;
 using Nethermind.JsonRpc;
 using Nethermind.JsonRpc.Modules;
@@ -167,7 +168,7 @@ void SerializeTimeoutException(IJsonRpcService service, IBufferWriter<byte> resu
                         JsonRpcContext jsonRpcContext = JsonRpcContext.Http(jsonRpcUrl);
                         await foreach (JsonRpcResult result in jsonRpcProcessor.ProcessAsync(request, jsonRpcContext))
                         {
-                            Stream stream = jsonRpcConfig.BufferResponses ? new MemoryStream() : null;
+                            using Stream stream = jsonRpcConfig.BufferResponses ? RecyclableStream.GetStream("http") : null;
                             ICountingBufferWriter resultWriter = stream is not null ? new CountingStreamPipeWriter(stream) : new CountingPipeWriter(ctx.Response.BodyWriter);
                             try
                             {