From 25008054b0fdbddaa8a1e53ca26f10349092f97f Mon Sep 17 00:00:00 2001
From: Guillaume <guillaume.ws.rame@gmail.com>
Date: Tue, 16 Nov 2021 20:16:50 +0000
Subject: [PATCH 1/2] DirectBuffer - Support ArraySegment for backing storage

---
 csharp/sbe-dll/DirectBuffer.cs        | 37 +++++++++++++++++++++++++++
 csharp/sbe-tests/DirectBufferTests.cs | 34 ++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/csharp/sbe-dll/DirectBuffer.cs b/csharp/sbe-dll/DirectBuffer.cs
index 52b78ea4af..4e43474ab3 100644
--- a/csharp/sbe-dll/DirectBuffer.cs
+++ b/csharp/sbe-dll/DirectBuffer.cs
@@ -64,6 +64,25 @@ public DirectBuffer(byte* pBuffer, int bufferLength, BufferOverflowDelegate buff
             Wrap(pBuffer, bufferLength);
         }
 
+                /// <summary>
+        /// Attach a view to an unmanaged buffer owned by external code
+        /// </summary>
+        /// <param name="buffer">Unmanaged byte buffer</param>
+        public DirectBuffer(ArraySegment<byte> buffer) : this(buffer, null)
+        {
+        }
+
+        /// <summary>
+        /// Attach a view to an unmanaged buffer owned by external code
+        /// </summary>
+        /// <param name="buffer">Unmanaged byte buffer</param>
+        /// <param name="bufferOverflow">delegate to allow reallocation of buffer</param>
+        public DirectBuffer(ArraySegment<byte> buffer, BufferOverflowDelegate bufferOverflow)
+        {
+            this.bufferOverflow = bufferOverflow;
+            Wrap(buffer);
+        }
+
         /// <summary>
         /// Creates a DirectBuffer that can later be wrapped
         /// </summary>
@@ -114,6 +133,24 @@ public void Wrap(byte* pBuffer, int bufferLength)
             _needToFreeGCHandle = false;
         }
 
+        /// <summary>
+        /// Recycles an existing <see cref="DirectBuffer"/> from a byte buffer owned by external code
+        /// </summary>
+        /// <param name="buffer">buffer of bytes</param>
+        public void Wrap(ArraySegment<byte> buffer)
+        {
+            if (buffer == null) throw new ArgumentNullException(nameof(buffer));
+
+            FreeGCHandle();
+
+            // pin the buffer so it does not get moved around by GC, this is required since we use pointers
+            _pinnedGCHandle = GCHandle.Alloc(buffer.Array, GCHandleType.Pinned);
+            _needToFreeGCHandle = true;
+
+            _pBuffer = ((byte*)_pinnedGCHandle.AddrOfPinnedObject().ToPointer()) + buffer.Offset;
+            _capacity = buffer.Count;
+        }
+
         /// <summary>
         /// Capacity of the underlying buffer
         /// </summary>
diff --git a/csharp/sbe-tests/DirectBufferTests.cs b/csharp/sbe-tests/DirectBufferTests.cs
index 2ac82e4e07..4c37ebe1f0 100644
--- a/csharp/sbe-tests/DirectBufferTests.cs
+++ b/csharp/sbe-tests/DirectBufferTests.cs
@@ -66,6 +66,40 @@ public void ConstructFromNativeBuffer()
             }
         }
 
+        [TestMethod]
+        public void ConstructFromByteArray()
+        {
+            var buffer = new byte[16];
+
+            const int value = 5;
+            const int index = 0;
+            
+            using (var directBuffer = new DirectBuffer(buffer))
+            {
+                directBuffer.Int64PutLittleEndian(index, value);
+                Assert.AreEqual(value, buffer[index]);
+            }
+        }
+
+        [TestMethod]
+        public void ConstructFromArraySegment()
+        {
+            const int value = 5;
+            const int index = 0;
+            const int offset = 512;
+            const int size = 1024;
+
+            var bigBuffer = new byte[size];
+            var buffer = new ArraySegment<byte>(bigBuffer, offset, size - offset);
+            
+            using (var directBuffer = new DirectBuffer(buffer))
+            {
+                directBuffer.Int64PutLittleEndian(index, value);
+                Assert.AreEqual(value, bigBuffer[offset + index]);
+                Assert.AreEqual(value, buffer.AsSpan<byte>()[index]);
+            }
+        }
+
         [TestMethod]
         public void Recycle()
         {

From 5117d799bb57e5a8096de1ff5728457f37693a53 Mon Sep 17 00:00:00 2001
From: Guillaume <guillaume.ws.rame@gmail.com>
Date: Tue, 16 Nov 2021 20:19:36 +0000
Subject: [PATCH 2/2] fix comments

---
 csharp/sbe-dll/DirectBuffer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/csharp/sbe-dll/DirectBuffer.cs b/csharp/sbe-dll/DirectBuffer.cs
index 4e43474ab3..09eb64ec7e 100644
--- a/csharp/sbe-dll/DirectBuffer.cs
+++ b/csharp/sbe-dll/DirectBuffer.cs
@@ -64,18 +64,18 @@ public DirectBuffer(byte* pBuffer, int bufferLength, BufferOverflowDelegate buff
             Wrap(pBuffer, bufferLength);
         }
 
-                /// <summary>
-        /// Attach a view to an unmanaged buffer owned by external code
+        /// <summary>
+        /// Attach a view to a buffer owned by external code
         /// </summary>
-        /// <param name="buffer">Unmanaged byte buffer</param>
+        /// <param name="buffer">byte buffer</param>
         public DirectBuffer(ArraySegment<byte> buffer) : this(buffer, null)
         {
         }
 
         /// <summary>
-        /// Attach a view to an unmanaged buffer owned by external code
+        /// Attach a view to a buffer owned by external code
         /// </summary>
-        /// <param name="buffer">Unmanaged byte buffer</param>
+        /// <param name="buffer">byte buffer</param>
         /// <param name="bufferOverflow">delegate to allow reallocation of buffer</param>
         public DirectBuffer(ArraySegment<byte> buffer, BufferOverflowDelegate bufferOverflow)
         {