Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Allow stream to read more than minimum number of required bytes
  • Loading branch information
Daniel-Svensson committed Jul 26, 2022
commit 64ee4ba9904882c6f15b8fa868e6b24073218d13
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,8 @@ public byte[] GetBuffer(int count, out int offset, out int offsetMax)
return _buffer;
}

private ref byte GetBufferRef(int size)
=> ref Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(GetBuffer(size, out int offset)), offset);
private Span<byte> GetBufferSpan(int size)
=> GetBuffer(size, out int offset, out int offsetMax).AsSpan(offset, (offsetMax - offset));
=> GetBuffer(size, out int offset).AsSpan(offset, size);

public byte[] GetBuffer(out int offset, out int offsetMax)
{
Expand Down Expand Up @@ -240,7 +238,7 @@ private bool TryEnsureBytes(int count)
}
int needed = newOffsetMax - _offsetMax;
DiagnosticUtility.DebugAssert(needed > 0, "");
int read = _stream.ReadAtLeast(_buffer.AsSpan(_offsetMax, needed), needed, throwOnEndOfStream: false);
int read = _stream.ReadAtLeast(_buffer.AsSpan(_offsetMax), needed, throwOnEndOfStream: false);
_offsetMax += read;

if (read < needed)
Expand Down Expand Up @@ -957,7 +955,13 @@ public int GetInt8(int offset)

private T ReadRawBytes<T>() where T : unmanaged
{
var value = Unsafe.ReadUnaligned<T>(ref GetBufferRef(Unsafe.SizeOf<T>()));
// Unsafe
ref byte bytePtr = ref Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(GetBuffer(Unsafe.SizeOf<T>(), out int offset)), offset);
var value = Unsafe.ReadUnaligned<T>(ref bytePtr);

// SAFE
// var value = MemoryMarshal.Read<T>(GetBufferSpan(Unsafe.SizeOf<T>()));

Advance(Unsafe.SizeOf<T>());
return value;
}
Expand Down