Less buffers.

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs

@@ -369,25 +369,25 @@ public virtual void ConnectionRequest(out int auxHandle, out string ipAddress, o
 				auxHandle = XdrStream.ReadInt32();
 
 				var garbage1 = new byte[8];
-				XdrStream.ReadBytes(garbage1);
+				XdrStream.ReadBytes(garbage1, 8);
 
 				var respLen = XdrStream.ReadInt32();
 				respLen += respLen % 4;
 
 				var sin_family = new byte[2];
-				XdrStream.ReadBytes(sin_family);
+				XdrStream.ReadBytes(sin_family, 2);
 				respLen -= 2;
 
 				var sin_port = new byte[2];
-				XdrStream.ReadBytes(sin_port);
+				XdrStream.ReadBytes(sin_port, 2);
 				portNumber = (ushort)IPAddress.NetworkToHostOrder(BitConverter.ToInt16(sin_port, 0));
 				respLen -= 2;
 
 				// * The address returned by the server may be incorrect if it is behind a NAT box
 				// * so we must use the address that was used to connect the main socket, not the
 				// * address reported by the server.
 				var sin_addr = new byte[4];
-				XdrStream.ReadBytes(sin_addr);
+				XdrStream.ReadBytes(sin_addr, 4);
 				//ipAddress = string.Format(
 				//    CultureInfo.InvariantCulture,
 				//    "{0}.{1}.{2}.{3}",
@@ -396,7 +396,7 @@ public virtual void ConnectionRequest(out int auxHandle, out string ipAddress, o
 				respLen -= 4;
 
 				var garbage2 = new byte[respLen];
-				XdrStream.ReadBytes(garbage2);
+				XdrStream.ReadBytes(garbage2, respLen);
 
 				XdrStream.ReadStatusVector();
 			}

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsEventManager.cs

@@ -57,7 +57,7 @@ public async Task WaitForEventsAsync(RemoteEvent remoteEvent)
 							var dbHandle = _database.XdrStream.ReadInt32();
 							var buffer = _database.XdrStream.ReadBuffer();
 							var ast = new byte[8];
-							_database.XdrStream.ReadBytes(ast);
+							_database.XdrStream.ReadBytes(ast, 8);
 							var eventId = _database.XdrStream.ReadInt32();
 
 							remoteEvent.EventCounts(buffer);

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/XdrStream.cs

@@ -48,6 +48,7 @@ internal class XdrStream : Stream
 		private long _position;
 		private List<byte> _outputBuffer;
 		private Queue<byte> _inputBuffer;
+		private byte[] _smallBuffer;
 		private Ionic.Zlib.ZlibCodec _deflate;
 		private Ionic.Zlib.ZlibCodec _inflate;
 		private byte[] _compressionBuffer;
@@ -121,6 +122,7 @@ public XdrStream(Stream innerStream, Charset charset, bool compression, bool own
 			_position = 0;
 			_outputBuffer = new List<byte>(PreferredBufferSize);
 			_inputBuffer = new Queue<byte>(PreferredBufferSize);
+			_smallBuffer = new byte[8];
 			if (_compression)
 			{
 				_deflate = new Ionic.Zlib.ZlibCodec(Ionic.Zlib.CompressionMode.Compress);
@@ -334,9 +336,8 @@ private void ResetOperation()
 
 		#region XDR Read Methods
 
-		public byte[] ReadBytes(byte[] buffer)
+		public byte[] ReadBytes(byte[] buffer, int count)
 		{
-			var count = buffer.Length;
 			if (count > 0)
 			{
 				var toRead = count;
@@ -353,9 +354,8 @@ public byte[] ReadBytes(byte[] buffer)
 			}
 			return buffer;
 		}
-		public async Task<byte[]> ReadBytesAsync(byte[] buffer)
+		public async Task<byte[]> ReadBytesAsync(byte[] buffer, int count)
 		{
-			var count = buffer.Length;
 			if (count > 0)
 			{
 				var toRead = count;
@@ -376,7 +376,7 @@ public async Task<byte[]> ReadBytesAsync(byte[] buffer)
 		public byte[] ReadOpaque(int length)
 		{
 			var buffer = new byte[length];
-			ReadBytes(buffer);
+			ReadBytes(buffer, length);
 			var padLength = ((4 - length) & 3);
 			if (padLength > 0)
 			{
@@ -417,26 +417,24 @@ public short ReadInt16()
 			return Convert.ToInt16(ReadInt32());
 		}
 
-		private byte[] int32Buffer = new byte[4];
 		public int ReadInt32()
 		{
-			Array.Clear(int32Buffer, 0, 4);
-			ReadBytes(int32Buffer);
-			return IPAddress.HostToNetworkOrder(BitConverter.ToInt32(int32Buffer, 0));
+			Array.Clear(_smallBuffer, 0, 4);
+			ReadBytes(_smallBuffer, 4);
+			return IPAddress.HostToNetworkOrder(BitConverter.ToInt32(_smallBuffer, 0));
 		}
 		public async Task<int> ReadInt32Async()
 		{
-			Array.Clear(int32Buffer, 0, 4);
-			await ReadBytesAsync(int32Buffer).ConfigureAwait(false);
-			return IPAddress.HostToNetworkOrder(BitConverter.ToInt32(int32Buffer, 0));
+			Array.Clear(_smallBuffer, 0, 4);
+			await ReadBytesAsync(_smallBuffer, 4).ConfigureAwait(false);
+			return IPAddress.HostToNetworkOrder(BitConverter.ToInt32(_smallBuffer, 0));
 		}
 
-		private byte[] int64Buffer = new byte[8];
 		public long ReadInt64()
 		{
-			Array.Clear(int64Buffer, 0, 8);
-			ReadBytes(int64Buffer);
-			return IPAddress.HostToNetworkOrder(BitConverter.ToInt64(int64Buffer, 0));
+			Array.Clear(_smallBuffer, 0, 8);
+			ReadBytes(_smallBuffer, 8);
+			return IPAddress.HostToNetworkOrder(BitConverter.ToInt64(_smallBuffer, 0));
 		}
 
 		public Guid ReadGuid()