1
0
Fork 0
mirror of https://gitlab.com/futo-org/fcast.git synced 2025-07-06 22:19:50 +00:00

Added write/read semaphores.

This commit is contained in:
Koen 2024-02-22 11:37:52 +01:00
parent 47ea3a3c42
commit ba8cd46e4c
4 changed files with 56 additions and 24 deletions

View file

@ -10,7 +10,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

View file

@ -121,6 +121,8 @@ internal class Program
.Build(); .Build();
CommandMatches matches = rootCommand.Parse(args); CommandMatches matches = rootCommand.Parse(args);
Console.WriteLine(matches.ToString());
var host = matches.Value("host")!; var host = matches.Value("host")!;
var connectionType = matches.Value("connection_type")!; var connectionType = matches.Value("connection_type")!;

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

View file

@ -41,6 +41,8 @@ public class FCastSession : IDisposable
private int _bytesRead; private int _bytesRead;
private int _packetLength; private int _packetLength;
private Stream _stream; private Stream _stream;
private SemaphoreSlim _writerSemaphore = new SemaphoreSlim(1);
private SemaphoreSlim _readerSemaphore = new SemaphoreSlim(1);
private SessionState _state; private SessionState _state;
public FCastSession(Stream stream) public FCastSession(Stream stream)
@ -50,6 +52,10 @@ public class FCastSession : IDisposable
} }
public async Task SendMessageAsync(Opcode opcode, CancellationToken cancellationToken) public async Task SendMessageAsync(Opcode opcode, CancellationToken cancellationToken)
{
await _writerSemaphore.WaitAsync();
try
{ {
int size = 1; int size = 1;
byte[] header = new byte[LengthBytes + 1]; byte[] header = new byte[LengthBytes + 1];
@ -59,8 +65,17 @@ public class FCastSession : IDisposable
Console.WriteLine($"Sent {header.Length} bytes with (opcode: {opcode}, header size: {header.Length}, no body)."); Console.WriteLine($"Sent {header.Length} bytes with (opcode: {opcode}, header size: {header.Length}, no body).");
await _stream.WriteAsync(header, cancellationToken); await _stream.WriteAsync(header, cancellationToken);
} }
finally
{
_writerSemaphore.Release();
}
}
public async Task SendMessageAsync<T>(Opcode opcode, T message, CancellationToken cancellationToken) where T : class public async Task SendMessageAsync<T>(Opcode opcode, T message, CancellationToken cancellationToken) where T : class
{
await _writerSemaphore.WaitAsync();
try
{ {
string json = JsonSerializer.Serialize(message); string json = JsonSerializer.Serialize(message);
byte[] data = Encoding.UTF8.GetBytes(json); byte[] data = Encoding.UTF8.GetBytes(json);
@ -76,6 +91,11 @@ public class FCastSession : IDisposable
Console.WriteLine($"Sent {packet.Length} bytes with (opcode: {opcode}, header size: {header.Length}, body size: {data.Length}, body: {json})."); Console.WriteLine($"Sent {packet.Length} bytes with (opcode: {opcode}, header size: {header.Length}, body size: {data.Length}, body: {json}).");
await _stream.WriteAsync(packet, cancellationToken); await _stream.WriteAsync(packet, cancellationToken);
} }
finally
{
_writerSemaphore.Release();
}
}
public async Task ReceiveLoopAsync(CancellationToken cancellationToken) public async Task ReceiveLoopAsync(CancellationToken cancellationToken)
{ {
@ -85,13 +105,23 @@ public class FCastSession : IDisposable
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
while (!cancellationToken.IsCancellationRequested) while (!cancellationToken.IsCancellationRequested)
{ {
int bytesRead = await _stream.ReadAsync(buffer, cancellationToken); await _readerSemaphore.WaitAsync();
int bytesRead;
try
{
bytesRead = await _stream.ReadAsync(buffer, cancellationToken);
if (bytesRead == 0) if (bytesRead == 0)
{ {
Console.WriteLine("Connection shutdown gracefully."); Console.WriteLine("Connection shutdown gracefully.");
Dispose(); Dispose();
break; break;
} }
}
finally
{
_readerSemaphore.Release();
}
await ProcessBytesAsync(buffer, bytesRead, cancellationToken); await ProcessBytesAsync(buffer, bytesRead, cancellationToken);
} }