Improved memory stream

uholeschak · Dec 16, 2024 · df1ce71 · df1ce71
1 parent b2e5e97
commit df1ce71
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/BmwDeepObd/BmwDeepObd.csproj b/BmwDeepObd/BmwDeepObd.csproj
@@ -77,6 +77,7 @@
     <PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
     <PackageReference Include="Karamunting.Android.Skydoves.Balloon" Version="1.1.5" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0" />
     <PackageReference Include="Xamarin.AndroidX.Activity" Version="1.9.3.1" />

diff --git a/Tools/ApkUncompress/ApkUncompress.csproj b/Tools/ApkUncompress/ApkUncompress.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="ELFSharp" Version="2.17.3" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
   </ItemGroup>
 

diff --git a/Tools/ApkUncompress/ApkUncompressCommon.cs b/Tools/ApkUncompress/ApkUncompressCommon.cs
@@ -10,6 +10,7 @@
 using Xamarin.Android.AssemblyStore;
 using Xamarin.Android.Tasks;
 using System.Collections;
+using Microsoft.IO;
 
 namespace ApkUncompress;
 
@@ -18,6 +19,7 @@ public class ApkUncompressCommon
     public const string AssembliesLibPath = "lib/";
     public const string AssembliesPathApk = "assemblies/";
     public const string AssembliesPathAab = "base/root/assemblies/";
+    public static readonly RecyclableMemoryStreamManager MemoryStreamManager = new RecyclableMemoryStreamManager();
 
     private const uint CompressedDataMagic = 0x5A4C4158; // 'XALZ', little-endian
     private readonly ArrayPool<byte> bytePool;
@@ -143,6 +145,7 @@ public bool UncompressFromAPK_IndividualElfFiles(ZipFile apk, string filePath, s
             else if (entryFileName.StartsWith(MonoAndroidHelper.MANGLED_ASSEMBLY_SATELLITE_ASSEMBLY_MARKER, StringComparison.OrdinalIgnoreCase))
             {
                 assemblyFileName = cleanedFileName.Remove(0, MonoAndroidHelper.MANGLED_ASSEMBLY_SATELLITE_ASSEMBLY_MARKER.Length);
+                // MonoAndroidHelper.SATELLITE_CULTURE_END_MARKER_CHAR is incorrect!
                 int cultureSepIndex = assemblyFileName.IndexOf('-');
                 if (cultureSepIndex < 1)
                 {
@@ -192,7 +195,7 @@ public bool UncompressFromAPK_IndividualElfFiles(ZipFile apk, string filePath, s
                 continue;
             }
 
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (RecyclableMemoryStream memoryStream = new RecyclableMemoryStream(MemoryStreamManager))
             {
                 byte[] buffer = new byte[4096]; // 4K is optimum
                 using (Stream zipStream = apk.GetInputStream(entry))
@@ -287,7 +290,7 @@ public bool UncompressFromAPK_IndividualEntries(ZipFile apk, string filePath, st
                 continue;
             }
 
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (RecyclableMemoryStream memoryStream = new RecyclableMemoryStream(MemoryStreamManager))
             {
                 byte[] buffer = new byte[4096]; // 4K is optimum
                 using (Stream zipStream = apk.GetInputStream(entry))
@@ -325,11 +328,11 @@ public bool UncompressFromAPK_AssemblyStores(string filePath, string prefix, str
                 assemblyName = Path.Combine(assembly.Store.Arch, assemblyName);
             }
 
-            using (var stream = new MemoryStream())
+            using (RecyclableMemoryStream memoryStream = new RecyclableMemoryStream(MemoryStreamManager))
             {
-                assembly.ExtractImage(stream);
-                stream.Seek(0, SeekOrigin.Begin);
-                UncompressDLL(stream, assemblyName, prefix, outputPath);
+                assembly.ExtractImage(memoryStream);
+                memoryStream.Seek(0, SeekOrigin.Begin);
+                UncompressDLL(memoryStream, assemblyName, prefix, outputPath);
             }
         }
 

diff --git a/Tools/ApkUncompress/AssemblyStore/AssemblyStoreExplorer.cs b/Tools/ApkUncompress/AssemblyStore/AssemblyStoreExplorer.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using ApkUncompress;
 using ICSharpCode.SharpZipLib.Core;
 using ICSharpCode.SharpZipLib.Zip;
+using Microsoft.IO;
 
 namespace Xamarin.Android.AssemblyStore
 {
@@ -233,7 +235,7 @@ void ReadStoreSetFromArchive (ZipFile archive, string basePathInArchive)
 					continue;
 				}
 
-				using (var stream = new MemoryStream ()) {
+				using (RecyclableMemoryStream stream = new RecyclableMemoryStream(ApkUncompressCommon.MemoryStreamManager)) {
                     byte[] buffer = new byte[4096]; // 4K is optimum
                     using (Stream zipStream = archive.GetInputStream(entry))
                     {

diff --git a/Tools/ApkUncompress/AssemblyStore/AssemblyStoreReader.cs b/Tools/ApkUncompress/AssemblyStore/AssemblyStoreReader.cs
@@ -1,3 +1,5 @@
+using ApkUncompress;
+using Microsoft.IO;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
@@ -12,7 +14,7 @@ class AssemblyStoreReader
 		const uint ASSEMBLY_STORE_MAGIC = 0x41424158; // 'XABA', little-endian
 		const uint ASSEMBLY_STORE_FORMAT_VERSION = 1; // The highest format version this reader understands
 
-		MemoryStream? storeData;
+        RecyclableMemoryStream? storeData;
 
 		public uint Version                               { get; private set; }
 		public uint LocalEntryCount                       { get; private set; }
@@ -31,7 +33,7 @@ public AssemblyStoreReader (Stream store, string? arch = null, bool keepStoreInM
 
 			store.Seek (0, SeekOrigin.Begin);
 			if (keepStoreInMemory) {
-				storeData = new MemoryStream ();
+				storeData = new RecyclableMemoryStream(ApkUncompressCommon.MemoryStreamManager);
 				store.CopyTo (storeData);
 				storeData.Flush ();
 				store.Seek (0, SeekOrigin.Begin);