性能优化

Net40/NetworkSocket/ByteRange.cs

@@ -80,7 +80,7 @@ public ByteRange(byte[] buffer, int offset, int count)
  /// </summary>
  /// <param name="size">新的ByteRange大小</param>
  /// <returns></returns>
- public IEnumerable<IByteRange> SplitBySize(int size)
+ public IEnumerable<ByteRange> SplitBySize(int size)
  {
  if (size >= this.Count)
  {

Net40/NetworkSocket/Http/Result/FileResult.cs

@@ -60,17 +60,16 @@ public void ExecuteResult(HttpResponse response)
  using (var stream = new FileStream(this.FileName, FileMode.Open, FileAccess.Read))
  {
  const int size = 8 * 1024;
+ var bytes = new byte[size];
  var state = response.WriteHeader((int)stream.Length);
 
  while (state == true)
  {
- var bytes = new byte[size];
  var length = stream.Read(bytes, 0, size);
  if (length == 0)
  {
  break;
  }
-
  var content = new ByteRange(bytes, 0, length);
  state = response.WriteContent(content);
  }

Net40/NetworkSocket/IByteRange.cs

@@ -24,12 +24,5 @@ public interface IByteRange
  /// 获取字节数组
  /// </summary>
  byte[] Buffer { get; }
-
- /// <summary>
- /// 分割为大小相等的ByteRange集合
- /// </summary>
- /// <param name="size">新的ByteRange大小</param>
- /// <returns></returns>
- IEnumerable<IByteRange> SplitBySize(int size);
  }
 }

Net40/NetworkSocket/Internal/IocpTcpSession.cs

@@ -45,7 +45,6 @@ public IocpTcpSession()
  {
  this.sendArg.Completed += this.SendCompleted;
  this.recvArg.Completed += this.RecvCompleted;
- BufferManager.SetBuffer(this.sendArg);
  BufferManager.SetBuffer(this.recvArg);
  }
 
@@ -131,34 +130,20 @@ public override void Send(IByteRange byteRange)
  throw new SocketException((int)SocketError.NotConnected);
  }
 
- var byteRanges = byteRange.SplitBySize(this.sendArg.Count);
- foreach (var range in byteRanges)
- {
- this.SendByteRange(range);
- }
- }
-
- /// <summary>
- /// 发送一个小于缓冲区的数据范围
- /// </summary>
- /// <param name="byteRange">数据范围</param>
- private bool SendByteRange(IByteRange byteRange)
- {
  // 如果发送过程已停止，则本次直接发送
  if (Interlocked.CompareExchange(ref this.PendingSendCount, 1, 0) == 0)
  {
- return this.TrySendByteRangeAsync(byteRange);
+ this.TrySendByteRangeAsync(byteRange);
  }
-
- // 添加数据到缓存区
- this.PendingSendByteRanges.Enqueue(byteRange);
-
- // 如果发送过程已停止，则启动发送缓存中的数据
- if (Interlocked.Increment(ref this.PendingSendCount) == 1)
+ else
  {
- return this.TrySendByteRangeAsync(null);
+ this.PendingSendByteRanges.Enqueue(byteRange);
+ // 如果发送过程已停止，则启动发送缓存中的数据
+ if (Interlocked.Increment(ref this.PendingSendCount) == 1)
+ {
+ this.TrySendByteRangeAsync(null);
+ }
  }
- return true;
  }
 
 
@@ -167,19 +152,17 @@ private bool SendByteRange(IByteRange byteRange)
  /// 发送完成将触发SendCompleted方法
  /// <param name="byteRange">数据范围，为null则从缓冲中区获取</param>
  /// </summary>
- private bool TrySendByteRangeAsync(IByteRange byteRange)
+ private void TrySendByteRangeAsync(IByteRange byteRange)
  {
  if (byteRange == null && this.PendingSendByteRanges.TryDequeue(out byteRange) == false)
  {
  Interlocked.Exchange(ref this.PendingSendCount, 0);
- return false;
+ return;
  }
 
- Buffer.BlockCopy(byteRange.Buffer, byteRange.Offset, this.sendArg.Buffer, this.sendArg.Offset, byteRange.Count);
- this.sendArg.SetBuffer(this.sendArg.Offset, byteRange.Count);
-
- return base.TryInvokeAction(() =>
+ base.TryInvokeAction(() =>
  {
+ this.sendArg.SetBuffer(byteRange.Buffer, byteRange.Offset, byteRange.Count);
  if (this.Socket.SendAsync(this.sendArg) == false)
  {
  this.SendCompleted(this.Socket, this.sendArg);

Net40/NetworkSocket/Internal/SslTcpSession.cs

@@ -198,46 +198,36 @@ public override void Send(IByteRange byteRange)
  throw new SocketException((int)SocketError.NotConnected);
  }
 
- this.SendByteRange(byteRange);
- }
-
- /// <summary>
- /// 发送一个小于缓冲区的数据范围
- /// </summary>
- /// <param name="byteRange">数据范围</param>
- private bool SendByteRange(IByteRange byteRange)
- {
  // 如果发送过程已停止，则本次直接发送
  if (Interlocked.CompareExchange(ref this.PendingSendCount, 1, 0) == 0)
  {
- return this.TrySendByteRangeAsync(byteRange);
+ this.TrySendByteRangeAsync(byteRange);
  }
-
- // 添加数据到缓存区
- this.PendingSendByteRanges.Enqueue(byteRange);
-
- // 如果发送过程已停止，则启动发送缓存中的数据
- if (Interlocked.Increment(ref this.PendingSendCount) == 1)
+ else
  {
- return this.TrySendByteRangeAsync(null);
+ this.PendingSendByteRanges.Enqueue(byteRange);
+ // 如果发送过程已停止，则启动发送缓存中的数据
+ if (Interlocked.Increment(ref this.PendingSendCount) == 1)
+ {
+ this.TrySendByteRangeAsync(null);
+ }
  }
- return true;
  }
 
  /// <summary>
  /// 尝试异步发送一个ByteRange
  /// 发送完成将触发SendCompleted方法
  /// <param name="byteRange">数据范围，为null则从缓冲中区获取</param>
  /// </summary>
- private bool TrySendByteRangeAsync(IByteRange byteRange)
+ private void TrySendByteRangeAsync(IByteRange byteRange)
  {
  if (byteRange == null && this.PendingSendByteRanges.TryDequeue(out byteRange) == false)
  {
  Interlocked.Exchange(ref this.PendingSendCount, 0);
- return false;
+ return;
  }
 
- return base.TryInvokeAction(() =>
+ base.TryInvokeAction(() =>
  this.sslStream.BeginWrite(
  byteRange.Buffer,
  byteRange.Offset,