Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed object pipe #779

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 0 additions & 294 deletions src/SuperSocket.Connection/DefaultObjectPipe.cs

This file was deleted.

29 changes: 0 additions & 29 deletions src/SuperSocket.Connection/IObjectPipe.cs

This file was deleted.

36 changes: 10 additions & 26 deletions src/SuperSocket.Connection/PipeConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,12 @@ private static Pipe GetOutputPipe(ConnectionOptions connectionOptions)
return connectionOptions.Output ?? new Pipe();
}

protected override Task StartTask<TPackageInfo>(IObjectPipe<TPackageInfo> packagePipe, CancellationToken cancellationToken)
protected override async Task GetConnectionTask(Task readTask, CancellationToken cancellationToken)
{
var pipeTask = base.StartTask<TPackageInfo>(packagePipe, cancellationToken);
return Task.WhenAll(pipeTask, ProcessSends());
await Task.WhenAll(FillPipeAsync(Input.Writer, cancellationToken), ProcessSends()).ConfigureAwait(false);
await base.GetConnectionTask(readTask, cancellationToken).ConfigureAwait(false);
}

protected override Task StartInputPipeTask<TPackageInfo>(IObjectPipe<TPackageInfo> packagePipe, CancellationToken cancellationToken)
{
return Task.WhenAll(FillPipeAsync(Input.Writer, packagePipe as ISupplyController, cancellationToken), base.StartInputPipeTask(packagePipe, cancellationToken));
}


protected virtual async Task ProcessSends()
{
var output = Output.Reader;
Expand All @@ -66,30 +61,14 @@ protected virtual async Task ProcessSends()

protected abstract ValueTask<int> FillPipeWithDataAsync(Memory<byte> memory, CancellationToken cancellationToken);

internal virtual async Task FillPipeAsync(PipeWriter writer, ISupplyController supplyController, CancellationToken cancellationToken)
internal virtual async Task FillPipeAsync(PipeWriter writer, CancellationToken cancellationToken)
{
var options = Options;

if (supplyController != null)
{
cancellationToken.Register(() =>
{
supplyController.SupplyEnd();
});
}

while (!cancellationToken.IsCancellationRequested)
{
try
{
if (supplyController != null)
{
await supplyController.SupplyRequired().ConfigureAwait(false);

if (cancellationToken.IsCancellationRequested)
break;
}

var bufferSize = options.ReceiveBufferSize;
var maxPackageLength = options.MaxPackageLength;

Expand Down Expand Up @@ -153,6 +132,11 @@ protected async ValueTask<bool> ProcessOutputRead(PipeReader reader)
{
var result = await reader.ReadAsync(CancellationToken.None).ConfigureAwait(false);

if (result.IsCanceled)
{
return true;
}

var completedOrCancelled = result.IsCompleted || result.IsCanceled;

var buffer = result.Buffer;
Expand Down
Loading
Loading