Remove BytePool

Author: jjxtra

IPBanCore/Core/Utility/BytePool.cs

@@ -701,12 +701,8 @@ public static IPAddress ToIPAddress(this UInt128 value)
         public static unsafe IPAddress ToIPAddressRaw(this UInt128 value)
         {
             byte* bytes = (byte*)&value;
-            using var managedBytes = BytePool.Rent(16);
-            for (int i = 0; i < 16; i++)
-            {
-                managedBytes[i] = bytes[i];
-            }
-            return new IPAddress(managedBytes.AsSpan());
+            ReadOnlySpan<byte> spanBytes = new(bytes, 16);
+            return new IPAddress(spanBytes);
         }
 
         /// <summary>

IPBanCore/Core/Utility/ExtensionMethods.cs

@@ -504,57 +504,64 @@ private void ProcessFile(WatchedFile file, FileStream fs)
             fs.Position = file.LastPosition;
 
             // fill up to 64K bytes
-            using var bytes = BytePool.Rent(ushort.MaxValue);
-            int read = fs.Read(bytes, 0, ushort.MaxValue);
+            var bytes = ArrayPool<byte>.Shared.Rent(ushort.MaxValue);
+            try
+            {
+                int read = fs.Read(bytes, 0, ushort.MaxValue);
 
-            // setup state
-            int bytesEnd;
-            bool foundNewLine = false;
+                // setup state
+                int bytesEnd;
+                bool foundNewLine = false;
 
-            // find the last newline char
-            for (bytesEnd = read - 1; bytesEnd >= 0; bytesEnd--)
-            {
-                if (bytes[bytesEnd] == '\n')
+                // find the last newline char
+                for (bytesEnd = read - 1; bytesEnd >= 0; bytesEnd--)
                 {
-                    // take bytes up to and including the last newline char
-                    bytesEnd++;
-                    foundNewLine = true;
-                    break;
+                    if (bytes[bytesEnd] == '\n')
+                    {
+                        // take bytes up to and including the last newline char
+                        bytesEnd++;
+                        foundNewLine = true;
+                        break;
+                    }
                 }
-            }
 
-            // check for binary file
-            if (!foundNewLine)
-            {
-                if (read > maxLineLength)
+                // check for binary file
+                if (!foundNewLine)
                 {
-                    // max line length bytes without a new line
-                    file.IsBinaryFile = true;
-                    Logger.Warn($"Aborting parsing log file {file.FileName}, file may be a binary file");
+                    if (read > maxLineLength)
+                    {
+                        // max line length bytes without a new line
+                        file.IsBinaryFile = true;
+                        Logger.Warn($"Aborting parsing log file {file.FileName}, file may be a binary file");
+                    }
+                    // reset position try again on next cycle
+                    fs.Position = file.LastPosition;
+                    return;
                 }
-                // reset position try again on next cycle
-                fs.Position = file.LastPosition;
-                return;
-            }
 
-            // if we found a newline, process all the text up until that newline
-            if (foundNewLine)
-            {
-                try
-                {
-                    // strip out all carriage returns and ensure string starts/ends with newlines
-                    string foundText = encoding.GetString(bytes, 0, bytesEnd).Trim().Replace("\r", string.Empty);
-                    string processText = "\n" + foundText + "\n";
-                    OnProcessText(processText);
-                    ProcessText?.Invoke(processText);
-                }
-                finally
+                // if we found a newline, process all the text up until that newline
+                if (foundNewLine)
                 {
-                    // set file position for next processing
-                    fs.Position = file.LastPosition + bytesEnd;
-                    file.LastPosition = fs.Position;
+                    try
+                    {
+                        // strip out all carriage returns and ensure string starts/ends with newlines
+                        string foundText = encoding.GetString(bytes, 0, bytesEnd).Trim().Replace("\r", string.Empty);
+                        string processText = "\n" + foundText + "\n";
+                        OnProcessText(processText);
+                        ProcessText?.Invoke(processText);
+                    }
+                    finally
+                    {
+                        // set file position for next processing
+                        fs.Position = file.LastPosition + bytesEnd;
+                        file.LastPosition = fs.Position;
+                    }
                 }
             }
+            finally
+            {
+                ArrayPool<byte>.Shared.Return(bytes);
+            }
         }
     }
 }