davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-17 15:46:33 +09:00
Code Issues Releases Activity

Added a const variable to set the default size of the buffer array

Browse Source 
Using the buffer with readstring
This commit is contained in:
Andrés Leone
2016-06-25 21:28:04 +02:00
parent d14d3e0d2d
commit 37d03863bb
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Lidgren.Network/NetBuffer.Read.cs
View File

@@ -17,7 +17,7 @@ namespace Lidgren.Network
public partial class NetBuffer public partial class NetBuffer
{ {
private const string c_readOverflowError = "Trying to read past the buffer size - likely caused by mismatching Write/Reads, different size or order."; private const string c_readOverflowError = "Trying to read past the buffer size - likely caused by mismatching Write/Reads, different size or order.";
private const int c_bufferSize = 64; // Min 8 to hold anything but strings. Increase it if readed strings usally don't fit inside the buffer
private static byte[] s_buffer; private static byte[] s_buffer;
/// <summary> /// <summary>
@@ -355,7 +355,7 @@ namespace Lidgren.Network
return retval; return retval;
} }
byte[] bytes = Interlocked.Exchange(ref s_buffer, null) ?? new byte[8]; byte[] bytes = Interlocked.Exchange(ref s_buffer, null) ?? new byte[c_bufferSize];
ReadBytes(bytes, 0, 4); ReadBytes(bytes, 0, 4);
float res = BitConverter.ToSingle(bytes, 0); float res = BitConverter.ToSingle(bytes, 0);
s_buffer = bytes; s_buffer = bytes;
@@ -380,7 +380,7 @@ namespace Lidgren.Network
return true; return true;
} }
byte[] bytes = Interlocked.Exchange(ref s_buffer, null) ?? new byte[8]; byte[] bytes = Interlocked.Exchange(ref s_buffer, null) ?? new byte[c_bufferSize];
ReadBytes(bytes, 0, 4); ReadBytes(bytes, 0, 4);
result = BitConverter.ToSingle(bytes, 0); result = BitConverter.ToSingle(bytes, 0);
s_buffer = bytes; s_buffer = bytes;
@@ -402,7 +402,7 @@ namespace Lidgren.Network
return retval; return retval;
} }
byte[] bytes = Interlocked.Exchange(ref s_buffer, null) ?? new byte[8]; byte[] bytes = Interlocked.Exchange(ref s_buffer, null) ?? new byte[c_bufferSize];
ReadBytes(bytes, 0, 8); ReadBytes(bytes, 0, 8);
double res = BitConverter.ToDouble(bytes, 0); double res = BitConverter.ToDouble(bytes, 0);
s_buffer = bytes; s_buffer = bytes;
@@ -604,8 +604,16 @@ namespace Lidgren.Network
return retval; return retval;
} }
byte[] bytes = ReadBytes(byteLen); if (byteLen <= c_bufferSize) {
return System.Text.Encoding.UTF8.GetString(bytes, 0, bytes.Length); byte[] buffer = Interlocked.Exchange(ref s_buffer, null) ?? new byte[c_bufferSize];
ReadBytes(buffer, 0, byteLen);
string retval = Encoding.UTF8.GetString(buffer, 0, byteLen);
s_buffer = buffer;
return retval;
} else {
byte[] bytes = ReadBytes(byteLen);
return Encoding.UTF8.GetString(bytes, 0, bytes.Length);
}
} }
/// <summary> /// <summary>