warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Readers/Writers for Buffers & Fixes bugs (#283)

Browse source 
- [X] Renames PacketReader to CircularBufferReader
- [X] Fixes bugs with CircularBufferReader
- [X] Adds CircularBufferWriter
- [X] Adds SpanWriter
- [X] Adds SpanReader

Bumps release version
This commit is contained in:
Kamron Batman 2020-10-24 14:46:59 -07:00 • committed by GitHub
parent 3b7f648c27
commit 6bd4f0d265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 1302 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Projects/Server/Network/Pipe.cs
View file

@ -118,55 +118,55 @@ namespace Server.Network
return result;
}
public void Advance(uint bytes)
public void Advance(uint count)
{
var read = _pipe._readIdx;
var write = _pipe._writeIdx;
if (bytes == 0)
if (count == 0)
{
return;
}
if (bytes > _pipe.Size - 1)
if (count > _pipe.Size - 1)
{
throw new InvalidOperationException();
}
if (read <= write)
{
if (bytes > read + _pipe.Size - write - 1)
if (count > read + _pipe.Size - write - 1)
{
throw new InvalidOperationException();
}
var sz = Math.Min(bytes, _pipe.Size - write);
var sz = Math.Min(count, _pipe.Size - write);
write += sz;
if (write > _pipe.Size - 1)
{
write = 0;
}
bytes -= sz;
count -= sz;
if (bytes > 0)
if (count > 0)
{
if (bytes >= read)
if (count >= read)
{
throw new InvalidOperationException();
}
write = bytes;
write = count;
}
}
else
{
if (bytes > read - write - 1)
if (count > read - write - 1)
{
throw new InvalidOperationException();
}
write += bytes;
write += count;
}
// It's never valid to advance the write pointer to become equal to
@ -216,7 +216,7 @@ namespace Server.Network
internal PipeReader(Pipe<T> pipe) => _pipe = pipe;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public uint GetRemaining()
public uint GetAvailable()
{
var read = _pipe._readIdx;
var write = _pipe._writeIdx;
@ -260,39 +260,39 @@ namespace Server.Network
return this;
}
public void Advance(uint bytes)
public void Advance(uint count)
{
var read = _pipe._readIdx;
var write = _pipe._writeIdx;
if (read <= write)
{
if (bytes > write - read)
if (count > write - read)
{
throw new InvalidOperationException();
}
read += bytes;
read += count;
}
else
{
var sz = Math.Min(bytes, _pipe.Size - read);
var sz = Math.Min(count, _pipe.Size - read);
read += sz;
if (read > _pipe.Size - 1)
{
read = 0;
}
bytes -= sz;
count -= sz;
if (bytes > 0)
if (count > 0)
{
if (bytes > write)
if (count > write)
{
throw new InvalidOperationException();
}
read = bytes;
read = count;
}
}
@ -309,7 +309,7 @@ namespace Server.Network
{
get
{
if (GetRemaining() > 0)
if (GetAvailable() > 0)
{
return true;
}