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.

Sign up for GitHub

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

fix receive timeout #23

Merged
merged 1 commit into from
Dec 18, 2023
Merged

fix receive timeout #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/FieldElementSubsystems/Connections/EulynxBaseline4R1/PointToInterlockingConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void Connect(IConnection connection)

public async Task<bool> InitializeConnection(GenericPointState state, bool observeAbilityToMove, CancellationToken cancellationToken)
{
if (await ReceiveMessage<PointPdiVersionCheckCommand>(cancellationToken) == null)
if (await ReceiveMessageWithTimeout<PointPdiVersionCheckCommand>(cancellationToken) == null)
{
_logger.LogError("Unexpected message.");
return false;
Expand All @@ -61,7 +61,7 @@ public async Task<bool> InitializeConnection(GenericPointState state, bool obser
var versionCheckResponse = new PointPdiVersionCheckMessage(_localId, _remoteId, PointPdiVersionCheckMessageResultPdiVersionCheck.PDIVersionsFromReceiverAndSenderDoMatch, /* TODO */ 0, 0, Array.Empty<byte>());
await SendMessage(versionCheckResponse);

if (await ReceiveMessage<PointInitialisationRequestCommand>(cancellationToken) == null)
if (await ReceiveMessageWithTimeout<PointInitialisationRequestCommand>(cancellationToken) == null)
{
_logger.LogError("Unexpected message.");
return false;
Expand Down Expand Up @@ -123,12 +123,19 @@ private async Task SendMessage(byte[] message)
await CurrentConnection.SendAsync(message);
}

private async Task<T> ReceiveMessage<T>(CancellationToken cancellationToken) where T : Message
private async Task<T> ReceiveMessageWithTimeout<T>(CancellationToken cancellationToken) where T : Message
{
if (CurrentConnection == null) throw new InvalidOperationException("Connection is null. Did you call Connect()?");
ResetTimeout();
var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _timeout.Token).Token;
return await ReceiveMessage<T>(token);
}

private async Task<T> ReceiveMessage<T>(CancellationToken cancellationToken) where T : Message
{
if (CurrentConnection == null) throw new InvalidOperationException("Connection is null. Did you call Connect()?");

var message = Message.FromBytes(await CurrentConnection.ReceiveAsync(CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _timeout.Token).Token));
var message = Message.FromBytes(await CurrentConnection.ReceiveAsync(cancellationToken));
if (message is T tMessage) return tMessage;
_logger.LogError("Unexpected message: {}", message);
throw new InvalidOperationException("Unexpected message.");
Expand Down
14 changes: 11 additions & 3 deletions src/FieldElementSubsystems/Connections/EulynxBaseline4R2/PointToInterlockingConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void Connect(IConnection connection)

public async Task<bool> InitializeConnection(GenericPointState state, bool observeAbilityToMove, CancellationToken cancellationToken)
{
if (await ReceiveMessage<PointPdiVersionCheckCommand>(cancellationToken) == null)
if (await ReceiveMessageWithTimeout<PointPdiVersionCheckCommand>(cancellationToken) == null)
{
_logger.LogError("Unexpected message.");
return false;
Expand All @@ -60,7 +60,7 @@ public async Task<bool> InitializeConnection(GenericPointState state, bool obser
var versionCheckResponse = new PointPdiVersionCheckMessage(_localId, _remoteId, PointPdiVersionCheckMessageResultPdiVersionCheck.PDIVersionsFromReceiverAndSenderDoMatch, /* TODO */ 0, 0, new byte[] { });
await SendMessage(versionCheckResponse);

if (await ReceiveMessage<PointInitialisationRequestCommand>(cancellationToken) == null)
if (await ReceiveMessageWithTimeout<PointInitialisationRequestCommand>(cancellationToken) == null)
{
_logger.LogError("Unexpected message.");
return false;
Expand Down Expand Up @@ -122,12 +122,20 @@ private async Task SendMessage(byte[] message)
await CurrentConnection.SendAsync(message);
}

private async Task<T> ReceiveMessageWithTimeout<T>(CancellationToken cancellationToken) where T : Message
{
if (CurrentConnection == null) throw new InvalidOperationException("Connection is null. Did you call Connect()?");
ResetTimeout();
var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _timeout.Token).Token;
return await ReceiveMessage<T>(token);
}

private async Task<T> ReceiveMessage<T>(CancellationToken cancellationToken) where T : Message
{
if (CurrentConnection == null) throw new InvalidOperationException("Connection is null. Did you call Connect()?");
ResetTimeout();

var message = Message.FromBytes(await CurrentConnection.ReceiveAsync(CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _timeout.Token).Token));
var message = Message.FromBytes(await CurrentConnection.ReceiveAsync(cancellationToken));
if (message is T tMessage) return tMessage;
_logger.LogError("Unexpected message: {}", message);
throw new InvalidOperationException("Unexpected message.");
Expand Down
Loading