use cached callback and remove queued packet type

dotnet · Sep 5, 2021 · 5d6e3db · 5d6e3db
1 parent 717839d
commit 5d6e3db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 36 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -532,7 +532,6 @@
  <Compile Include="Microsoft\Data\SqlClient\SNI\SNILoadHandle.cs" />
  <Compile Include="Microsoft\Data\SqlClient\SNI\SNIMarsConnection.cs" />
  <Compile Include="Microsoft\Data\SqlClient\SNI\SNIMarsHandle.cs" />
- <Compile Include="Microsoft\Data\SqlClient\SNI\SNIMarsQueuedPacket.cs" />
  <Compile Include="Microsoft\Data\SqlClient\SNI\SNINpHandle.cs" />
  <Compile Include="Microsoft\Data\SqlClient\SNI\SNIPacket.cs" />
  <Compile Include="Microsoft\Data\SqlClient\SNI\SNIPacket.Debug.cs" />

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIMarsHandle.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIMarsHandle.cs
@@ -19,7 +19,7 @@ internal sealed class SNIMarsHandle : SNIHandle
  private readonly SNIMarsConnection _connection;
  private readonly uint _status = TdsEnums.SNI_UNINITIALIZED;
  private readonly Queue<SNIPacket> _receivedPacketQueue = new Queue<SNIPacket>();
- private readonly Queue<SNIMarsQueuedPacket> _sendPacketQueue = new Queue<SNIMarsQueuedPacket>();
+ private readonly Queue<SNIPacket> _sendPacketQueue = new Queue<SNIPacket>();
  private readonly object _callbackObject;
  private readonly Guid _connectionId;
  private readonly ushort _sessionId;
@@ -214,7 +214,7 @@ private uint InternalSendAsync(SNIPacket packet)
  }
 
  SNIPacket muxedPacket = SetPacketSMUXHeader(packet);
- muxedPacket.SetAsyncIOCompletionCallback(HandleSendComplete);
+ muxedPacket.SetAsyncIOCompletionCallback(_handleSendCompleteCallback);
  SqlClientEventSource.Log.TrySNITraceEvent(nameof(SNIMarsHandle), EventType.INFO, "MARS Session Id {0}, _sequenceNumber {1}, _sendHighwater {2}, Sending packet", args0: ConnectionId, args1: _sequenceNumber, args2: _sendHighwater);
  return _connection.SendAsync(muxedPacket);
  }
@@ -229,7 +229,7 @@ private uint SendPendingPackets()
  {
  using (TrySNIEventScope.Create(nameof(SNIMarsHandle)))
  {
- SNIMarsQueuedPacket packet = null;
+ SNIPacket packet = null;
 
  while (true)
  {
@@ -240,7 +240,7 @@ private uint SendPendingPackets()
  if (_sendPacketQueue.Count != 0)
  {
  packet = _sendPacketQueue.Peek();
- uint result = InternalSendAsync(packet.Packet);
+ uint result = InternalSendAsync(packet);
 
  if (result != TdsEnums.SNI_SUCCESS && result != TdsEnums.SNI_SUCCESS_IO_PENDING)
  {
@@ -277,9 +277,10 @@ public override uint SendAsync(SNIPacket packet)
  Debug.Assert(_connection != null && Monitor.IsEntered(_connection.DemuxerSync), "SNIMarsHandle.HandleRecieveComplete should be called while holding the SNIMarsConnection.DemuxerSync because it can cause deadlocks");
  using (TrySNIEventScope.Create(nameof(SNIMarsHandle)))
  {
+ packet.SetAsyncIOCompletionCallback(_handleSendCompleteCallback);
  lock (this)
  {
- _sendPacketQueue.Enqueue(new SNIMarsQueuedPacket(packet, _handleSendCompleteCallback));
+ _sendPacketQueue.Enqueue(packet);
  }
 
  SendPendingPackets();

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIMarsQueuedPacket.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIMarsQueuedPacket.cs