Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 06:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove task cancellation hacks

Browse source
This commit is contained in:
Bond_009 2021-11-18 14:13:43 +01:00
parent 98962cc21f
commit 3ab0afdc6b
2 changed files with 18 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
View file

@ -165,7 +165,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{ {
await CopyTo(udpClient, TempFilePath, openTaskCompletionSource, cancellationToken).ConfigureAwait(false); await CopyTo(udpClient, TempFilePath, openTaskCompletionSource, cancellationToken).ConfigureAwait(false);
} }
catch (OperationCanceledException ex) catch (Exception ex) when (ex is OperationCanceledException || ex is TimeoutException)
{ {
Logger.LogInformation("HDHR UDP stream cancelled or timed out from {0}", remoteAddress); Logger.LogInformation("HDHR UDP stream cancelled or timed out from {0}", remoteAddress);
openTaskCompletionSource.TrySetException(ex); openTaskCompletionSource.TrySetException(ex);
@ -191,28 +191,17 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
while (true) while (true)
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
using (var timeOutSource = new CancellationTokenSource()) var res = await udpClient.ReceiveAsync(cancellationToken)
using (var linkedSource = CancellationTokenSource.CreateLinkedTokenSource( .AsTask()
cancellationToken, .WaitAsync(TimeSpan.FromMilliseconds(30000), CancellationToken.None)
timeOutSource.Token)) .ConfigureAwait(false);
{
var resTask = udpClient.ReceiveAsync(linkedSource.Token).AsTask();
if (await Task.WhenAny(resTask, Task.Delay(30000, linkedSource.Token)).ConfigureAwait(false) != resTask)
{
resTask.Dispose();
break;
}
// We don't want all these delay tasks to keep running
timeOutSource.Cancel();
var res = await resTask.ConfigureAwait(false);
var buffer = res.Buffer; var buffer = res.Buffer;
var read = buffer.Length - RtpHeaderBytes; var read = buffer.Length - RtpHeaderBytes;
if (read > 0) if (read > 0)
{ {
await fileStream.WriteAsync(buffer.AsMemory(RtpHeaderBytes, read), linkedSource.Token).ConfigureAwait(false); await fileStream.WriteAsync(buffer.AsMemory(RtpHeaderBytes, read), cancellationToken).ConfigureAwait(false);
} }
if (!resolved) if (!resolved)
@ -225,5 +214,4 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
} }
} }
} }
}
} }

12
Emby.Server.Implementations/Udp/UdpServer.cs
View file

@ -97,21 +97,11 @@ namespace Emby.Server.Implementations.Udp
private async Task BeginReceiveAsync(CancellationToken cancellationToken) private async Task BeginReceiveAsync(CancellationToken cancellationToken)
{ {
var infiniteTask = Task.Delay(-1, cancellationToken);
while (!cancellationToken.IsCancellationRequested) while (!cancellationToken.IsCancellationRequested)
{ {
try try
{ {
var task = _udpSocket.ReceiveFromAsync(_receiveBuffer, SocketFlags.None, _endpoint); var result = await _udpSocket.ReceiveFromAsync(_receiveBuffer, SocketFlags.None, _endpoint, cancellationToken).ConfigureAwait(false);
await Task.WhenAny(task, infiniteTask).ConfigureAwait(false);
if (!task.IsCompleted)
{
return;
}
var result = task.Result;
var text = Encoding.UTF8.GetString(_receiveBuffer, 0, result.ReceivedBytes); var text = Encoding.UTF8.GetString(_receiveBuffer, 0, result.ReceivedBytes);
if (text.Contains("who is JellyfinServer?", StringComparison.OrdinalIgnoreCase)) if (text.Contains("who is JellyfinServer?", StringComparison.OrdinalIgnoreCase))
{ {